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.

Sign up for GitHub

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

Suits Suits Suits! #1223

Merged
merged 5 commits into from
Jan 4, 2025
Merged

Suits Suits Suits! #1223

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afd35de
Suits Suits Suits
MintyTheBinty Jan 4, 2025
39775d7
typo oops
MintyTheBinty Jan 4, 2025
1929caa
Restructuring
MintyTheBinty Jan 4, 2025
b0c7bc1
Ctrl Z Oops
MintyTheBinty Jan 4, 2025
41815bf
Learn Every Day
MintyTheBinty Jan 4, 2025
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
- id: MagazineBoxAntiMateriel
- id: ClothingNeckTieRed
- id: ClothingHandsGlovesLatex
- id: ClothingUniformJumpsuitLawyerBlack
- id: ClothingUniformHitmanSuit
hivehum marked this conversation as resolved.
Show resolved Hide resolved
- id: BarberScissors

- type: entity
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
ClothingOuterWinterBar: 2
ClothingUniformJumpsuitBartender: 2
ClothingUniformJumpskirtBartender: 2
ClothingUniformNightclubSuit: 2 #imp
ClothingUniformNightclubSuitSkirt: 2 #imp
ClothingUniformJumpsuitBartenderPurple: 2
ClothingShoesColorBlack: 2
ClothingOuterArmorBasicSlim: 2
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
startingInventory:
ClothingUniformJumpsuitChaplain: 2
ClothingUniformJumpskirtChaplain: 2
ClothingUniformFuneralSuit: 4 #imp
ClothingUniformFuneralSuitSkirt: 4 #imp
ClothingUniformJumpsuitMonasticRobeDark: 1
ClothingUniformJumpsuitMonasticRobeLight: 1
ClothingNeckStoleChaplain: 1
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
ClothingUniformJumpskirtCurator: 3
ClothingUniformJumpsuitLibrarian: 3
ClothingUniformJumpskirtLibrarian: 3
ClothingUniformBrownSuit: 2 #imp
ClothingUniformBrownSuitSkirt: 2 #imp
ClothingShoesBootsLaceup: 2
ClothingHeadsetService: 2


4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
ClothingHeadHatFedoraBrown: 2
ClothingUniformJumpsuitDetectiveGrey: 2
ClothingUniformJumpskirtDetectiveGrey: 2
ClothingUniformDetectiveSuit: 2 #imp
ClothingUniformDetectiveSuitSkirt: 2 #imp
ClothingUniformMiamiVice: 2 #imp
ClothingUniformMiamiViceSkirt: 2 #imp
ClothingOuterVestDetective: 2
ClothingNeckTieDet: 2
ClothingHeadHatFedoraGrey: 2
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
ClothingUniformJumpskirtLawyerRed: 1
ClothingUniformJumpsuitLawyerBlack: 1
ClothingUniformJumpskirtLawyerBlack: 1
ClothingUniformCreamSuit: 1 #imp
ClothingUniformCreamSuitSkirt: 1 #imp
ClothingUniformJumpsuitLawyerGood: 1
ClothingUniformJumpskirtLawyerGood: 1
ClothingShoesBootsLaceup: 2
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
ClothingHeadHatSkub: 2
ClothingOuterSkub: 2
ClothingHeadHatBeretFrench: 2
ClothingUniformMrSpaceWide: 2 #imp
ClothingUniformMrSpaceWideSkirt: 2 #imp
ClothingOuterSuitChicken: 2
ClothingHeadHatChickenhead: 2
ClothingOuterSuitMonkey: 2
Expand Down Expand Up @@ -68,6 +70,10 @@
ClothingShoesSlippers: 1
ClothingShoesTourist: 1
ClothingShoesWizard: 1
ClothingUniformHitmanSuit: 1 #imp
ClothingUniformHitmanSuitSkirt: 1 #imp
ClothingUniformBrosBlazer: 1 #imp
ClothingUniformBrosBlazerSkirt: 1 #imp
emaggedInventory:
ClothingShoesBling: 1
ClothingShoesBootsCowboyFancy: 1
Expand Down
26 changes: 26 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,32 @@
equipment:
jumpsuit: ClothingUniformJumpsuitBartenderPurple

