So. Many. Socks.

Signed-off-by: Dakota Haven <[email protected]>

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -63,6 +63,9 @@
     contents:
       - id: ClothingOuterArmorCaptainCarapace
       - id: ClothingLongcoatCap # Floofstation
+      - id: ClothingHandsCaptainWarmers # Floofstation
+      - id: ClothingUnderSocksCaptain # Floofstation
+      - id: ClothingUniformCaptainThong # Floofstation
       - id: NukeDisk
       - id: PinpointerNuclear
 #     - id: CaptainIDCard # DeltaV - Replaced by the spare ID system
@@ -122,6 +125,9 @@
     contents:
       - id: HoPIDCard
       - id: ClothingLongcoatHoP # Floofstation
+      - id: ClothingHandsCommandWarmers # Floofstation
+      - id: ClothingUnderSocksCommand # Floofstation
+      - id: ClothingUniformCommandThong # Floofstation
       - id: ClothingHeadsetAltService # DeltaV - HoP is now a service role, replaces their all channels headset.
       - id: BoxPDA
       - id: BoxID

Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml

@@ -16,3 +16,6 @@
     ClothingNeckScarfStripedBrown: 3
     ClothingShoesBootsWinterCargo: 2
     ClothingNeckCollarLogi: 1 # Floofstation - Collar addition
+    ClothingHandsLogisWarmers: 1 # Floofstation
+    ClothingUnderSocksLogis: 1 # Floofstation
+    ClothingUniformLogisThong: 1 # Floofstation

Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml

@@ -16,6 +16,10 @@
     ClothingHeadHatWitch1: 1
     ClothingOuterPlagueSuit: 1
     ClothingMaskPlague: 1
+    ClothingHandsChaplainWarmers: 1 # Floofstation
+    ClothingUnderSocksChaplain: 1 # Floofstation
+    ClothingUniformChaplainThong: 1 # Floofstation
+    ClothingOuterEpiChaplainMantle: 1 # Floofstation
     #ClothingHeadsetService: 2 # Delta-V - Chaplain is no longer service dept
     BoxCandle: 2
     BoxCandleSmall: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml

@@ -17,3 +17,6 @@
     ClothingNeckScarfStripedOrange: 3
     ClothingShoesBootsWinterEngi: 2
     ClothingNeckCollarEngi: 1 # Floofstation - Collar addition
+    ClothingHandsEngiWarmers: 1 # Floofstation
+    ClothingUnderSocksEngi: 1 # Floofstation
+    ClothingUniformEngiThong: 1 # Floofstation

Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml

@@ -13,6 +13,9 @@
     ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots
     ClothingUniformJumpskirtJanimaid: 2 # Delta V: the maiden outfits no longer require emagging.
     ClothingUniformJumpskirtJanimaidmini: 1
+    ClothingHandsJanitorWarmers: 1 # Floofstation
+    ClothingUnderSocksJanitor: 1 # Floofstation
+    ClothingUniformJanitorThong: 1 # Floofstation
 
   emaggedInventory: # Delta V: tactical maid outfit set is now the emagg reward.
     ClothingHandsTacticalMaidGloves: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml

@@ -23,6 +23,9 @@
     ClothingHeadHatSurgcapPurple: 4
     ClothingShoesBootsWinterMed: 2
     ClothingNeckCollarMed: 1 # Floofstation - Collar addition
+    ClothingHandsMedicWarmers: 1 # Floofstation
+    ClothingUnderSocksMedic: 1 # Floofstation
+    ClothingUniformMedicThong: 1 # Floofstation
   contrabandInventory: #DeltaV
     UniformScrubsColorCybersun: 1 #DeltaV
     ClothingHeadHatSurgcapCybersun: 1 #DeltaV

Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml

@@ -15,5 +15,8 @@
     ClothingOuterWinterSci: 2
     ClothingNeckScarfStripedPurple: 3
     ClothingNeckCollarEpi: 1 # Floofstation - Collar addition
