From 421d0a28c7c0739dd604175f126c4a4e59040cce Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 9 Aug 2024 00:56:29 -0400 Subject: [PATCH 1/6] Nerf the tactical maid gloves for loadouts --- Resources/Prototypes/Entities/Clothing/Hands/gloves.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 4cd0c04e2be..5fac9528264 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -256,7 +256,7 @@ sprite: Clothing/Hands/Gloves/tacticalmaidgloves.rsi - type: GloveHeatResistance heatResistance: 1400 - - type: Insulated +# - type: Insulated- Removed this property because I'm adding them to loadouts, hopefully this doesn't break anything! - type: Fiber fiberColor: fibers-black From c13d8056c5f90622669cf2ce88e3de061f44f564 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:06:26 -0400 Subject: [PATCH 2/6] Add the Tactical Maid Gloves to the hands loadout option --- Resources/Prototypes/Loadouts/hands.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml index 6cef6420571..a0825838cb2 100644 --- a/Resources/Prototypes/Loadouts/hands.yml +++ b/Resources/Prototypes/Loadouts/hands.yml @@ -121,3 +121,11 @@ exclusive: true items: - ClothingHandsGlovesFingerless + +- type: loadout + id: LoadoutHandsGlovesTacticalMaid + category: Hands + cost: 2 + exclusive: true + items: + - ClothingHandsTacticalMaidGloves From 765f0ce2ce6df234f754911f5853a7c7ff5c9555 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:28:27 -0400 Subject: [PATCH 3/6] Add every maid jumpskirt --- Resources/Prototypes/Loadouts/uniform.yml | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index 5843cb30ee5..674bc9a42d6 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -1516,3 +1516,45 @@ inverted: true departments: - Command + +- type: loadout + id: LoadoutUniformJumpskirtTacticalMaid + category: Uniform + cost: 3 + exclusive: true + items: + - ClothingUniformJumpskirtTacticalMaid + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command + +- type: loadout + id: LoadoutUniformJumpskirtJanimaid + category: Uniform + cost: 3 + exclusive: true + items: + - ClothingUniformJumpskirtJanimaid + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command + +- type: loadout + id: LoadoutUniformJumpskirtJanimaidmini + category: Uniform + cost: 3 + exclusive: true + items: + - ClothingUniformJumpskirtJanimaidmini + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command From 0e5a67bb5e54a4143b4075ac71dcd02210c52e9e Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:39:07 -0400 Subject: [PATCH 4/6] Add the tactical maid headband into loadouts --- Resources/Prototypes/Loadouts/head.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml index d2c42066d4b..ece7cb8bd7a 100644 --- a/Resources/Prototypes/Loadouts/head.yml +++ b/Resources/Prototypes/Loadouts/head.yml @@ -503,6 +503,20 @@ items: - ClothingHeadHatBowlerHat +- type: loadout #FloofStation + id: LoadoutTacticalMaidHeadband + category: Head + cost: 2 + exclusive: true + items: + - ClothingHeadHatTacticalMaidHeadband + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command + # Flatcaps - type: loadout id: LoadoutHeadGreyFlatcap From 414f614e5b11c155fe65a5554104bb6abac52c77 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:45:29 -0400 Subject: [PATCH 5/6] Add FloofStation Comment to Tactical Maid Gloves in Loadout --- Resources/Prototypes/Loadouts/hands.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml index a0825838cb2..609caac8754 100644 --- a/Resources/Prototypes/Loadouts/hands.yml +++ b/Resources/Prototypes/Loadouts/hands.yml @@ -122,7 +122,7 @@ items: - ClothingHandsGlovesFingerless -- type: loadout +- type: loadout #FloofStation id: LoadoutHandsGlovesTacticalMaid category: Hands cost: 2 From 65a0d054dc06c7043e20ad843c611800a0810a4c Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:46:51 -0400 Subject: [PATCH 6/6] Add Floofstation comments to all maid outfits in loadouts --- Resources/Prototypes/Loadouts/uniform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index 674bc9a42d6..48913de23df 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -1517,7 +1517,7 @@ departments: - Command -- type: loadout +- type: loadout #FloofStation id: LoadoutUniformJumpskirtTacticalMaid category: Uniform cost: 3 @@ -1531,7 +1531,7 @@ - Security - Command -- type: loadout +- type: loadout #FloofStation id: LoadoutUniformJumpskirtJanimaid category: Uniform cost: 3 @@ -1545,7 +1545,7 @@ - Security - Command -- type: loadout +- type: loadout #FloofStation id: LoadoutUniformJumpskirtJanimaidmini category: Uniform cost: 3