Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_starcup/clothing/examine/security.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,17 @@ clothing-hos-coat = [color=#a40000]Head of Security's armored trenchcoat[/color]
clothing-riot-suit = [color=#a40000]riot suit[/color]
clothing-bio-suit-security = [color=#a40000]security bio suit[/color]
clothing-warden-jacket = [color=#a40000]warden's armored jacket[/color]
clothing-warden-longcoat = [color=#a40000]warden's armored longcoat[/color]
clothing-security-hardsuit = [color=#a40000]security hardsuit[/color]
clothing-brigmedic-hardsuit = [color=#a40000]combat medic hardsuit[/color]
clothing-warden-hardsuit = [color=#a40000]warden hardsuit[/color]
clothing-hos-hardsuit = [color=#a40000]Head of Security's hardsuit[/color]
clothing-security-winter-coat = [color=#a40000]security winter coat[/color]
clothing-security-winter-coat = [color=#a40000]security longcoat[/color]
clothing-warden-winter-coat = [color=#a40000]warden's armored winter coat[/color]
clothing-hos-winter-coat = [color=#a40000]Head of Security's armored winter coat[/color]
clothing-hos-winter-coat = [color=#a40000]Head of Security's armored longcoat[/color]


## Shoes
clothing-jackboots = [color=#a40000]jackboots[/color]
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
container:
entity: WrappedParcel
containerId: contents
cost: 3300 # starcup: this changes almost every time more clothes are added; it should generally only increase
cost: 3740 # starcup: this changes almost every time more clothes are added; it should generally only increase
category: cargoproduct-category-name-service
group: market

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
ClothingOuterWinterCoat: 2
ClothingOuterWinterCoatLong: 2
ClothingOuterWinterCoatPlaid: 2
ClothingLongcoatBlack: 2
ClothingLongcoatBrown: 2
# End DeltaV Additions
ClothingHeadFishCap: 2
ClothingHeadRastaHat: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
ClothingHeadsetSecurity: 3
ClothingOuterWinterSec: 2
ClothingOuterArmorBasic: 2
ClothingLongcoatBrigmedic: 2 # DeltaV - Longcoats
ClothingLongcoatSecurity: 2 # DeltaV - Longcoats
ClothingNeckCWPSec: 2 # DeltaV - add cold weather ponchos
ClothingNeckScarfStripedRed: 3
ClothingOuterArmorBasicSlim: 2
ClothingEyesBlindfold: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
ClothingOuterSweaterReindeer: 3
ClothingOuterSweaterSnowman: 3
ClothingOuterSweaterTree: 3
ClothingNeckCWPArctic: 2
# end starcup
# Begin DeltaV additions
ClothingOuterWinterColorRed: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@
- state: SEC-equipped-OUTERCLOTHING
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterSec
- type: Armor # DeltaV - adds resists to coat
- type: Armor # DeltaV - adds resists to coat. Make sure to update ClothingLongcoatSecurity if these values change.
modifiers:
coefficients:
Blunt: 0.85
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,9 @@
- Scarves
- Carpets
- Bedsheets
- BeltsDeltaV # Delta-V
# begin Delta-V
- BeltsDeltaV
# end Delta-V
- ClothingStarcup # starcup
- type: EmagLatheRecipes
emagStaticPacks:
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@
minLimit: 0
loadouts:
- PassengerWintercoat
# DeltaV: begin additions
- LongcoatBlack
- LongcoatBrown
# starcup: begin additions
- BlackHoodie
- GrayHoodie
Expand Down Expand Up @@ -919,6 +922,7 @@
name: loadout-group-quartermaster-outerclothing
minLimit: 0
loadouts:
- QuartermasterLongcoat # DeltaV - Longcoats
- QuartermasterWintercoat
- TrenchCoat # starcup

Expand Down Expand Up @@ -1069,6 +1073,7 @@
name: loadout-group-chief-engineer-outerclothing
minLimit: 0
loadouts:
- ChiefEngineerLongcoat # DeltaV - Longcoats
- ChiefEngineerWintercoat

- type: loadoutGroup
Expand Down Expand Up @@ -1253,6 +1258,7 @@
minLimit: 0
loadouts:
- ResearchDirectorLabCoat
- ResearchDirectorLongcoat # DeltaV - Longcoats
- ResearchDirectorWintercoat

- type: loadoutGroup
Expand Down Expand Up @@ -1408,6 +1414,7 @@
id: HeadofSecurityOuterClothing
name: loadout-group-head-of-security-outerclothing
loadouts:
- HeadofSecurityLongcoat # DeltaV
- HeadofSecurityCoat
- HeadofSecurityWinterCoat

Expand Down Expand Up @@ -1438,6 +1445,7 @@
id: WardenOuterClothing
name: loadout-group-warden-outerclothing
loadouts:
- WardenLongcoat # DeltaV - Longcoats
- WardenCoat
- WardenArmoredWinterCoat

Expand Down Expand Up @@ -1470,6 +1478,8 @@
- SeniorOfficerJumpsuit
- SeniorOfficerJumpskirt
- TrooperUniform
- SeniorSecOfficerTurtlesuit
- SeniorSecOfficerTurtleskirt

- type: loadoutGroup
id: SecurityBackpack
Expand All @@ -1494,6 +1504,7 @@
- ArmorVestSlim
- SecurityOfficerWintercoat
- SecuritySweater # starcup
- LongcoatSecurity # DeltaV

- type: loadoutGroup
id: SecurityShoes
Expand Down Expand Up @@ -1555,6 +1566,7 @@
- DetectiveArmorVest
- DetectiveCoat
- DetectiveCoatGrey
- LongcoatSecurity # DeltaV
# starcup: begin additions
- StasecWinterCoatDet
- MNKBlackTopCoat
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Loadouts/LoadoutGroups/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
loadouts:
- ChiefMedicalOfficerLabCoat
- ChiefMedicalOfficerWintercoat
- ChiefMedicalOfficerLongcoat # DeltaV - Longcoats

- type: loadoutGroup
parent: [ MedicalDoctorNeck ] # starcup
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- ClothingUniformJumpsuitQMTurtleneck
- ClothingUniformJumpskirtQMTurtleneck
- ClothingUniformJumpsuitQMFormal
- ClothingLongcoatQM

- type: latheRecipePack
id: ClothingCommand
Expand Down Expand Up @@ -49,6 +50,7 @@
- ClothingUniformJumpskirtChiefEngineer
- ClothingUniformJumpsuitChiefEngineerTurtle
- ClothingUniformJumpskirtChiefEngineerTurtle
- ClothingLongcoatCE # starcup
- ClothingUniformJumpsuitEngineering
- ClothingUniformJumpskirtEngineering
- ClothingUniformJumpsuitSeniorEngineer
Expand All @@ -64,6 +66,7 @@
- ClothingUniformJumpskirtCMO
- ClothingUniformJumpsuitCMOTurtle
- ClothingUniformJumpskirtCMOTurtle
- ClothingLongcoatCMO # starcup
- ClothingHeadHatBeretSeniorPhysician
- ClothingUniformJumpsuitMedicalDoctor
- ClothingUniformJumpskirtMedicalDoctor
Expand All @@ -79,6 +82,7 @@
- ClothingHeadHatBeretRND
- ClothingUniformJumpsuitResearchDirector
- ClothingUniformJumpskirtResearchDirector
- ClothingLongcoatRD
- ClothingUniformJumpsuitScientist
- ClothingUniformJumpskirtScientist
- ClothingUniformJumpsuitSeniorResearcher
Expand Down Expand Up @@ -115,6 +119,7 @@
- ClothingHeadHatWarden
- ClothingUniformJumpsuitWarden
- ClothingUniformJumpskirtWarden
- ClothingNeckCWPSec # starcup

- type: latheRecipePack
id: ClothingService
Expand Down Expand Up @@ -189,6 +194,7 @@
- ClothingNeckScarfStripedOrange
- ClothingNeckScarfStripedBlack
- ClothingNeckScarfStripedPurple
- ClothingNeckCWPArctic # starcup

- type: latheRecipePack
id: Carpets
Expand Down
30 changes: 30 additions & 0 deletions Resources/Prototypes/_DV/Entities/Clothing/Neck/misc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckCWPSec
name: security cold weather poncho
description: The Cold Weather Poncho, advertised as a masterpiece of elemental protection. The truth is that it's itchy, stuffy, and a little baggy - but at least it's not cold. This one is grey with Station Security markings.
components:
- type: Sprite
sprite: _DV/Clothing/Neck/Misc/cwpsec.rsi
- type: Clothing
sprite: _DV/Clothing/Neck/Misc/cwpsec.rsi
- type: Item
size: Normal
- type: TemperatureProtection
heatingCoefficient: 1.1
coolingCoefficient: 0.1
- type: Armor
modifiers:
coefficients:
Heat: 0.90

- type: entity
parent: ClothingNeckCWPSec
id: ClothingNeckCWPArctic
name: cold weather poncho
description: The Cold Weather Poncho, advertised as a masterpiece of elemental protection. The truth is that it's itchy, stuffy, and a little baggy - but at least it's not cold.
components:
- type: Sprite
sprite: _DV/Clothing/Neck/Misc/cwparctic.rsi
- type: Clothing
sprite: _DV/Clothing/Neck/Misc/cwparctic.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
- type: entity
parent: [ClothingOuterWinterCoat, BaseCommandContraband]
id: ClothingLongcoatQM
name: logistics officer's longcoat
description: A saturated brown double-breasted longcoat with mossy trim, specifically designed for the Logistics Officer. Longcoats are fairly robust, offering some protection from the elements. # starcup - fixed caps
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/logstics-officer.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/logstics-officer.rsi

- type: entity
parent: [ClothingOuterWinterCoat, ClothingUniformFoldableBase, BaseCommandContraband]
id: ClothingLongcoatRD
name: research director's longcoat # starcup - no mystagogue
description: A pure white double-breasted longcoat with a purple stripe, specifically designed for the Research Director. Longcoats are fairly robust, offering some protection from the elements. # starcup - RD swap
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/mystagogue.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/mystagogue.rsi

- type: entity
parent: [ClothingOuterWinterCoat, BaseCommandContraband]
id: ClothingLongcoatCMO
name: chief medical officer's longcoat
description: A double-breasted longcoat with a green cross, specifically designed for the Chief Medical Officer. Longcoats are fairly robust, offering some protection from the elements. # starcup - fixed caps
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-medical-officer.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-medical-officer.rsi
- type: Armor # Same as ClothingOuterWinterCMO, can't just parent because of ClothingOuterWinterCoatToggleable
modifiers:
coefficients:
Slash: 0.95
Heat: 0.90
Caustic: 0.75

- type: entity
parent: [ClothingOuterWinterCoat, BaseCommandContraband]
id: ClothingLongcoatCE
name: chief engineer's longcoat
description: A dark green double-breasted with LED strip trim, specifically designed for the Chief Engineer. Longcoats are fairly robust, offering some protection from the elements. # starcup - fixed caps
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-engineer.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/chief-engineer.rsi

- type: entity
parent: [ClothingOuterArmorHoS, BaseSecurityCommandContraband, BaseExaminableClothing] # starcup - examinable clothing
id: ClothingLongcoatHoS
name: head of security's armored longcoat
description: A black double-breasted longcoat with gold buttons and gray sleeves with velvet trim along the whole outfit, specifically designed for the Head of Security. Security longcoats sport protective plates underneath, but are fairly heavy. # starcup - fixed caps
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/head-of-security.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/head-of-security.rsi
- type: Armor # Same as ClothingOuterWinterHoS, can't use as parent because ClothingOuterArmoredWinterCoatToggleable
modifiers:
coefficients:
Blunt: 0.65
Slash: 0.65
Piercing: 0.6
Heat: 0.7
Caustic: 0.75
# begin starcup: examinable clothing
- type: ExaminableClothing
examineText: clothing-hos-winter-coat
# end starcup
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Everyone
- type: entity
parent: ClothingOuterWinterCoat
id: ClothingLongcoatBlack
name: black longcoat
description: A matte black double-breasted longcoat with gold-tinted brass buttons. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/black.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/black.rsi

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingLongcoatBrown
name: brown longcoat
description: A matte brown double-breasted longcoat with stylish onyx buttons. Longcoats are fairly robust, offering some protection from the elements.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/brown.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/brown.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
- type: entity
parent: [ ClothingOuterArmorWarden, BaseSecurityContraband, BaseExaminableClothing ] # Same as ClothingOuterCoatWarden, without ClothingOuterWinterCoatToggleable from ClothingOuterWinterWarden # starcup - added examinable clothing
id: ClothingLongcoatWarden
name: warden's armored longcoat
description: A black double-breasted longcoat with silver buttons and red band and cuffs, specifically designed for the warden. Security longcoats sport protective plates underneath, but are fairly heavy.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/warden.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/warden.rsi
# begin starcup: examinable clothing
- type: ExaminableClothing
examineText: clothing-warden-longcoat
# end starcup

- type: entity
parent: [ ClothingOuterWinterCoatToggleable, BaseSecurityContraband, BaseExaminableClothing ] # Same as ClothingOuterWinterSec, without ClothingOuterWinterCoatToggleable # starcup - added examinable clothing
id: ClothingLongcoatSecurity
name: security officer's armored longcoat
description: A black double-breasted longcoat with silver buttons and red bands, specifically designed for security personnel. Security longcoats sport protective plates underneath, but are fairly heavy.
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/security.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/security.rsi
# begin starcup: examinable clothing
- type: ExaminableClothing
examineText: clothing-security-winter-coat
# end starcup

- type: entity
parent: [ ClothingOuterWinterCoatToggleable, BaseSecurityContraband, BaseExaminableClothing ] # Same as ClothingOuterWinterSec, without ClothingOuterWinterCoatToggleable # starcup - reparented/added examinable clothing
id: ClothingLongcoatBrigmedic
name: combat medic's armored longcoat
description: A black double-breasted longcoat with silver buttons, blue bands, and sterile fabric cuffs, specifically designed for the combat medic. Security longcoats sport protective plates underneath, though this one comes with lighter plates that traditional security longcoats. # starcup - corpsman -> cb medic
components:
- type: Sprite
sprite: _Floof/Clothing/OuterClothing/Longcoats/corpsman.rsi
- type: Clothing
sprite: _Floof/Clothing/OuterClothing/Longcoats/corpsman.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
- type: entity
parent: ClothingOuterArmoredWinterCoat
id: ClothingOuterCoatStasecDet
name: detective's coat
name: detective's winter coat
description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is detective plum.
components:
- type: Sprite
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/_DV/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,15 @@
sprite: _DV/Clothing/Uniforms/Jumpskirt/roboneuroticistpurple.rsi
- type: Clothing
sprite: _DV/Clothing/Uniforms/Jumpskirt/roboneuroticistpurple.rsi

# Senior Officer uniform
- type: entity
parent: ClothingUniformFoldableBase
id: ClothingUniformJumpskirtSecTurtle
name: senior officer's turtleneck
description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer.
components:
- type: Sprite
sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi
- type: Clothing
sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi
Loading
Loading