- type: loadout
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all these loadout prototypes should go into our own file structure

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, would it just be the job yml's that need to be in the impstation structure or does the loadout_groups.yml have to get moved too? I can remove em from the ymls in the main structure and move em on over there.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anything that is a new prototype should be in our file structure, so the loadout_groups edits are fine (because you are changing an existing prototype) but all the loadouts you added to these job ymls should be moved

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha gotcha, just got the changes committed now. Anything else I should fiddle with before final approval?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like you deleted the meta.json of jumpskirt/hitmansuit.rsi, which is causing issues

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added back in now, hit ctrl z one to many times....

id: ClothingUniformNightclubSuit
equipment:
jumpsuit: ClothingUniformNightclubSuit #imp

- type: loadout
id: ClothingUniformNightclubSuitSkirt
equipment:
jumpsuit: ClothingUniformNightclubSuitSkirt #imp

- type: loadout
id: ClothingUniformSeniorBartender
effects:
- !type:GroupLoadoutEffect
proto: SeniorBartender
equipment:
id: ClothingUniformSeniorBartender #imp

- type: loadout
id: ClothingUniformSeniorBartenderSkirt
effects:
- !type:GroupLoadoutEffect
proto: SeniorBartender
equipment:
id: ClothingUniformSeniorBartenderSkirt #imp

# Neck
- type: loadout
id: RedTie
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@
equipment:
jumpsuit: ClothingUniformJumpsuitMonasticRobeLight

- type: loadout
id: ClothingUniformFuneralSuit
equipment:
jumpsuit: ClothingUniformFuneralSuit #imp

- type: loadout
id: ClothingUniformFuneralSuitSkirt
equipment:
jumpsuit: ClothingUniformFuneralSuitSkirt #imp

# Neck
- type: loadout
id: ChaplainNeck
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@
equipment:
jumpsuit: ClothingUniformJumpskirtLawyerGood

- type: loadout
id: ClothingUniformCreamSuit
equipment:
jumpsuit: ClothingUniformCreamSuit #imp

- type: loadout
id: ClothingUniformCreamSuitSkirt
equipment:
jumpsuit: ClothingUniformCreamSuitSkirt #imp

# Neck
- type: loadout
id: LawyerNeck
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,14 @@
id: CuratorJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtCurator

- type: loadout
id: ClothingUniformBrownSuit
equipment:
jumpsuit: ClothingUniformBrownSuit #imp

- type: loadout
id: ClothingUniformBrownSuitSkirt
equipment:
jumpsuit: ClothingUniformBrownSuitSkirt #imp

10 changes: 10 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
equipment:
jumpsuit: ClothingUniformJumpskirtMusician

- type: loadout
id: ClothingUniformMrSpaceWide
equipment:
jumpsuit: ClothingUniformMrSpaceWide #imp

- type: loadout
id: ClothingUniformMrSpaceWideSkirt
equipment:
jumpsuit: ClothingUniformMrSpaceWideSkirt #imp

# Outerclothing
- type: loadout
id: MusicianWintercoat
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,26 @@
equipment:
jumpsuit: ClothingUniformJumpskirtDetectiveGrey

- type: loadout
id: ClothingUniformMiamiVice
equipment:
jumpsuit: ClothingUniformMiamiVice #imp

- type: loadout
id: ClothingUniformMiamiViceSkirt
equipment:
jumpsuit: ClothingUniformMiamiViceSkirt #imp

- type: loadout
id: ClothingUniformDetectiveSuit
equipment:
jumpsuit: ClothingUniformDetectiveSuit #imp

- type: loadout
id: ClothingUniformDetectiveSuitSkirt
equipment:
jumpsuit: ClothingUniformDetectiveSuitSkirt #imp

# OuterClothing
- type: loadout
id: DetectiveArmorVest
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,14 @@
id: JournalistJumpsuit
equipment:
jumpsuit: ClothingUniformJumpsuitJournalist

- type: loadout
id: ClothingUniformBrosBlazer
equipment:
jumpsuit: ClothingUniformBrosBlazer #imp

