From 4a7576a7a63906240ad8492bfb5dcae95884cb8a Mon Sep 17 00:00:00 2001
From: Mora <46364955+TrixxedHeart@users.noreply.github.com>
Date: Mon, 28 Jul 2025 13:28:15 -0800
Subject: [PATCH] Several Vox Sprite Displacement and Layering Fixes (#39219)

* Vox displacement map fixes

* Adds neck displacement map and changes sprite layering to prevent the tank from rendering on top of a Vox's facial hair strangely
---
 .../Prototypes/Entities/Mobs/Species/vox.yml    |   7 ++++++-
 .../Species/Vox/displacement.rsi/jumpsuit.png   | Bin 906 -> 913 bytes
 .../Mobs/Species/Vox/displacement.rsi/meta.json |   4 ++++
 .../Mobs/Species/Vox/displacement.rsi/neck.png  | Bin 0 -> 435 bytes
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png

diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 94b5cebf26..fa22736179 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -85,11 +85,11 @@
     - map: [ "outerClothing" ]
     - map: [ "back" ]
     - map: [ "neck" ]
+    - map: [ "suitstorage" ] # This is not in the default order
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "suitstorage" ] # This is not in the default order
     - map: [ "enum.HumanoidVisualLayers.Tail" ]
     - map: [ "mask" ]
     - map: [ "head" ]