+    ClothingHandsEpiWarmers: 1 # Floofstation
+    ClothingUnderSocksEpi: 1 # Floofstation
+    ClothingUniformEpiThong: 1 # Floofstation
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
     ClothingShoesBootsWinterSci: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -24,6 +24,9 @@
     ClothingNeckScarfStripedRed: 3
     ClothingEyesBlindfold: 1
     ClothingNeckCollarSec: 1 # Floofstation - Collar addition
+    ClothingHandsSecurityWarmers: 1 # Floofstation
+    ClothingUnderSocksSecurity: 1 # Floofstation
+    ClothingUniformSecurityThong: 1 # Floofstation
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
     ClothingShoesBootsCowboyBlack: 1

Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml

@@ -133,17 +133,3 @@
     fiberColor: fibers-blue
   - type: FingerprintMask
 
-- type: entity
-  parent: ClothingHandsBase
-  id: ClothingHandsCaptainWarmers
-  name: captains arm-warmers
-  description: A pair of rather nice arm-warmers
-  components:
-  - type: Sprite
-    sprite: Floof/Clothing/Under/Gloves/captwarmer.rsi
-  - type: Clothing
-    sprite: Floof/Clothing/Under/Gloves/captwarmer.rsi
-  - type: Fiber
-    fiberMaterial: fibers-durathread
-    fiberColor: fibers-regal-blue
-  - type: FingerprintMask

Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml

@@ -75,13 +75,3 @@
   - type: Clothing
     sprite: Floof/Clothing/Under/Socks/sexcompblueboots.rsi
 
-- type: entity
-  parent: ClothingShoesBase
-  id: ClothingUnderSocksCaptain
-  name: captains thigh-high socks
-  description: Just a plain pair of thigh-high socks.
-  components:
-  - type: Sprite
-    sprite: Floof/Clothing/Under/Socks/captsocks.rsi
-  - type: Clothing
-    sprite: Floof/Clothing/Under/Socks/captsocks.rsi

Resources/Prototypes/Floof/Entities/Clothing/Uniforms/base_uniform.yml

@@ -0,0 +1,24 @@
+- type: entity
+  abstract: true
+  parent: ClothingUniformBase
+  id: ClothingUniformBaseSwitch
+  components:
+  - type: Clothing
+    slots: [innerclothing, outerClothing]
+    femaleMask: UniformTop
+  - type: Tag
+    tags:
+    - ClothMade # Delta-V - allows moths to eat this
+
+- type: entity
+  abstract: true
+  parent: ClothingUniformBase
+  id: ClothingUniformSkirtBaseSwitch
+  components:
+  - type: Clothing
+    slots: [innerclothing, outerClothing]
+    femaleMask: UniformTop
+  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
+    tags:
+    - Skirt
+    - ClothMade # Delta-V - allows moths to eat this

Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformSkirtBase
+  parent: ClothingUniformBase
   id: ClothingUniformLoinCloth
   name: loin cloth
   description: A piece of cloth wrapped around the waist.
@@ -14,7 +14,7 @@
     unequipDelay: 0
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformBaseSwitch
   id: ClothingUniformLoinClothBlack
   name: black loin-cloth
   description: A piece of cloth wrapped around the waist.
@@ -25,7 +25,7 @@
     sprite: Floof/Clothing/Uniforms/loinclothblack.rsi
 
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformBaseSwitch
   id: ClothingUniformLoinClothWhite
   name: white loin-cloth
   description: A piece of cloth wrapped around the waist.
@@ -134,14 +134,14 @@
   - type: Clothing
     sprite: Floof/Clothing/Uniforms/sexcompblue.rsi
 
-
 - type: entity
   parent: ClothingUniformBase
-  id: ClothingUniformCaptainThong
-  name: captains thong
-  description: Is this even considered a piece of clothing?
+  id: ClothingUniforReotaSuit
+  name: casual suit
+  description: A rather casual looking suit
   components:
   - type: Sprite
-    sprite: Floof/Clothing/Uniforms/captthong.rsi
+    sprite: Floof/Clothing/Uniforms/reotasuit.rsi
   - type: Clothing
-    sprite: Floof/Clothing/Uniforms/captthong.rsi
+    sprite: Floof/Clothing/Uniforms/reotasuit.rsi
+