Merge PR #74 from DimasKarabas2881

ЧУЛКИ!!11!!!1
EndrAnimet · Jul 19, 2024 · f830e4a · f830e4a
2 parents 9686166 + b589a05
commit f830e4a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Entities/Clothing/Under/under.yml
@@ -1,24 +1,35 @@
-# These are technically shoes for now, as we don't actually have underwear. But
-# I would cry if we didn't have them. -swept
+# Underwear is real!
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: ClothingUnderSocksBase
   id: ClothingUnderSocksBee
   name: bee socks
   description: Make them loins buzz!
   components:
   - type: Sprite
     sprite: Clothing/Under/Socks/bee.rsi
+    state: icon
   - type: Clothing
     sprite: Clothing/Under/Socks/bee.rsi
+    clothingVisuals:
+      socks:
+        - state: equipped
+  - type: TemperatureProtection
+    coefficient: 0.85        
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: ClothingUnderSocksBase
   id: ClothingUnderSocksCoder
   name: coder socks
   description: It's time to code sisters!!11!
   components:
   - type: Sprite
     sprite: Clothing/Under/Socks/coder.rsi
+    state: icon    
   - type: Clothing
     sprite: Clothing/Under/Socks/coder.rsi
+    clothingVisuals:
+      socks:
+        - state: equipped
+  - type: TemperatureProtection
+    coefficient: 0.85
diff --git a/Resources/Prototypes/Stray/Entities/Clothing/Under/StripedSocks.yml b/Resources/Prototypes/Stray/Entities/Clothing/Under/StripedSocks.yml
@@ -2,15 +2,19 @@
 # Made By NeptuneZvezda on Discord
 
 - type: entity
-  parent: ClothingShoesBase
+  parent: ClothingUnderSocksBase
   id: ClothingUnderSocksStripedWhiteandLightBlue
   name: light blue striped socks
   description: Wearing these makes you feel just a little bit lazier
   components:
   - type: Sprite
     sprite: Stray/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandLightBlue.rsi
+    state: icon    
   - type: Clothing
     sprite: Stray/Clothing/Under/Socks/ClothingUnderSocksStripedWhiteandLightBlue.rsi
+    clothingVisuals:
+      socks:
+        - state: equipped-FEET    
   - type: Food
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
@@ -20,6 +24,8 @@
         reagents:
         - ReagentId: Fiber
           Quantity: 30
+  - type: TemperatureProtection
+    coefficient: 0.85          
   - type: Tag
     tags:
     - ClothMade

diff --git a/...ing/Under/Socks/bee.rsi/equipped-FEET.png → ...Clothing/Under/Socks/bee.rsi/equipped.png b/...ing/Under/Socks/bee.rsi/equipped-FEET.png → ...Clothing/Under/Socks/bee.rsi/equipped.png
diff --git a/Resources/Textures/Clothing/Under/Socks/bee.rsi/meta.json b/Resources/Textures/Clothing/Under/Socks/bee.rsi/meta.json
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-FEET",
+      "name": "equipped",
       "directions": 4
     }
   ]

diff --git a/...g/Under/Socks/coder.rsi/equipped-FEET.png → ...othing/Under/Socks/coder.rsi/equipped.png b/...g/Under/Socks/coder.rsi/equipped-FEET.png → ...othing/Under/Socks/coder.rsi/equipped.png
diff --git a/Resources/Textures/Clothing/Under/Socks/coder.rsi/meta.json b/Resources/Textures/Clothing/Under/Socks/coder.rsi/meta.json
@@ -11,7 +11,7 @@
       "name": "icon"
     },
     {
-      "name": "equipped-FEET",
+      "name": "equipped",
       "directions": 4
     }
   ]