From e32cc831a73e495d157d4fa8b55f9c62c06a55af Mon Sep 17 00:00:00 2001 From: HungryCuban Date: Sat, 1 Feb 2025 21:11:09 -0500 Subject: [PATCH] Fixes --- .../_Nuclear14/Entities/Clothing/Head/helmets.yml | 8 ++++---- .../_Nuclear14/Entities/Clothing/Mask/gasmasks.yml | 12 ++++++++---- .../equipped-HELMET.png | Bin .../icon.png | Bin .../meta.json | 0 5 files changed, 12 insertions(+), 8 deletions(-) rename Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/{fallourradsuit.rsi => falloutradsuit.rsi}/equipped-HELMET.png (100%) rename Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/{fallourradsuit.rsi => falloutradsuit.rsi}/icon.png (100%) rename Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/{fallourradsuit.rsi => falloutradsuit.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml index 422aa8f891..6da9cc0db6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml @@ -607,7 +607,7 @@ - type: Tag tags: - HidesHair - - WhitelistChameleon + - HidesBeard - type: entity parent: ClothingHeadBase @@ -627,7 +627,7 @@ - type: Tag tags: - HidesHair - - WhitelistChameleon + - HidesBeard - type: entity parent: ClothingHeadBase @@ -647,7 +647,7 @@ - type: Tag tags: - HidesHair - - WhitelistChameleon + - HidesBeard #Chinese Stealth Suit - type: entity @@ -664,7 +664,7 @@ - type: Tag tags: - HidesHair - - WhitelistChameleon + - HidesBeard - type: entity parent: N14ClothingHeadHatCombatHelmet diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml index a25b8774a3..f03e7cb434 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml @@ -19,17 +19,21 @@ Piercing: 0.95 Heat: 0.95 priceMultiplier: 0.5 + - type: Tag + tags: + - HidesHair + - HidesBeard - type: entity - parent: ClothingHeadBase + parent: ClothingMaskBase id: N14ClothingMaskHazmatHelmet name: hazmat suit mask description: A advance mask used pre war to handle viruses and dangerous environments. components: - type: Sprite - sprite: _Nuclear14/Clothing/Head/FalloutHoods/fallouthazmatsuit.rsi + sprite: _Nuclear14/Clothing/Mask/fallouthazmatsuit.rsi - type: Clothing - sprite: _Nuclear14/Clothing/Head/FalloutHoods/fallouthazmatsuit.rsi + sprite: _Nuclear14/Clothing/Mask/fallouthazmatsuit.rsi - type: IdentityBlocker - type: BreathMask - type: Armor @@ -39,7 +43,7 @@ - type: Tag tags: - HidesHair - - WhitelistChameleon + - HidesBeard - type: entity parent: ClothingMaskGas diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/fallourradsuit.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/falloutradsuit.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/fallourradsuit.rsi/equipped-HELMET.png rename to Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/falloutradsuit.rsi/equipped-HELMET.png diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/fallourradsuit.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/falloutradsuit.rsi/icon.png similarity index 100% rename from Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/fallourradsuit.rsi/icon.png rename to Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/falloutradsuit.rsi/icon.png diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/fallourradsuit.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/falloutradsuit.rsi/meta.json similarity index 100% rename from Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/fallourradsuit.rsi/meta.json rename to Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/falloutradsuit.rsi/meta.json