From 5f1788c8dbb8504c2f945e25ddc1e8374a3b1af9 Mon Sep 17 00:00:00 2001 From: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Date: Sat, 10 Jan 2026 16:07:30 -0600 Subject: [PATCH] Feroxi hardsuit helmet fixes (#5161) * Feroxi hardsuit helmet fixes * Comment * Actually fix feroxi helmets --------- Co-authored-by: Tobias Berger --- .../Entities/Clothing/Head/eva-helmets.yml | 6 ++++++ .../Entities/Clothing/Head/hardsuit-helmets.yml | 7 ++++++- .../Head/Hardsuits/goliathhelm.rsi/meta.json | 6 +----- .../Head/Hardsuits/paramedhelm.rsi/meta.json | 6 +----- .../goliathhelm.rsi/equipped-head-feroxi.png | Bin .../Head/Hardsuits/goliathhelm.rsi/meta.json | 15 +++++++++++++++ .../paramedhelm.rsi/equipped-head-feroxi.png | Bin .../equipped-head-light-feroxi.png | Bin 0 -> 735 bytes .../Head/Hardsuits/paramedhelm.rsi/meta.json | 10 +++++++++- 9 files changed, 38 insertions(+), 12 deletions(-) rename Resources/Textures/{ => _DV}/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-feroxi.png (100%) create mode 100644 Resources/Textures/_DV/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json rename Resources/Textures/{ => _DV}/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-feroxi.png (100%) create mode 100644 Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-light-feroxi.png diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 92ed9880597..1fc1866fa2c 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -92,6 +92,9 @@ head-vulpkanin: # DeltaV - add modified vulp helmet - sprite: _DV/Clothing/Head/Hardsuits/paramedhelm.rsi state: equipped-head-light-vulpkanin + head-feroxi: # DeltaV - add modified feroxi helmet + - sprite: _DV/Clothing/Head/Hardsuits/paramedhelm.rsi + state: equipped-head-light-feroxi head-dog: - state: equipped-head-light-dog - type: Clothing @@ -103,6 +106,9 @@ head-vulpkanin: # DeltaV - add modified vulp helmet - sprite: _DV/Clothing/Head/Hardsuits/paramedhelm.rsi state: equipped-head-vulpkanin + head-feroxi: # DeltaV - add modified feroxi helmet + - sprite: _DV/Clothing/Head/Hardsuits/paramedhelm.rsi + state: equipped-head-feroxi head-dog: - state: equipped-head-dog - type: TemperatureProtection diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 8fb71762c30..38f9fffdaa4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -287,7 +287,7 @@ - state: equipped-head-light-vox shader: unshaded head-reptilian: - - state: equipped-head-reptilian + - state: equipped-head-light-reptilian # DeltaV - Use light state instead of base shader: unshaded head-dog: - state: equipped-head-light-dog @@ -306,6 +306,11 @@ - state: equipped-head-reptilian - state: equipped-head-unshaded-reptilian shader: unshaded + head-feroxi: # DeltaV - Feroxi + - sprite: _DV/Clothing/Head/Hardsuits/goliathhelm.rsi + state: equipped-head-feroxi + - state: equipped-head-unshaded + shader: unshaded head-dog: - state: equipped-head-dog - state: equipped-head-unshaded-dog diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json index 56d0b925ba5..144a668872e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Normal and vox sprites created by https://github.com/Pronana / princesscheeseballs (Discord). Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (Github). Feroxi sprites made by @Stxcking", + "copyright": "Normal and vox sprites created by https://github.com/Pronana / princesscheeseballs (Discord). Dog states modified from base states by Sparlight (GitHub). Reptilian states by TiniestShark (Github).", "size": { "x": 32, "y": 32 @@ -66,10 +66,6 @@ { "name": "equipped-head-unshaded-dog", "directions": 4 - }, - { - "name": "equipped-head-feroxi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json index 58d5b8dfd55..2836688580d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy, icon-flash and light-overlay states by Velken | equipped-head-vulpkanin from an unknown source, equipped-head-light-vulpkanin modified by deltanedas (github), Dog states modified from base states by Sparlight (GitHub). Feroxi sprites made by @Stxcking", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy, icon-flash and light-overlay states by Velken | equipped-head-vulpkanin from an unknown source, equipped-head-light-vulpkanin modified by deltanedas (github), Dog states modified from base states by Sparlight (GitHub)", "size": { "x": 32, "y": 32 @@ -39,10 +39,6 @@ { "name": "equipped-head-light-dog", "directions": 4 - }, - { - "name": "equipped-head-feroxi", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-feroxi.png b/Resources/Textures/_DV/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-feroxi.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-feroxi.png rename to Resources/Textures/_DV/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-feroxi.png diff --git a/Resources/Textures/_DV/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json b/Resources/Textures/_DV/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json new file mode 100644 index 00000000000..723e276bfba --- /dev/null +++ b/Resources/Textures/_DV/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Feroxi sprites made by @Stxcking", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-head-feroxi", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-feroxi.png b/Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-feroxi.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-feroxi.png rename to Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-feroxi.png diff --git a/Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-light-feroxi.png b/Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-head-light-feroxi.png new file mode 100644 index 0000000000000000000000000000000000000000..c0f6825cd42bfdf8f5a79da17f72ea504da8c02e GIT binary patch literal 735 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V4CUa;uunK zE9n5E+rj_;|4V*nzGciVVco33b^g}2y@px0x2@d~*sPTkaGdwl2E*49TXTU^n3{o$2! z1vKroD`8+x2L+km@6!>KRc<)Z{HUy z<@jxLCgx8U_%;Kq`p)Aw^ZCykRh(CN%)DveMz_gFZ*OS(@?6E(aPPz!_u^P=oA+%l zI$Jxhy?V~y(+?uK-#gD%UUMl^MT@zD0|M^3?@AeGy9Iw?+E>FL|X2QR=^E1RY{TAory6*I!tY>+56sHt3e2cq~!r*yK zxM~*9f@w3?F}kdKecndo4zmZp1jF8SjAxAMnZH>kR7m&#|MP&+VDZt<4R1}a{aL$3 z#=*gFGvkcHef6wBc0 L>gTe~DWM4f(RgJu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json b/Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json index 8c1153cc633..1af4e8e4f90 100644 --- a/Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json +++ b/Resources/Textures/_DV/Clothing/Head/Hardsuits/paramedhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Modified by Radezolid to add light, and further modified by Ci1rus to change the Vulpakin shape", + "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Modified by Radezolid to add light, and further modified by Ci1rus to change the Vulpakin shape. Feroxi sprite made by @Stxcking. Feroxi light made by @Toby222", "size": { "x": 32, "y": 32 @@ -14,6 +14,14 @@ { "name": "equipped-head-light-vulpkanin", "directions": 4 + }, + { + "name": "equipped-head-feroxi", + "directions": 4 + }, + { + "name": "equipped-head-light-feroxi", + "directions": 4 } ] }