- type: loadout
id: ClothingUniformBrosBlazerSkirt
equipment:
jumpsuit: ClothingUniformBrosBlazerSkirt #imp

18 changes: 18 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@
- BartenderJumpsuit
- BartenderJumpskirt
- BartenderJumpsuitPurple
- ClothingUniformNightclubSuit #imp
- ClothingUniformNightclubSuitSkirt #imp
- ClothingUniformSeniorBartender #imp
- ClothingUniformSeniorBartenderSkirt #imp

- type: loadoutGroup
id: BartenderNeck
Expand Down Expand Up @@ -406,6 +410,8 @@
- LibrarianJumpskirt
- CuratorJumpsuit
- CuratorJumpskirt
- ClothingUniformBrownSuit #imp
- ClothingUniformBrownSuitSkirt #imp

- type: loadoutGroup
id: LibrarianNeck
Expand Down Expand Up @@ -436,6 +442,8 @@
- LawyerJumpskirtRed
- LawyerJumpsuitGood
- LawyerJumpskirtGood
- ClothingUniformCreamSuit #imp
- ClothingUniformCreamSuitSkirt #imp

- type: loadoutGroup
id: LawyerNeck
Expand Down Expand Up @@ -478,6 +486,8 @@
- ChaplainJumpskirt
- ChaplainRobesLight
- ChaplainRobesDark
- ClothingUniformFuneralSuit #imp
- ClothingUniformFuneralSuitSkirt #imp

- type: loadoutGroup
id: ChaplainOuterClothing
Expand Down Expand Up @@ -771,6 +781,8 @@
loadouts:
- MusicianJumpsuit
- MusicianJumpskirt
- ClothingUniformMrSpaceWide #imp
- ClothingUniformMrSpaceWideSkirt #imp

- type: loadoutGroup
id: MusicianNeck
Expand Down Expand Up @@ -1497,6 +1509,10 @@
- DetectiveJumpskirt
- NoirJumpsuit
- NoirJumpskirt
- ClothingUniformMiamiVice #imp
- ClothingUniformMiamiViceSkirt #imp
- ClothingUniformDetectiveSuit #imp
- ClothingUniformDetectiveSuitSkirt #imp

- type: loadoutGroup
id: DetectiveOuterClothing
Expand Down Expand Up @@ -1862,6 +1878,8 @@
loadouts:
- ReporterJumpsuit
- JournalistJumpsuit
- ClothingUniformBrosBlazer #imp
- ClothingUniformBrosBlazerSkirt #imp

- type: loadoutGroup
id: ReporterNeck
Expand Down
110 changes: 110 additions & 0 deletions Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpskirts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,113 @@
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/hos_pro.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/hos_pro.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformHitmanSuitSkirt
name: contract killer suitskirt
description: The perfect outfit for blending in at any event, office, or space station.
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/hitmansuit.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformFuneralSuitSkirt
name: funeral suitskirt
description: For when no color is allowed and all must be mourned.
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/funeralsuit.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformNightclubSuitSkirt
name: nightclub suitskirt
description: ID please?
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/nightclubsuit.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformMrSpaceWideSkirt
name: mr space wide suitskirt
description: The unspoken attire for any hotel, motel, or branded inn activities.
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/mrspacewide.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformBrownSuitSkirt
name: brown suitskirt
description: Not even the worst coffee spills will show up on this puppy, guaranteed.
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brownsuit.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformCreamSuitSkirt
name: cream suitskirt
description: A suit fit for a humble, small town gentleman with something to say.
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/creamsuit.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformDetectiveSuitSkirt
name: detective suitskirt
description: Now excuse me, if I may just have a moment of your time...
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/detectivesuit.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformMiamiViceSkirt
name: miami vice suitskirt
description: When you need to arrest the clown at twelve o'clock and boogie board at one.
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/miamivice.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformSeniorBartenderSkirt
name: senior bartender suitskirt
description: But you are the bartender, you've always been the bartender.
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/senior_bartender.rsi

- type: entity
parent: [ClothingUniformBase]
id: ClothingUniformBrosBlazerSkirt
name: BROS blazer and jeans skirt
description: BROS... Two!
components:
- type: Sprite
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpskirt/brosblazer.rsi
Loading
Loading