Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Clothing and Drip Changes #586

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

- type: entity
categories: [ HideSpawnMenu ]
parent: ClothingBackpack
parent: ClothingBackpackHoP # Floof - Use DeltaV HoP bags
id: ClothingBackpackHOPFilled
components:
- type: StorageFill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@

- type: entity
categories: [ HideSpawnMenu ]
parent: ClothingBackpackDuffel
parent: ClothingHopDuffel # Floof - Use DeltaV HoP bags
id: ClothingBackpackDuffelHOPFilled
components:
- type: StorageFill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@

- type: entity
categories: [ HideSpawnMenu ]
parent: ClothingBackpackSatchel
parent: ClothingSatchelHoP # Floof - Use DeltaV HoP bags
id: ClothingBackpackSatchelHOPFilled
components:
- type: StorageFill
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,25 @@
ClothingHandsGlovesCombat: 3
ClothingEyesGlassesSunglasses: 3
ClothingUniformJumpsuitCentcomOfficer: 3
ClothingUniformJumpskirtCentcomOfficer: 3 # DeltaV - Centcomm Drip
ClothingUniformJumpsuitCentcomOfficial: 3
ClothingUniformJumpskirtCentcomOfficial: 3 # DeltaV - Centcomm Drip
ClothingUniformJumpsuitCentcomAgent: 3
ClothingUniformJumpskirtCentcomAgent: 3 # DeltaV - Centcomm Drip
ClothingUniformJumpsuitCentcomFormal: 3
ClothingUniformJumpskirtCentcomFormalDress: 3
ClothingHeadHatCentcom: 3
ClothingHeadHatCentcomcap: 3
ClothingHeadHatBeretCentcomm: 3 # DeltaV - Centcomm Drip
ClothingMaskGasCentcom: 3
ClothingHeadsetCentCom: 3
ClothingOuterWinterCentcom: 3
ClothingOuterCoatExpensive: 1
ClothingNeckScarfStripedCentcom: 3
ClothingShoesBootsWinterCentCom: 2 #Delta V: Add departmental winter boots
ClothingShoesBootsWinterCentCom: 2 #DeltaV - Add departmental winter boots
ClothingNeckCloakCentcom: 3
ClothingNeckCollarCC: 3 # Floofstation - Collar addition
ClothingNeckMantleCentcom: 3 # DeltaV - Centcomm Drip
ClothingBackpackCentcom: 3 # DeltaV - Centcomm Drip
ClothingBackpackDuffelCentcom: 3 # DeltaV - Centcomm Drip
ClothingBackpackSatchelCentcom: 3 # DeltaV - Centcomm Drip
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingBackpack
id: ClothingBackpackCentcom
name: central commander backpack
description: A special backpack for Central Commanders. The gold decorating it makes it feel heavy.
components:
- type: Sprite
sprite: DeltaV/Clothing/Back/Backpacks/centcom.rsi

- type: entity
parent: ClothingBackpack
id: ClothingBackpackHoP
name: HoP's Backpack
description: To store all your stamps and paperwork
components:
- type: Sprite
sprite: DeltaV/Clothing/Back/Backpacks/hop.rsi
17 changes: 17 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelCentcom
name: central commander duffel
description: A large duffel bag for holding extra central commander-y goods.
components:
- type: Sprite
sprite: DeltaV/Clothing/Back/Duffels/centcom.rsi

- type: entity
parent: ClothingBackpackDuffel
id: ClothingHopDuffel
name: HoP's duffel bag
description: For those that HoPe more carry space will help them.
components:
- type: Sprite
sprite: DeltaV/Clothing/Back/Duffels/hop.rsi
17 changes: 17 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelCentcom
name: central commander satchel
description: An elite green satchel with a red velvet strap and gold buttons on it, made for Central Commanders.
components:
- type: Sprite
sprite: DeltaV/Clothing/Back/Satchels/centcom.rsi

