From 27c901cee222d91f7932103549fd0e208ffb008c Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 17:53:50 -0400 Subject: [PATCH 01/12] Moving goggle loadouts from the EE folder --- Resources/Prototypes/Loadouts/eyes.yml | 28 -------------------------- 1 file changed, 28 deletions(-) diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml index 8557e9f982b..02d411be078 100644 --- a/Resources/Prototypes/Loadouts/eyes.yml +++ b/Resources/Prototypes/Loadouts/eyes.yml @@ -50,31 +50,3 @@ exclusive: true items: - ClothingEyesGlassesSunglasses - -# Cosmetic Goggles FloofStation - -- type: loadout - id: LoadoutEyesThermalBudget - category: Eyes - cost: 2 - exclusive: true - items: - - ClothingEyesGlassesThermalBudget - -- type: loadout - id: LoadoutEyesChemicalBudget - category: Eyes - cost: 2 - exclusive: true - items: - - ClothingEyesGlassesChemicalBudget - - -- type: loadout - id: LoadoutEyesMesonBudget - category: Eyes - cost: 2 - exclusive: true - items: - - ClothingEyesGlassesMesonBudget - From f0d9a7160a915f0adf36cb90d0705ebae0c8a8f4 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 17:54:59 -0400 Subject: [PATCH 02/12] created eyes.yml and moved goggle loadouts to it --- Resources/Prototypes/Floof/Loadouts/eyes.yml | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Resources/Prototypes/Floof/Loadouts/eyes.yml diff --git a/Resources/Prototypes/Floof/Loadouts/eyes.yml b/Resources/Prototypes/Floof/Loadouts/eyes.yml new file mode 100644 index 00000000000..a3e2948739a --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/eyes.yml @@ -0,0 +1,26 @@ +# Cosmetic Goggles FloofStation + +- type: loadout + id: LoadoutEyesThermalBudget + category: Eyes + cost: 2 + exclusive: true + items: + - ClothingEyesGlassesThermalBudget + +- type: loadout + id: LoadoutEyesChemicalBudget + category: Eyes + cost: 2 + exclusive: true + items: + - ClothingEyesGlassesChemicalBudget + + +- type: loadout + id: LoadoutEyesMesonBudget + category: Eyes + cost: 2 + exclusive: true + items: + - ClothingEyesGlassesMesonBudget From 911f6dfc85765627f0100d43400d92fcc66d9c61 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 17:59:09 -0400 Subject: [PATCH 03/12] Moving all floofstation exclusives to own folder --- Resources/Prototypes/Loadouts/head.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml index ece7cb8bd7a..946b6b8d2b5 100644 --- a/Resources/Prototypes/Loadouts/head.yml +++ b/Resources/Prototypes/Loadouts/head.yml @@ -155,14 +155,6 @@ items: - ClothingHeadHatBellhop -- type: loadout # FloofStation - id: LoadoutFoodPoppy - category: Head - cost: 1 - exclusive: true - items: - - FoodPoppy - # Color Hats - type: loadout id: LoadoutHeadHatBluesoft @@ -503,20 +495,6 @@ 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 bec1c97d10aefbf03f356b7f4b95aadf8ee06d76 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 17:59:38 -0400 Subject: [PATCH 04/12] Moved all loadout exclusives to head.yml in floof folder --- Resources/Prototypes/Floof/Loadouts/head.yml | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Resources/Prototypes/Floof/Loadouts/head.yml diff --git a/Resources/Prototypes/Floof/Loadouts/head.yml b/Resources/Prototypes/Floof/Loadouts/head.yml new file mode 100644 index 00000000000..e439aec49f8 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/head.yml @@ -0,0 +1,22 @@ +- type: loadout # FloofStation + id: LoadoutFoodPoppy + category: Head + cost: 1 + exclusive: true + items: + - FoodPoppy + +- type: loadout #FloofStation + id: LoadoutTacticalMaidHeadband + category: Head + cost: 2 + exclusive: true + items: + - ClothingHeadHatTacticalMaidHeadband + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command + From d8fef3945c24ffacf5adb0f7caef80b295eea3d4 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:00:58 -0400 Subject: [PATCH 05/12] Moving tactical maid gloves to floof folder --- Resources/Prototypes/Loadouts/hands.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Resources/Prototypes/Loadouts/hands.yml b/Resources/Prototypes/Loadouts/hands.yml index 609caac8754..667b91f3f8f 100644 --- a/Resources/Prototypes/Loadouts/hands.yml +++ b/Resources/Prototypes/Loadouts/hands.yml @@ -122,10 +122,3 @@ items: - ClothingHandsGlovesFingerless -- type: loadout #FloofStation - id: LoadoutHandsGlovesTacticalMaid - category: Hands - cost: 2 - exclusive: true - items: - - ClothingHandsTacticalMaidGloves From a1a453460d8eb9bb47bef41320a2af0723be855e Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:01:14 -0400 Subject: [PATCH 06/12] Moved tactical maid gloves to floof folder --- Resources/Prototypes/Floof/Loadouts/hands.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Resources/Prototypes/Floof/Loadouts/hands.yml diff --git a/Resources/Prototypes/Floof/Loadouts/hands.yml b/Resources/Prototypes/Floof/Loadouts/hands.yml new file mode 100644 index 00000000000..5cc25557ed0 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/hands.yml @@ -0,0 +1,7 @@ +- type: loadout #FloofStation + id: LoadoutHandsGlovesTacticalMaid + category: Hands + cost: 2 + exclusive: true + items: + - ClothingHandsTacticalMaidGloves From 491f903dcbce69adb547dd7c6808528e67fab522 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:02:49 -0400 Subject: [PATCH 07/12] Moving masks to Floof folder --- Resources/Prototypes/Loadouts/mask.yml | 65 -------------------------- 1 file changed, 65 deletions(-) diff --git a/Resources/Prototypes/Loadouts/mask.yml b/Resources/Prototypes/Loadouts/mask.yml index e81a635a413..67be1e70ffd 100644 --- a/Resources/Prototypes/Loadouts/mask.yml +++ b/Resources/Prototypes/Loadouts/mask.yml @@ -141,68 +141,3 @@ exclusive: true items: - ClothingMaskNeckGaiterRed - -# Costume Masks FloofStation -- type: loadout - id: LoadoutMaskPlague - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskPlague - -- type: loadout - id: LoadoutMaskRat - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskRat - -- type: loadout - id: LoadoutMaskFox - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskFox - -- type: loadout - id: LoadoutMaskBee - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskBee - -- type: loadout - id: LoadoutMaskBear - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskBear - -- type: loadout - id: LoadoutMaskRaven - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskRaven - -- type: loadout - id: LoadoutMaskJackal - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskJackal - -- type: loadout - id: LoadoutMaskBat - category: Mask - cost: 2 - exclusive: true - items: - - ClothingMaskBat From 8abe02c19ece7957fa1ef8ecaa03d7bcc7735698 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:03:02 -0400 Subject: [PATCH 08/12] Moved masks to floof folder --- Resources/Prototypes/Floof/Loadouts/mask.yml | 64 ++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 Resources/Prototypes/Floof/Loadouts/mask.yml diff --git a/Resources/Prototypes/Floof/Loadouts/mask.yml b/Resources/Prototypes/Floof/Loadouts/mask.yml new file mode 100644 index 00000000000..10b05285c69 --- /dev/null +++ b/Resources/Prototypes/Floof/Loadouts/mask.yml @@ -0,0 +1,64 @@ +# Costume Masks FloofStation +- type: loadout + id: LoadoutMaskPlague + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskPlague + +- type: loadout + id: LoadoutMaskRat + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskRat + +- type: loadout + id: LoadoutMaskFox + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskFox + +- type: loadout + id: LoadoutMaskBee + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskBee + +- type: loadout + id: LoadoutMaskBear + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskBear + +- type: loadout + id: LoadoutMaskRaven + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskRaven + +- type: loadout + id: LoadoutMaskJackal + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskJackal + +- type: loadout + id: LoadoutMaskBat + category: Mask + cost: 2 + exclusive: true + items: + - ClothingMaskBat From 0b8ea657950d9dd15055a32af588a79e171249c0 Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:04:28 -0400 Subject: [PATCH 09/12] FloofStation Exclusives to uniform.yml --- .../Prototypes/Floof/Loadouts/uniform.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/Resources/Prototypes/Floof/Loadouts/uniform.yml b/Resources/Prototypes/Floof/Loadouts/uniform.yml index 35c197603f9..02840f7443b 100644 --- a/Resources/Prototypes/Floof/Loadouts/uniform.yml +++ b/Resources/Prototypes/Floof/Loadouts/uniform.yml @@ -5,3 +5,45 @@ exclusive: true items: - ClothingUniformLoinCloth + +- type: loadout #FloofStation + id: LoadoutUniformJumpskirtTacticalMaid + category: Uniform + cost: 3 + exclusive: true + items: + - ClothingUniformJumpskirtTacticalMaid + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command + +- type: loadout #FloofStation + id: LoadoutUniformJumpskirtJanimaid + category: Uniform + cost: 3 + exclusive: true + items: + - ClothingUniformJumpskirtJanimaid + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command + +- type: loadout #FloofStation + id: LoadoutUniformJumpskirtJanimaidmini + category: Uniform + cost: 3 + exclusive: true + items: + - ClothingUniformJumpskirtJanimaidmini + requirements: + - !type:CharacterDepartmentRequirement + inverted: true + departments: + - Security + - Command From 099b26be61c28a298f49f0081678d0d0d78b2f9d Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:04:47 -0400 Subject: [PATCH 10/12] Fixes --- Resources/Prototypes/Loadouts/uniform.yml | 42 ----------------------- 1 file changed, 42 deletions(-) diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml index 48913de23df..5843cb30ee5 100644 --- a/Resources/Prototypes/Loadouts/uniform.yml +++ b/Resources/Prototypes/Loadouts/uniform.yml @@ -1516,45 +1516,3 @@ inverted: true departments: - Command - -- type: loadout #FloofStation - id: LoadoutUniformJumpskirtTacticalMaid - category: Uniform - cost: 3 - exclusive: true - items: - - ClothingUniformJumpskirtTacticalMaid - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - Command - -- type: loadout #FloofStation - id: LoadoutUniformJumpskirtJanimaid - category: Uniform - cost: 3 - exclusive: true - items: - - ClothingUniformJumpskirtJanimaid - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - Command - -- type: loadout #FloofStation - id: LoadoutUniformJumpskirtJanimaidmini - category: Uniform - cost: 3 - exclusive: true - items: - - ClothingUniformJumpskirtJanimaidmini - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - Command From 4f5b26da25d06a6eeaf939c490c33c7cf94ab45e Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:07:43 -0400 Subject: [PATCH 11/12] Fixes --- .../Entities/Clothing/Eyes/glasses.yml | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 8fc9fb259df..9af8edb0028 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -234,37 +234,3 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - type: FlashImmunity - -# Cosmetic Goggles FloofStation -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesThermalBudget - name: red goggles - description: These don't have any real function, but they do look cool! - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/thermal.rsi - - type: Clothing - sprite: Clothing/Eyes/Glasses/thermal.rsi - -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesChemicalBudget - name: purple goggles - description: These don't have any real function, but they do look cool! - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/science.rsi - - type: Clothing - sprite: Clothing/Eyes/Glasses/science.rsi - -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesMesonBudget - name: green goggles - description: These don't have any real function, but they do look cool! - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/meson.rsi - - type: Clothing - sprite: Clothing/Eyes/Glasses/meson.rsi From 8c44b56d7368513fadb2852b157553cd3bb7b65d Mon Sep 17 00:00:00 2001 From: ShatteredSwords <135023515+ShatteredSwords@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:09:27 -0400 Subject: [PATCH 12/12] Moved goggles to Floof folder --- .../Floof/Entities/Clothing/Eyes/glasses.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Eyes/glasses.yml diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Floof/Entities/Clothing/Eyes/glasses.yml new file mode 100644 index 00000000000..fca2cd88c9d --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Eyes/glasses.yml @@ -0,0 +1,33 @@ +# Cosmetic Goggles FloofStation +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesThermalBudget + name: red goggles + description: These don't have any real function, but they do look cool! + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/thermal.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/thermal.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesChemicalBudget + name: purple goggles + description: These don't have any real function, but they do look cool! + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/science.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/science.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesMesonBudget + name: green goggles + description: These don't have any real function, but they do look cool! + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/meson.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/meson.rsi