From 25d1a0717b0596b2762b14853ab89b81935d58ea Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 10 Aug 2024 22:36:46 +0100 Subject: [PATCH 1/7] https://github.com/Fansana/floofstation1/pull/93 - Let Epistemics take a survival box --- Resources/Prototypes/Loadouts/items.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml index e09d02c463a..46437193fee 100644 --- a/Resources/Prototypes/Loadouts/items.yml +++ b/Resources/Prototypes/Loadouts/items.yml @@ -293,7 +293,6 @@ - Security - Medical - Engineering - - Epistemics - !type:CharacterJobRequirement inverted: true jobs: From cdb72945b4981d7c5e2ddfc0e63ad227a51ac008 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 10 Aug 2024 22:37:25 +0100 Subject: [PATCH 2/7] https://github.com/Fansana/floofstation1/pull/87 - Glasses are now available for nearsighted crew --- Resources/Prototypes/Loadouts/eyes.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml index fed07c6bd6f..6d33ee9e55e 100644 --- a/Resources/Prototypes/Loadouts/eyes.yml +++ b/Resources/Prototypes/Loadouts/eyes.yml @@ -10,10 +10,6 @@ category: Eyes cost: 1 requirements: - - !type:CharacterTraitRequirement - inverted: true - traits: - - Nearsighted items: - ClothingEyesGlasses From 08f4015a2bcdf3b13abffcf4394d174cb9288f23 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 10 Aug 2024 22:39:29 +0100 Subject: [PATCH 3/7] https://github.com/Fansana/floofstation1/pull/61 Cowboy Hats for Loadouts --- Resources/Prototypes/Loadouts/head.yml | 48 ++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml index e76e2f17ecd..946b6b8d2b5 100644 --- a/Resources/Prototypes/Loadouts/head.yml +++ b/Resources/Prototypes/Loadouts/head.yml @@ -91,6 +91,54 @@ departments: - Security +- type: loadout + id: LoadoutHeadHatCowboyBrown + category: Head + cost: 2 + exclusive: true + items: + - ClothingHeadHatCowboyBrown + +- type: loadout + id: LoadoutHeadHatCowboyBlack + category: Head + cost: 2 + exclusive: true + items: + - ClothingHeadHatCowboyBlack + +- type: loadout + id: LoadoutHeadHatCowboyGrey + category: Head + cost: 2 + exclusive: true + items: + - ClothingHeadHatCowboyGrey + +- type: loadout + id: LoadoutHeadHatCowboyRed + category: Head + cost: 2 + exclusive: true + items: + - ClothingHeadHatCowboyRed + +- type: loadout + id: LoadoutHeadHatCowboyWhite + category: Head + cost: 2 + exclusive: true + items: + - ClothingHeadHatCowboyWhite + +- type: loadout + id: LoadoutHeadHatCowboyBountyHunter + category: Head + cost: 3 + exclusive: true + items: + - ClothingHeadHatCowboyBountyHunter + - type: loadout id: LoadoutHeadTinfoil category: Head From a3ae0c1c3999bb4d5c510f6f83a04019c0eaf64d Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 10 Aug 2024 22:41:44 +0100 Subject: [PATCH 4/7] https://github.com/Fansana/floofstation1/pull/60 - Hairflower and Explorer Coat into Loadouts --- Resources/Prototypes/Loadouts/Jobs/science.yml | 14 ++++++++++++++ Resources/Prototypes/Loadouts/head.yml | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml index fb382a8c2ca..04b226e2ba2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/science.yml +++ b/Resources/Prototypes/Loadouts/Jobs/science.yml @@ -75,6 +75,20 @@ items: - ClothingOuterCoatLabSeniorResearcher +- type: loadout + id: LoadoutScienceOuterExplorerLabcoat + category: Jobs + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Scientist + - ResearchAssistant + - ResearchDirector + items: + - ClothingOuterExplorerCoat + - type: loadout id: LoadoutScienceHatBeret category: Jobs diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml index 946b6b8d2b5..c595cb469ba 100644 --- a/Resources/Prototypes/Loadouts/head.yml +++ b/Resources/Prototypes/Loadouts/head.yml @@ -155,6 +155,14 @@ items: - ClothingHeadHatBellhop +- type: loadout + id: LoadoutHeadFlower + category: Head + cost: 1 + exclusive: true + items: + - ClothingHeadHatHairflower + # Color Hats - type: loadout id: LoadoutHeadHatBluesoft From 2935444ac42f9fc0caf456e47545a60c281fffc1 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 10 Aug 2024 23:03:58 +0100 Subject: [PATCH 5/7] Remove leftover requirements field --- Resources/Prototypes/Loadouts/eyes.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml index 6d33ee9e55e..02d411be078 100644 --- a/Resources/Prototypes/Loadouts/eyes.yml +++ b/Resources/Prototypes/Loadouts/eyes.yml @@ -9,7 +9,6 @@ id: LoadoutEyesGlasses category: Eyes cost: 1 - requirements: items: - ClothingEyesGlasses From 8cef4b3da8038a4713bc456f496a36e51985b0f6 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 10 Aug 2024 23:23:31 +0100 Subject: [PATCH 6/7] webedit gaming --- Resources/Prototypes/Loadouts/head.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml index c595cb469ba..1b47e307b7d 100644 --- a/Resources/Prototypes/Loadouts/head.yml +++ b/Resources/Prototypes/Loadouts/head.yml @@ -156,12 +156,12 @@ - ClothingHeadHatBellhop - type: loadout - id: LoadoutHeadFlower + id: LoadoutHeadPoppy category: Head cost: 1 exclusive: true items: - - ClothingHeadHatHairflower + - FoodPoppy # Color Hats - type: loadout From e6d68d3ce82bc2ba5bde5baf7dd536de58d56c09 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 11 Aug 2024 00:09:23 +0100 Subject: [PATCH 7/7] add missing goggles from Floofstation --- .../Entities/Clothing/Eyes/glasses.yml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 9af8edb0028..0f6c4acfcb5 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -234,3 +234,36 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - type: FlashImmunity + +- type: entity #Fake goggles, the latest in anti-valid hunting technology + 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