From 4af7986251529042cc2dcb09d06eb3697c049ed5 Mon Sep 17 00:00:00 2001 From: dustylens Date: Thu, 2 Jan 2025 11:48:09 -0800 Subject: [PATCH 1/2] Adds dresses to contractor loadouts --- .../_NF/Loadouts/Jobs/Contractor/jumpsuit.yml | 160 ++++++++++++++++++ .../Loadouts/contractor_loadout_groups.yml | 17 ++ 2 files changed, 177 insertions(+) diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml index 9c0a0d4b5f4..8784d414124 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml @@ -908,6 +908,166 @@ equipment: jumpsuit: ClothingUniformJumpskirtLawyerGood +- type: loadout + id: ContractorClothingUniformJumpskirtYellowOldDress + name: yellow old dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtYellowOldDress + +- type: loadout + id: ContractorClothingUniformJumpskirtYellowTurtleneckDress + name: yellow turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtBlueTurtleneckDress + name: blue turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtGreenTurtleneckDress + name: green turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtRedTurtleneckDress + name: red turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtPurpleTurtleneckDress + name: purple turtleneck dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress + +- type: loadout + id: ContractorClothingUniformJumpskirtOrangeStripedDress + name: orange striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtOrangeStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtPinkStripedDress + name: pink striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtPinkStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtGreenStripedDress + name: green striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtGreenStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtRedStripedDress + name: red striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtRedStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtCyanStripedDress + name: cyan striped dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtCyanStripedDress + +- type: loadout + id: ContractorClothingUniformJumpskirtPurpleElegantDress + name: purple elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtPurpleElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtBlueElegantDress + name: blue elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtBlueElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtGreenElegantDress + name: green elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtGreenElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtRedElegantDress + name: red elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtRedElegantDress + +- type: loadout + id: ContractorClothingUniformJumpskirtBlackElegantDress + name: black elegant dress + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + equipment: + jumpsuit: ClothingUniformJumpskirtBlackElegantDress + # Punk stuff - type: loadout id: ContractorClothingUniformRandomPunkCroptop diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index 689dec9ac50..ee016f22992 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -176,6 +176,23 @@ - ContractorClothingUniformJumpsuitMilitaryColorPurple - ContractorClothingUniformJumpsuitMilitaryColorLightBrown - ContractorClothingUniformJumpsuitMilitaryColorBrown + - ContractorClothingUniformJumpskirtYellowOldDress + - ContractorClothingUniformJumpskirtYellowTurtleneckDress + - ContractorClothingUniformJumpskirtBlueTurtleneckDress + - ContractorClothingUniformJumpskirtGreenTurtleneckDress + - ContractorClothingUniformJumpskirtRedTurtleneckDress + - ContractorClothingUniformJumpskirtPurpleTurtleneckDress + - ContractorClothingUniformJumpskirtOrangeStripedDress + - ContractorClothingUniformJumpskirtPinkStripedDress + - ContractorClothingUniformJumpskirtGreenStripedDress + - ContractorClothingUniformJumpskirtRedStripedDress + - ContractorClothingUniformJumpskirtCyanStripedDress + - ContractorClothingUniformJumpskirtPurpleElegantDress + - ContractorClothingUniformJumpskirtBlueElegantDress + - ContractorClothingUniformJumpskirtGreenElegantDress + - ContractorClothingUniformJumpskirtRedElegantDress + - ContractorClothingUniformJumpskirtBlackElegantDress + fallbacks: - ContractorClothingUniformJumpsuitColorGrey - ContractorClothingUniformJumpskirtColorGrey From af944581180929acd96d239d5f21440e358469d3 Mon Sep 17 00:00:00 2001 From: dustylens Date: Thu, 2 Jan 2025 18:02:32 -0800 Subject: [PATCH 2/2] re-order this stuff so it's aligned. --- .../_NF/Loadouts/Jobs/Contractor/jumpsuit.yml | 102 +++++++++--------- .../Loadouts/contractor_loadout_groups.yml | 30 +++--- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml index 8784d414124..82a4096eadb 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml @@ -909,164 +909,164 @@ jumpsuit: ClothingUniformJumpskirtLawyerGood - type: loadout - id: ContractorClothingUniformJumpskirtYellowOldDress - name: yellow old dress + id: ContractorClothingUniformJumpskirtBlackElegantDress + name: black elegant dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtYellowOldDress + jumpsuit: ClothingUniformJumpskirtBlackElegantDress - type: loadout - id: ContractorClothingUniformJumpskirtYellowTurtleneckDress - name: yellow turtleneck dress + id: ContractorClothingUniformJumpskirtRedElegantDress + name: red elegant dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress + jumpsuit: ClothingUniformJumpskirtRedElegantDress - type: loadout - id: ContractorClothingUniformJumpskirtBlueTurtleneckDress - name: blue turtleneck dress + id: ContractorClothingUniformJumpskirtGreenElegantDress + name: green elegant dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress + jumpsuit: ClothingUniformJumpskirtGreenElegantDress - type: loadout - id: ContractorClothingUniformJumpskirtGreenTurtleneckDress - name: green turtleneck dress + id: ContractorClothingUniformJumpskirtBlueElegantDress + name: blue elegant dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress + jumpsuit: ClothingUniformJumpskirtBlueElegantDress - type: loadout - id: ContractorClothingUniformJumpskirtRedTurtleneckDress - name: red turtleneck dress + id: ContractorClothingUniformJumpskirtPurpleElegantDress + name: purple elegant dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress + jumpsuit: ClothingUniformJumpskirtPurpleElegantDress - type: loadout - id: ContractorClothingUniformJumpskirtPurpleTurtleneckDress - name: purple turtleneck dress + id: ContractorClothingUniformJumpskirtCyanStripedDress + name: cyan striped dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress + jumpsuit: ClothingUniformJumpskirtCyanStripedDress - type: loadout - id: ContractorClothingUniformJumpskirtOrangeStripedDress - name: orange striped dress + id: ContractorClothingUniformJumpskirtRedStripedDress + name: red striped dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtOrangeStripedDress + jumpsuit: ClothingUniformJumpskirtRedStripedDress - type: loadout - id: ContractorClothingUniformJumpskirtPinkStripedDress - name: pink striped dress + id: ContractorClothingUniformJumpskirtGreenStripedDress + name: green striped dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtPinkStripedDress + jumpsuit: ClothingUniformJumpskirtGreenStripedDress - type: loadout - id: ContractorClothingUniformJumpskirtGreenStripedDress - name: green striped dress + id: ContractorClothingUniformJumpskirtPinkStripedDress + name: pink striped dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtGreenStripedDress + jumpsuit: ClothingUniformJumpskirtPinkStripedDress - type: loadout - id: ContractorClothingUniformJumpskirtRedStripedDress - name: red striped dress + id: ContractorClothingUniformJumpskirtOrangeStripedDress + name: orange striped dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtRedStripedDress + jumpsuit: ClothingUniformJumpskirtOrangeStripedDress - type: loadout - id: ContractorClothingUniformJumpskirtCyanStripedDress - name: cyan striped dress + id: ContractorClothingUniformJumpskirtPurpleTurtleneckDress + name: purple turtleneck dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtCyanStripedDress + jumpsuit: ClothingUniformJumpskirtPurpleTurtleneckDress - type: loadout - id: ContractorClothingUniformJumpskirtPurpleElegantDress - name: purple elegant dress + id: ContractorClothingUniformJumpskirtRedTurtleneckDress + name: red turtleneck dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtPurpleElegantDress + jumpsuit: ClothingUniformJumpskirtRedTurtleneckDress - type: loadout - id: ContractorClothingUniformJumpskirtBlueElegantDress - name: blue elegant dress + id: ContractorClothingUniformJumpskirtGreenTurtleneckDress + name: green turtleneck dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtBlueElegantDress - + jumpsuit: ClothingUniformJumpskirtGreenTurtleneckDress + - type: loadout - id: ContractorClothingUniformJumpskirtGreenElegantDress - name: green elegant dress + id: ContractorClothingUniformJumpskirtBlueTurtleneckDress + name: blue turtleneck dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtGreenElegantDress - + jumpsuit: ClothingUniformJumpskirtBlueTurtleneckDress + - type: loadout - id: ContractorClothingUniformJumpskirtRedElegantDress - name: red elegant dress + id: ContractorClothingUniformJumpskirtYellowTurtleneckDress + name: yellow turtleneck dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtRedElegantDress - + jumpsuit: ClothingUniformJumpskirtYellowTurtleneckDress + - type: loadout - id: ContractorClothingUniformJumpskirtBlackElegantDress - name: black elegant dress + id: ContractorClothingUniformJumpskirtYellowOldDress + name: yellow old dress effects: - !type:GroupLoadoutEffect proto: ContractorT1 price: 500 equipment: - jumpsuit: ClothingUniformJumpskirtBlackElegantDress + jumpsuit: ClothingUniformJumpskirtYellowOldDress # Punk stuff - type: loadout diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index ee016f22992..e3112b8fa0f 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -176,22 +176,22 @@ - ContractorClothingUniformJumpsuitMilitaryColorPurple - ContractorClothingUniformJumpsuitMilitaryColorLightBrown - ContractorClothingUniformJumpsuitMilitaryColorBrown - - ContractorClothingUniformJumpskirtYellowOldDress - - ContractorClothingUniformJumpskirtYellowTurtleneckDress - - ContractorClothingUniformJumpskirtBlueTurtleneckDress - - ContractorClothingUniformJumpskirtGreenTurtleneckDress - - ContractorClothingUniformJumpskirtRedTurtleneckDress - - ContractorClothingUniformJumpskirtPurpleTurtleneckDress - - ContractorClothingUniformJumpskirtOrangeStripedDress - - ContractorClothingUniformJumpskirtPinkStripedDress - - ContractorClothingUniformJumpskirtGreenStripedDress - - ContractorClothingUniformJumpskirtRedStripedDress - - ContractorClothingUniformJumpskirtCyanStripedDress - - ContractorClothingUniformJumpskirtPurpleElegantDress - - ContractorClothingUniformJumpskirtBlueElegantDress - - ContractorClothingUniformJumpskirtGreenElegantDress - - ContractorClothingUniformJumpskirtRedElegantDress - ContractorClothingUniformJumpskirtBlackElegantDress + - ContractorClothingUniformJumpskirtRedElegantDress + - ContractorClothingUniformJumpskirtGreenElegantDress + - ContractorClothingUniformJumpskirtBlueElegantDress + - ContractorClothingUniformJumpskirtPurpleElegantDress + - ContractorClothingUniformJumpskirtCyanStripedDress + - ContractorClothingUniformJumpskirtRedStripedDress + - ContractorClothingUniformJumpskirtGreenStripedDress + - ContractorClothingUniformJumpskirtPinkStripedDress + - ContractorClothingUniformJumpskirtOrangeStripedDress + - ContractorClothingUniformJumpskirtPurpleTurtleneckDress + - ContractorClothingUniformJumpskirtRedTurtleneckDress + - ContractorClothingUniformJumpskirtGreenTurtleneckDress + - ContractorClothingUniformJumpskirtBlueTurtleneckDress + - ContractorClothingUniformJumpskirtYellowTurtleneckDress + - ContractorClothingUniformJumpskirtYellowOldDress fallbacks: - ContractorClothingUniformJumpsuitColorGrey