@@ -137,6 +137,11 @@
           32:
             sprite: Mobs/Species/Vox/displacement.rsi
             state: head
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: neck
       back:
         sizeMaps:
           32:
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png
index 2c938634eb635f50d8063794b40b70cf50efb46f..18ce524dbb74cf877c79d51644530616f8516bc2 100644
GIT binary patch
delta 877
zcmV-z1CsoT2ayMmF@H-*L_t(|ob6g!mg67{tfJ>&+^n6Oaj~HJFgV!pCKmH%?D|R4
z?MI0+5<-Z>0Ktu6dK=Iij{v<5=#58!-Ujr>BS3EhdgG7k=`$Gvvu)`DodB=^fZ^r7
zraAoDAdjnI*E+o27gzuo9shY35L@>-EgJEk6Ce&M0GYn+5r4z46=C8cwMEd5r+A)+
zXMuDuS@`(TZ&q-J1;23J3kX0m`1fN#N>29~JpO%2w*0@?G7(nzw?crV_9*ywT|gL#
z9Rv$wQY62L5UA+D!X06ge+Mal(F%x!(<cF@&ayE$r&wSogCt{TION~Jl7Adyn_saD
zRDMp2M*ONgK!2vU`mHEWF3}RS;NKKrNy5Z{J@`tA5Ha_AgL84f!_CAva=+6nKof*=
ze13hb&p564kMn^49JfCWo)&<xhk-_5PcKz1TJhh01t^chpY2960#pqMEDazl{LINh
zZodMu1>ho8y#nc5U*lg(kdE+At$<+|&wIbaydw1qzklQZHOR^X3@jwP5eeT-%Tic?
zz)lm4aUk)3j9;8;K2IXl+koD91n6x*Z#)9@HlQ~i0eTzI8;=0J4d{(WfZhi5#_a`A
zSA^ol<9JKk{sedigdJ~&p}&#VtpM36K8U@pIcC8%y9a2}Ah9#>RH>zt_XX9V@%DE-
z^KVw8s(&^}?7+~DO$*6e5ZGp}k>2{mLJSBP$>+-sf+FMO{X3aFFIWNmT#%Y~Xxk}h
z$;mH@(!mRWpVa@d?KqE=<Hx}WAO&40W!qql9-vYb+E6Bd*st<*%dIiG+KjWXBTXd$
zLsgcrBrNB>L7(8%3TwAgp?`?6Vw_fv&p^Ebh=1=rI2u;k6m<r|$osw9XeW<S7vQ9N
zeEaRe>2q3fMY7jD3tYVmRDenVS-W*ff{-_DH6Q?!TD%efwKqfR!;ruUVd({82*Lnf
zEP^jI7XT8QB}Ty^fDwo%sGU4=gP_0(;|?Gl6CsHir~~2TsvsCr@KFd{bTPVwpK^lP
z#Ae&C0D;3WfIcOog%3;gr=b{cxNs9aaz+?Hh5@{^Kj1YudRTy#0BA1U27UZWO9T7W
zFQ6JP>p0AXuZceRR6zwh^d+%Oq9&+d$L))vw-?|q;5|%QkzN(Q00000NkvXXu0mjf
Dv4ffZ

delta 870
zcmV-s1DX7h2Z{%fF@Ho!L_t(|ob6g$j^rQ=tfKc|+-x&9<6?vNgOHGCV+cX3q@+=2
zn#g6UjR6CP0fGm^^md>(UIBVL&>OD+y&dR{SAgCQ^v2@__@jDTZ1|+pwOs{o0iLuA
z0Hfp2kAT?0_4Bv3tB`9~$)6`cG%5g@d>8)!2t#{`6WRO?-hcltz{;2$>>RlM{wfjH
z{0FaXMn)$8c@9X8(9JA+#`oIA*5!m9{-YEiKoS3G1PCLsgJ9)MisXO721n@T;Zlf0
z{u8A9IpQBiKqQ<#xeD_G<D7DVog5N;cSOy9fHi-xam=rn1ulM1i$?sab%0F2s@t?N
zGem39g8xu}HGc^c2hQLN!u^Op<ul0310HT6#<$^@9RZpoR5IrGZOwLC@$;<-J{;Ks
z5cX@L5!mcd)uI*u<0C+~9mYJ}NI`<S0s>0|$PRzH9m~e!BcND-ITGweu6#%OtMBpe
zEs(z9zlwli2>ZRigIjE~e#ZY}y9Pz;00Rp__(f!VHh&i_e$F7UQwL)nNX9?HgH!eA
zT?qAdpf_FtdOOe?uK>Lr=#5u^-VXG}D?o1tdgB$Kw*$TLcmdQEq4YSsWdGd)gq=^V
zm4~sq2uMzAH=P$-c@(PhW5KmJ2WWCZ;>7S&sil)!L=a0b?D-F?Q3?^N>H&rp5KP69
zI}r;pAb((_oVz#)idaAZ|2ubH*zQ~a7|#Z1$7cugi*RkH;x<ZoQIrl|0DRp1<sG%9
zl;h)I1dxhbD0S0d%PVoYsPv&u0I{3$bjztR4z&em<z+0D0355bge76Qyc^_Zry61J
zRBF6G#8@#-E5|udM*y*%gQH`$m!fhYjJ$ReZGYO%1C>L7lj?4CpglN!M$Wpm$F+Nb
zyJvw5pb|j#PF<2D<V{-*2*9Ks?<7F&$&h+8Byd7ldVv^%Fn||}aV#_!01_`t1i>MI
z5r`+K?L1JJ1O-kQXMl7WdiM|*xrGjdle?1OxC9SE1S77%Odb5RCRlX5eFO*`h5_^`
z8DA|tLWq7Eit!6Ko<s-E2m{D4fVbWc_!%5MEI>;D9EW3b5P*-5v^21r`vNL^McZMn
w#+vAp&n39P4}D3jkf;eR@Z<4C(Z>t$4>*xVl;3MdQ~&?~07*qoM6N<$f{0s@MgRZ+

diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
index 0c910f85e5..e46ca56024 100644
--- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
@@ -26,6 +26,10 @@
             "name": "head",
             "directions": 4
         },
+        {
+            "name": "neck",
+            "directions": 4
+        },
         {
             "name": "ears",
             "directions": 4
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png
new file mode 100644
index 0000000000000000000000000000000000000000..8783d770ea35dd7376dd67e6acfdecba42c485ea
GIT binary patch
literal 435
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0(2Ka=yHZ(9a)H5{HGBngNG}JKE*8?ROS`M#Q15)fIL4Lvi!GJ-^o7oL0
z#981GS<Jw|cNl~jkLRyQ0a_yB>Eaj?;r{m8>7v650xp3fk^lbt^BGL<6zFX{wffZ3
z&4#9zFMm|xZkN2xxma~h(?ce{^*64~<IF$q*j)N);YQW_N%!~a^WN6`>(FQ}kbiSm
ze1MeBUyIEX*FNX6DCuVXeQs`d=T@f4|MlMQ*WsuOez@;{|Cdk!i<KK^Yn+IW*=U-0
zl&Rd&Wlw7Mp)OXL^rssX)=bc__<y{K?+{lfBMvNhY3=pfp6{bSJo)U>BNQu8zx+c{
z(v*`;U!2>Q2XA%}UGm0sZCd311zz2Pvzn5vU1kNw7!~9mEbMrHT18hs#W76$#_<%#
y*+xaB;(y#6dp-&rS*IIOB7TSUq_s$mKgawvONC9E9?Sd#g{P;hpUXO@geCw6->irL

literal 0
HcmV?d00001

-- 
2.51.2