From: Ivan <69372103+lokachop@users.noreply.github.com> Date: Thu, 24 Jul 2025 03:04:29 +0000 (+0200) Subject: Emissive engineering & chief engineer's hardsuit helmets (#39153) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=70ad8efac377bc1e36a5c2ce6c62c6180655569b;p=space-station-14.git Emissive engineering & chief engineer's hardsuit helmets (#39153) * test one, the light is not showing for some reason * ToggleableVisuals, not ToggleableLightVisuals * FIX THIS AGAIN I AM STUPID * WHY DID THESE PERSIST =( --- diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index be07593050..349d85da23 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -74,8 +74,42 @@ components: - type: Sprite sprite: Clothing/Head/Hardsuits/engineering.rsi + layers: + - state: icon + - state: icon-unshaded + shader: unshaded + - state: light-overlay + visible: false + shader: unshaded + map: [ "light" ] + - type: HandheldLight + addPrefix: false + - type: ToggleableVisuals + spriteLayer: light + clothingVisuals: + head: + - state: equipped-head-light + shader: unshaded + head-vox: + - state: equipped-head-light-vox + shader: unshaded + head-dog: + - state: equipped-head-light-dog + shader: unshaded - type: Clothing - sprite: Clothing/Head/Hardsuits/engineering.rsi + clothingVisuals: + head: + - state: equipped-head + - state: equipped-head-unshaded + shader: unshaded + head-vox: + - state: equipped-head-vox + - state: equipped-head-unshaded-vox + shader: unshaded + head-dog: + - state: equipped-head-dog + - state: equipped-head-unshaded-dog + shader: unshaded - type: PointLight color: "#ffdbad" - type: PressureProtection @@ -343,8 +377,42 @@ components: - type: Sprite sprite: Clothing/Head/Hardsuits/engineering-white.rsi + layers: + - state: icon + - state: icon-unshaded + shader: unshaded + - state: light-overlay + visible: false + shader: unshaded + map: [ "light" ] + - type: HandheldLight + addPrefix: false + - type: ToggleableVisuals + spriteLayer: light + clothingVisuals: + head: + - state: equipped-head-light + shader: unshaded + head-vox: + - state: equipped-head-light-vox + shader: unshaded + head-dog: + - state: equipped-head-light-dog + shader: unshaded - type: Clothing - sprite: Clothing/Head/Hardsuits/engineering-white.rsi + clothingVisuals: + head: + - state: equipped-head + - state: equipped-head-unshaded + shader: unshaded + head-vox: + - state: equipped-head-vox + - state: equipped-head-unshaded-vox + shader: unshaded + head-dog: + - state: equipped-head-dog + - state: equipped-head-unshaded-dog + shader: unshaded - type: PointLight color: "#daffad" - type: PressureProtection diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-dog.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png similarity index 62% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-dog.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png index 47e86a2eda..f385d0bfc8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-dog.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vox.png new file mode 100644 index 0000000000..879ce40a74 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light.png new file mode 100644 index 0000000000..9f75f28c05 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-dog.png new file mode 100644 index 0000000000..0bdcc6cc57 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-dog.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vox.png new file mode 100644 index 0000000000..66c795f900 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded.png new file mode 100644 index 0000000000..9b0ba1f35f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vox.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vox.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-unshaded.png new file mode 100644 index 0000000000..ce3eec5f94 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/light-overlay.png new file mode 100644 index 0000000000..5347ab016e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 88dabe491a..4cdc059df8 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json @@ -10,31 +10,49 @@ { "name": "icon" }, + { + "name": "icon-unshaded" + }, { "name": "icon-flash" }, { - "name": "off-equipped-HELMET", + "name": "light-overlay" + }, + { + "name": "equipped-head", + "directions": 4 + }, + { + "name": "equipped-head-light", + "directions": 4 + }, + { + "name": "equipped-head-unshaded", + "directions": 4 + }, + { + "name": "equipped-head-vox", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "equipped-head-light-vox", "directions": 4 }, { - "name": "off-equipped-HELMET-vox", + "name": "equipped-head-unshaded-vox", "directions": 4 }, { - "name": "on-equipped-HELMET-vox", + "name": "equipped-head-dog", "directions": 4 }, { - "name": "off-equipped-HELMET-dog", + "name": "equipped-head-light-dog", "directions": 4 }, { - "name": "on-equipped-HELMET-dog", + "name": "equipped-head-unshaded-dog", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-dog.png deleted file mode 100644 index 30c3ddf6a4..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-dog.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 574b3d985b..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png deleted file mode 100644 index 6baf685a66..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-dog.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-dog.png new file mode 100644 index 0000000000..f385d0bfc8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-dog.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vox.png new file mode 100644 index 0000000000..879ce40a74 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light.png new file mode 100644 index 0000000000..9f75f28c05 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-dog.png new file mode 100644 index 0000000000..c16b5c7897 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-dog.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vox.png new file mode 100644 index 0000000000..5ef8283e95 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded.png new file mode 100644 index 0000000000..a0be8625d2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vox.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vox.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-unshaded.png new file mode 100644 index 0000000000..dab725cf3e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png index 45763e5696..a691ca7cf1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/light-overlay.png new file mode 100644 index 0000000000..5347ab016e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json index 9f81ae9002..4cdc059df8 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json @@ -10,31 +10,49 @@ { "name": "icon" }, + { + "name": "icon-unshaded" + }, { "name": "icon-flash" }, { - "name": "off-equipped-HELMET", + "name": "light-overlay" + }, + { + "name": "equipped-head", + "directions": 4 + }, + { + "name": "equipped-head-light", + "directions": 4 + }, + { + "name": "equipped-head-unshaded", + "directions": 4 + }, + { + "name": "equipped-head-vox", "directions": 4 }, { - "name": "off-equipped-HELMET-vox", + "name": "equipped-head-light-vox", "directions": 4 }, { - "name": "off-equipped-HELMET-dog", + "name": "equipped-head-unshaded-vox", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "equipped-head-dog", "directions": 4 }, { - "name": "on-equipped-HELMET-vox", + "name": "equipped-head-light-dog", "directions": 4 }, { - "name": "on-equipped-HELMET-dog", + "name": "equipped-head-unshaded-dog", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png deleted file mode 100644 index 1a40bc3a26..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png deleted file mode 100644 index 896f1fe375..0000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png and /dev/null differ