Simple-Station · VMSolidus · Dec 21, 2024 · Dec 21, 2024
diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl
@@ -23,3 +23,4 @@ fibers-white = white
 fibers-yellow = yellow
 fibers-regal-blue = regal blue
 fibers-olive = olive
+fibers-dyed = dyed fibers
diff --git a/Resources/Locale/en-US/loadouts/generic/hands.ftl b/Resources/Locale/en-US/loadouts/generic/hands.ftl
@@ -1 +1,2 @@
 loadout-name-LoadoutHandsColorWhite = gloves (colorable)
+loadout-name-LoadoutHandsGlovesFingerlessWhite = fingerless gloves (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/head.ftl b/Resources/Locale/en-US/loadouts/generic/head.ftl
@@ -10,3 +10,6 @@ loadout-name-LoadoutHeadTurbanColorable = turban (colorable)
 loadout-name-LoadoutHeadKippahColorable = kippah (colorable)
 loadout-name-LoadoutHeadTinfoil = tinfoil hat (colorable)
 loadout-name-LoadoutHeadHatCowboyBountyHunter = bounty hunter hat (colorable)
+loadout-name-LoadoutHeadBandWhite = headband (colorable)
+loadout-name-LoadoutHeadBeretWhite = beret (colorable)
+loadout-name-LoadoutHeadPoppyWhite = hair flower (colorable)
diff --git a/Resources/Locale/en-US/loadouts/generic/mask.ftl b/Resources/Locale/en-US/loadouts/generic/mask.ftl
@@ -0,0 +1,3 @@
+loadout-name-LoadoutMaskBandWhite = cloth mask (colorable)
+loadout-name-LoadoutMaskNeckGaiterWhite = neck gaiter (colorable)
+loadout-name-LoadoutMaskSterile = sterile mask (colorable)
diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml
@@ -21,6 +21,8 @@
       id: LoadoutHeadBellhop
     - type: loadout
       id: LoadoutHeadPoppy
+    - type: loadout
+      id: LoadoutHeadPoppyWhite
     - type: loadout
       id: LoadoutHeadHatCorpsoft
     - type: loadout
@@ -30,21 +32,9 @@
     - type: loadout
       id: LoadoutHeadHatMimesoftFlipped
     - type: loadout
-      id: LoadoutHeadBandBlack
-    - type: loadout
-      id: LoadoutHeadBandBlue
-    - type: loadout
-      id: LoadoutHeadBandGold
-    - type: loadout
-      id: LoadoutHeadBandGreen
-    - type: loadout
-      id: LoadoutHeadBandGrey
-    - type: loadout
-      id: LoadoutHeadBandRed
+      id: LoadoutHeadBandWhite
     - type: loadout
       id: LoadoutHeadBandSkull
-    - type: loadout
-      id: LoadoutHeadBandMerc
     - type: loadout
       id: LoadoutHeadBandBrown
     - type: loadout
@@ -60,9 +50,7 @@
     - type: loadout
       id: LoadoutHeadBrownFlatcap
     - type: loadout
-      id: LoadoutHeadBeret
-    - type: loadout
-      id: LoadoutHeadBeretFrench
+      id: LoadoutHeadBeretWhite
     - type: loadout
       id: LoadoutHeadHijabColorable
     - type: loadout

diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml
@@ -7,25 +7,9 @@
       id: LoadoutMaskMuzzle
     - type: loadout
       id: LoadoutMaskGas
-    - type: loadout
-      id: LoadoutMaskBandBlack
-    - type: loadout
-      id: LoadoutMaskBandBlue
-    - type: loadout
-      id: LoadoutMaskBandGold
-    - type: loadout
-      id: LoadoutMaskBandGreen
-    - type: loadout
-      id: LoadoutMaskBandGrey
-    - type: loadout
-      id: LoadoutMaskBandRed
     - type: loadout
       id: LoadoutMaskBandSkull
     - type: loadout
-      id: LoadoutMaskBandMerc
-    - type: loadout
-      id: LoadoutMaskBandBrown
-    - type: loadout
-      id: LoadoutMaskNeckGaiter
+      id: LoadoutMaskBandWhite
     - type: loadout
-      id: LoadoutMaskNeckGaiterRed
+      id: LoadoutMaskNeckGaiterWhite
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -300,6 +300,20 @@
     fiberMaterial: fibers-synthetic
     fiberColor: fibers-black
 
+- type: entity
+  parent: ClothingHandsButcherable
+  id: ClothingHandsGlovesFingerlessWhite
+  name: fingerless gloves
+  description: Plain gloves without fingertips.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-dyed
+
 - type: entity
   parent: ClothingHandsBase
   id: ClothingHandsGlovesFingerlessInsulated

diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -24,6 +24,11 @@
     tags:
     - Bandana
 
+- type: entity
+  parent: [ClothingHeadBandBase, ClothingMaskBandWhite]
+  id: ClothingHeadBandWhite
+  name: bandana
+
 - type: entity
   parent: [ClothingHeadBandBase, ClothingMaskBandBlack]
   id: ClothingHeadBandBlack

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -25,6 +25,17 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadHatBeret
+  id: ClothingHeadHatBeretWhite
+  name: beret
+  description: A beret, an artists favorite headwear.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beretwhite.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beretwhite.rsi
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretFrench

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -30,6 +30,17 @@
     - Snout
     hideOnToggle: true
 
+- type: entity
+  parent: ClothingMaskBandanaBase
+  id: ClothingMaskBandWhite
+  name: bandana
+  description: A bandana to make you look cool.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Bandanas/white.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Bandanas/white.rsi
+
 - type: entity
   parent: ClothingMaskBandanaBase
   id: ClothingMaskBandBlack

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -562,6 +562,16 @@
     - WhitelistChameleon
     - IPCMaskWearable # Estacao Pirata - IPCs
 
+- type: entity
+  parent: ClothingMaskNeckGaiter
+  id: ClothingMaskNeckGaiterWhite
+  name: neck gaiter
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/neckgaiterwhite.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/neckgaiterwhite.rsi
+
 - type: entity
   parent: ClothingMaskNeckGaiter
   id: ClothingMaskNeckGaiterRed

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1249,6 +1249,14 @@
     tags:
     - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be
 
+- type: entity
+  name: hairflower
+  id: FoodPoppyWhite
+  parent: FoodPoppy
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/poppywhite.rsi
+
 - type: entity
   name: lily
   parent: FoodPoppy

diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml
@@ -61,12 +61,13 @@
       group: LoadoutGloves
 
 - type: loadout
-  id: LoadoutHandsGlovesFingerless
+  id: LoadoutHandsGlovesFingerlessWhite
   category: Hands
   cost: 0
   exclusive: true
+  customColorTint: true
   items:
-    - ClothingHandsGlovesFingerless
+    - ClothingHandsGlovesFingerlessWhite
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutGloves
diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml
@@ -122,6 +122,18 @@
     - !type:CharacterItemGroupRequirement
       group: LoadoutHead
 
+- type: loadout
+  id: LoadoutHeadPoppyWhite
+  category: Head
+  cost: 0
+  exclusive: true
+  customColorTint: true
+  items:
+    - FoodPoppyWhite
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutHead
+
 # Color Hats
 - type: loadout
   id: LoadoutHeadHatCorpsoft
@@ -171,83 +183,13 @@
 
 # Headbands
 - type: loadout
-  id: LoadoutHeadBandBlack
-  category: Head
-  cost: 0
-  exclusive: true
-  items:
-    - ClothingHeadBandBlack
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
-- type: loadout
-  id: LoadoutHeadBandBlue
-  category: Head
-  cost: 0
-  exclusive: true
-  items:
-    - ClothingHeadBandBlue
-  requirements:
-    - !type:CharacterDepartmentRequirement
-       inverted: true
-       departments:
-         - Security
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
-- type: loadout
-  id: LoadoutHeadBandGold
-  category: Head
-  cost: 0
-  exclusive: true
-  items:
-    - ClothingHeadBandGold
-  requirements:
-    - !type:CharacterDepartmentRequirement
-       inverted: true
-       departments:
-         - Security
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
-- type: loadout
-  id: LoadoutHeadBandGreen
-  category: Head
-  cost: 0
-  exclusive: true
-  items:
-    - ClothingHeadBandGreen
-  requirements:
-    - !type:CharacterDepartmentRequirement
-       inverted: true
-       departments:
-         - Security
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
-- type: loadout
-  id: LoadoutHeadBandGrey
-  category: Head
-  cost: 0
-  exclusive: true
-  items:
-    - ClothingHeadBandGrey
-  requirements:
-    - !type:CharacterDepartmentRequirement
-       inverted: true
-       departments:
-         - Security
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
-- type: loadout
-  id: LoadoutHeadBandRed
+  id: LoadoutHeadBandWhite
   category: Head
   cost: 0
   exclusive: true
+  customColorTint: true
   items:
-    - ClothingHeadBandRed
+    - ClothingHeadBandWhite
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutHead
@@ -264,36 +206,6 @@
     - !type:CharacterItemGroupRequirement
       group: LoadoutHead
 
-- type: loadout
-  id: LoadoutHeadBandMerc
-  category: Head
-  cost: 1
-  exclusive: true
-  items:
-    - ClothingHeadBandMerc
-  requirements:
-    - !type:CharacterDepartmentRequirement
-       inverted: true
-       departments:
-         - Security
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
-- type: loadout
-  id: LoadoutHeadBandBrown
-  category: Head
-  cost: 0
-  exclusive: true
-  items:
-    - ClothingHeadBandBrown
-  requirements:
-    - !type:CharacterDepartmentRequirement
-       inverted: true
-       departments:
-         - Security
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
 - type: loadout
   id: LoadoutHeadFishCap
   category: Head
@@ -375,23 +287,13 @@
 
 # Berets
 - type: loadout
-  id: LoadoutHeadBeret
-  category: Head
-  cost: 1
-  exclusive: true
-  items:
-    - ClothingHeadHatBeret
-  requirements:
-    - !type:CharacterItemGroupRequirement
-      group: LoadoutHead
-
-- type: loadout
-  id: LoadoutHeadBeretFrench
+  id: LoadoutHeadBeretWhite
   category: Head
   cost: 1
   exclusive: true
+  customColorTint: true
   items:
-    - ClothingHeadHatBeretFrench
+    - ClothingHeadHatBeretWhite
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutHead
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		loadout-name-LoadoutHandsColorWhite = gloves (colorable)
		loadout-name-LoadoutHandsGlovesFingerlessWhite = fingerless gloves (colorable)