From b589a05f11221ed6855c509b578008b9c0a51406 Mon Sep 17 00:00:00 2001 From: DimasKarabas28 <146107306+DimasKarabas2881@users.noreply.github.com> Date: Fri, 19 Jul 2024 13:00:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=A3=D0=9B=D0=9A=D0=98!!!!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Clothing/Under/under.yml | 19 ++++++++++++++---- .../Entities/Clothing/Under/StripedSocks.yml | 8 +++++++- .../{equipped-FEET.png => equipped.png} | Bin .../Clothing/Under/Socks/bee.rsi/meta.json | 2 +- .../{equipped-FEET.png => equipped.png} | Bin .../Clothing/Under/Socks/coder.rsi/meta.json | 2 +- 6 files changed, 24 insertions(+), 7 deletions(-) rename Resources/Textures/Clothing/Under/Socks/bee.rsi/{equipped-FEET.png => equipped.png} (100%) rename Resources/Textures/Clothing/Under/Socks/coder.rsi/{equipped-FEET.png => equipped.png} (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Entities/Clothing/Under/under.yml index ce2ffc629e9..36b586c581e 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Stray/Entities/Clothing/Under/StripedSocks.yml b/Resources/Prototypes/Stray/Entities/Clothing/Under/StripedSocks.yml index a742dc5a401..4eebdb28adb 100644 --- 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/Resources/Textures/Clothing/Under/Socks/bee.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Under/Socks/bee.rsi/equipped.png similarity index 100% rename from Resources/Textures/Clothing/Under/Socks/bee.rsi/equipped-FEET.png rename to Resources/Textures/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 index 194b8c4f0f5..9e85980f50b 100644 --- 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/Resources/Textures/Clothing/Under/Socks/coder.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Under/Socks/coder.rsi/equipped.png similarity index 100% rename from Resources/Textures/Clothing/Under/Socks/coder.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/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 index 1bb04ab6eb6..ddad5515cd1 100644 --- 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 } ]