- type: entity
parent: ClothingBackpackSatchel
id: ClothingSatchelHoP
name: HoP's Satchel
description: Fashionable, with plenty of room for pens
components:
- type: Sprite
sprite: DeltaV/Clothing/Back/Satchels/hop.rsi
13 changes: 12 additions & 1 deletion Resources/Prototypes/DeltaV/Entities/Clothing/Neck/mantles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,15 @@
- type: Sprite
sprite: DeltaV/Clothing/Neck/mantles/ryuzo.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/mantles/ryuzo.rsi
sprite: DeltaV/Clothing/Neck/mantles/ryuzo.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckMantleCentcom
name: central commander's mantle
description: A comfortable and elite green mantle with a nice gold trim, tailored specifically for to the Central Commander. There's a shiny red gemstone holding it together in the middle.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/mantles/centcommantle.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/mantles/centcommantle.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,43 @@
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi

# Central Command

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtCentcomAgent
name: CentComm agent's jumpskirt
description: A suitskirt worn by CentComm's legal team. Smells of burnt coffee.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtCentcomOfficial
name: CentComm official's jumpskirt
description: It's a jumpskirt with a nice golden hem, worn by CentComm's officials.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_official.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_official.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtCentcomOfficer
name: CentComm officer's jumpskirt
description: It's a jumpskirt worn by CentComm Officers.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi

# Justice

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtChiefJustice
Expand Down
70 changes: 37 additions & 33 deletions Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
@@ -1,93 +1,97 @@
# Jumpsuits - Security

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpsuitSecBlue
result: ClothingUniformJumpsuitSecBlue
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpsuitSecGrey
result: ClothingUniformJumpsuitSecGrey
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpsuitWardenBlue
result: ClothingUniformJumpsuitWardenBlue
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpsuitWardenGrey
result: ClothingUniformJumpsuitWardenGrey
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

# Jumpskirts - Security

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpskirtSecBlue
result: ClothingUniformJumpskirtSecBlue
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpskirtSecGrey
result: ClothingUniformJumpskirtSecGrey
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpskirtHoSBlue
result: ClothingUniformJumpskirtHoSBlue
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpskirtHoSGrey
result: ClothingUniformJumpskirtHoSGrey
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpskirtWardenBlue
result: ClothingUniformJumpskirtWardenBlue
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
parent: BaseJumpsuitRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingUniformJumpskirtWardenGrey
result: ClothingUniformJumpskirtWardenGrey
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 300

# Security Sweater

- type: latheRecipe
parent: BaseCoatRecipe # Floof - Add base clothing recipes to fork clothing files
id: ClothingOuterStasecSweater
result: ClothingOuterStasecSweater
category: ClothingSecurity # Floof - add uniform printer clothing categories
completetime: 4
materials:
Cloth: 500

#Centcomm Clothing

- type: latheRecipe
parent: BaseCommandHatRecipe # Floof - Switch centcomm beret to command hat recipe base
id: ClothingHeadHatBeretCentcomm
result: ClothingHeadHatBeretCentcomm
category: ClothingOther # Floof - Add categories to Centcomm drip recipes

- type: latheRecipe
parent: BaseCommandJumpsuitRecipe
id: ClothingUniformJumpskirtCentcomAgent
result: ClothingUniformJumpskirtCentcomAgent
category: ClothingOther # Floof - Add categories to Centcomm drip recipes

- type: latheRecipe
parent: BaseCommandJumpsuitRecipe
id: ClothingUniformJumpskirtCentcomOfficer
result: ClothingUniformJumpskirtCentcomOfficer
category: ClothingOther # Floof - Add categories to Centcomm drip recipes

- type: latheRecipe
parent: BaseCommandJumpsuitRecipe
id: ClothingUniformJumpskirtCentcomOfficial
result: ClothingUniformJumpskirtCentcomOfficial
category: ClothingOther # Floof - Add categories to Centcomm drip recipes
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@
description: It's a jumpsuit worn by CentCom Officers.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi # DeltaV - Centcomm Drip
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi # DeltaV - Centcomm Drip

- type: entity
parent: ClothingUniformBase
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,12 @@
- ClothingUniformJumpskirtCentcomFormalDress
- ClothingUniformJumpsuitCentcomOfficer
- ClothingUniformJumpsuitCentcomOfficial
# Floofstation section - Centcomm drip merge
- ClothingHeadHatBeretCentcomm
- ClothingUniformJumpskirtCentcomAgent
- ClothingUniformJumpskirtCentcomOfficer
- ClothingUniformJumpskirtCentcomOfficial
# Floofstation section end
- ClothingHeadHatSyndieMAA
- ClothingHeadHatSyndie
- ClothingUniformJumpsuitOperative
Expand Down
Loading
Loading