From 70d3cf7ba411ef38818f63eec944c4f0c7c33c98 Mon Sep 17 00:00:00 2001 From: Verm <32827189+Vermidia@users.noreply.github.com> Date: Sun, 5 May 2024 16:42:22 -0500 Subject: [PATCH] Emergency Tank + Plasma Can visible on suit storage slot (#27598) * Suitstorage Sprites + Plasma tank slots * Fix some extra brackets --- .../Entities/Objects/Tools/gas_tanks.yml | 5 ++++- .../Tanks/emergency.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 643 bytes .../Objects/Tanks/emergency.rsi/meta.json | 4 ++++ .../emergency_clown.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 444 bytes .../Objects/Tanks/emergency_clown.rsi/meta.json | 4 ++++ .../emergency_double.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 525 bytes .../Objects/Tanks/emergency_double.rsi/meta.json | 4 ++++ .../equipped-SUITSTORAGE.png | Bin 0 -> 652 bytes .../Tanks/emergency_double_red.rsi/meta.json | 4 ++++ .../equipped-SUITSTORAGE.png | Bin 0 -> 665 bytes .../Tanks/emergency_extended.rsi/meta.json | 4 ++++ .../equipped-SUITSTORAGE.png | Bin 0 -> 440 bytes .../Tanks/emergency_extended_red.rsi/meta.json | 4 ++++ .../emergency_red.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 440 bytes .../Objects/Tanks/emergency_red.rsi/meta.json | 4 ++++ .../emergency_yellow.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 665 bytes .../Objects/Tanks/emergency_yellow.rsi/meta.json | 4 ++++ .../Tanks/plasma.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 383 bytes .../Textures/Objects/Tanks/plasma.rsi/meta.json | 4 ++++ 19 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 65942e330e..7bdd32f457 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity abstract: true parent: BaseItem id: GasTankBase @@ -238,3 +238,6 @@ outputPressure: 101.3 - type: Clothing sprite: Objects/Tanks/plasma.rsi + slots: + - Belt + - suitStorage diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..a37261e3f7b438de9a3fa569d633d0008f868a2b GIT binary patch literal 643 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=MO7gYB`&GO$wiq3C7Jno3=9=> zRF7M8H5dr69id#gmv8D{npebOMW;uhik31T}B@z2(wp zzc+ptV_;xBou>0O$u4Pj=FWXF#o~yj!lR-u@9K{1J0J6Io}K6VrImBz*0+bI z_39pQW7@!a!-HWPgEZ#>u>@tt8%#MW4d;$7E4*`Y=RDpmY&X_kEzwJ7{mB7V7Rx;~ zX8UJLDcRRi=fz%Y>F1eBb27Aimi*MJ#Bks<^YSOVW?KIZmYG`L0yJQ!o&D=QWdq*!r5TOR^XC?OOAk+qI=zKj;0M^k2QpHRdwTleg$@4_3K&W=enQ6#j#E zPTKb6#rfxB0Y z1RmD36)o*5$osc)<2&1Fd>?*&>6mZKyzJuMc*Dsbl0nTBZ$k@F-k2pxEK z2I#s6kMicci1PPlm~G7bGH%y|pD3XkW_Q5cB(o_>*XxA}FjX;ly85}Sb4q9e0FoUP A@Bjb+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json index 9dd4186ecd..59aada80e0 100644 --- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json @@ -66,6 +66,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..dd19aa56804a18560243b43d87ae1bff143cabff GIT binary patch literal 444 zcmV;t0YmPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Z~arK~#8N?b@+R z!$1_r@mF!kAXrz2E~0j+IEaJbKjGlNAc&iSduPEd;4Ti*!NsMkoA?j7R&Wy)oJ4r` z9TzC#VC?0{HQx`EcfAacyIhjxCjbBd0H!t=4zK+%8FRh{(d%~oC>=pJAVq9|ub9^3 zXq4Ow(6oI0lilqtwfg?{DvRwUH+Ogc&?*+c-s$YS$yqi2%sp+at?1`bu9w-l+QL)4 z^Z#Nez>Kn!n?jlu`yqQytI6`hfoqQBNfD@*In!n*?qI?Kz?;9e2mw z%k5X%i znlv$WuElAs`#MjH=A33_THRp4#K?99eE@iM3F+Ndwn7+1oZ>;;#Z@Ybi zFK2$=ym<5H8MpS_y!}T$UUoxmO;q6Q`RDa^2tw7M zyN-Xm<{Dr{42p~Q{J%a{`@I#8zop7*Q`J6nDpdzfkYz%bCv)r z6VD1q5e|a|Y=H^~8l+qZ2u|53{vg}#fqvb2o}OR-nWpv|x0kU$@m~FFVdQ&MBb@05!GbwEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json index a1661aee78..fe19dcec1c 100644 --- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json @@ -66,6 +66,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..7e2f947d343f57e0a89ac27098e60c7490b38880 GIT binary patch literal 652 zcmV;70(1R|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0wGC6K~#8N?b<<0 z8$lEY@V7BBNRe1?LRHYVdeMVh+mK>Gq*8<))1G^1p*}y&m000000A+K@vfR0cA89~)nI<4IS$Qd$LrSI`0#$)E_kRlCtMef_`no-$&M@!2q zk-Vw+ZLa%aJ9{}a#CYTz*Y(O*T+x9vZ%%F z@vQGT`?sHBA|7q9H~ml9$cX-Tk*YTE&NM@9;Ua}TPSOK62FE6d83v7xQdz!5TU8Zc zYJL6GC^@uwP@uBo(Dtu=V!;|YtGBAZ!aD_!0e2C<)1_%;mDz9lnTIm1?H2}6nQ;IpTB&N zS-mI~pgmZiz}Psog-)nE^GRm)qV^MT&*JUhS$Du_cQ<#I^HHTEg?Ffkga7KaIs=^>xl^wlS9vAJpHm7FSZf{s-Vp m(+o8P1NK#{1pojy8_|F8V83+jT_w=~0000lF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json index ce287bf277..74fc108c09 100644 --- a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json @@ -66,6 +66,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..0470c6895f345350eec1c7fd70c6b5b60d6ee1c0 GIT binary patch literal 665 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6;&Y-B`&GO$wiq3C7JnoK#@7B z$2W2{8wjvHu>3A!zpFbpHh*GA%7t)^g>jRmdnT}W-@kV-|94c+hTb5jU@}!_i!X-FfF-mH!{{;b) zE@u@N_wGBF?x=f6%Q$n$G(T%|ILMI`c<%7Z>l zjl1sZ{WI1qV=&WdkZtJYN?=b|%yfhC#tH_Iki(`M8XU7GeSPE*av*P~PNbgL7g4Z^ zC0tK)cmKTkUf%m^clVZ)N54juvN8NS;;c5CnZbhh`l;Jxk9O5}q<-qZ0Mvi|dHPhR zjV<5rNk{qL6=P8Oc&=T-mT~)Z@u@y$?DfBT_s&gPWM9z{$X_6}&NO#^(zmCsQ`O6Q zW};dF8JA)IZ%1;u~STw?2HvIu}roxR!~wn zY0R8-J7JD7^X!-Rd{#~CXt+PKaihyl`?adA9SqAKMw$ESe|pdGIoosLXB1~VV>fZ{ W_MY{2zc?_hF?hQAxvXmiE( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json index a1661aee78..fe19dcec1c 100644 --- a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json @@ -66,6 +66,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..db800b2a3bf79d09f87ce89e88208701364dcc8f GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4ZfZ(jv*CsZ*T4OVs;cb@X=ED&6SWQ0UaS8 z&7{Zf%4SVUjM24B^2e5Mm@Z=0B*W2^uy9{Pl5*yoNdh8&8YV}6lhQtams|4lf79aa z#|_`y*%bbU187%6!dw&EuhY|feoDBmzWF7*%tg1sRpfwsOVx|Av$+jgA3ug~GrMNg z+g#`W?3s4nn_u7TPO9Hu5ypS#LH*MGJEuO4+IBxLU8?j^*#4S#{@MyNS9;|B3iVr; z$F*jw?4E4; z|Mbz3Q|8VrH=Y-atEvNp&Wanm7j&Qb^={tmKS6sRCf!VW&Y^c8w(8-& zKM6lHS9f#QZL!%{%p!iE>bye%*jw?4E4; z|Mbz3Q|8VrH=Y-atEvNp&Wanm7j&Qb^={tmKS6sRCf!VW&Y^c8w(8-& zKM6lHS9f#QZL!%{%p!iE>bye%3A!zpFbpHh*GA%7t)^g>jRmdnT}W-@kV-|94c+hTb5jU@}!_i!X-FfF-mH!{{;b) zE@u@N_wGBF?x=f6%Q$n$G(T%|ILMI`c<%7Z>l zjl1sZ{WI1qV=&WdkZtJYN?=b|%yfhC#tH_Iki(`M8XU7GeSPE*av*P~PNbgL7g4Z^ zC0tK)cmKTkUf%m^clVZ)N54juvN8NS;;c5CnZbhh`l;Jxk9O5}q<-qZ0Mvi|dHPhR zjV<5rNk{qL6=P8Oc&=T-mT~)Z@u@y$?DfBT_s&gPWM9z{$X_6}&NO#^(zmCsQ`O6Q zW};dF8JA)IZ%1;u~STw?2HvIu}roxR!~wn zY0R8-J7JD7^X!-Rd{#~CXt+PKaihyl`?adA9SqAKMw$ESe|pdGIoosLXB1~VV>fZ{ W_MY{2zc?_hF?hQAxvXmiE( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json index a1661aee78..fe19dcec1c 100644 --- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json @@ -66,6 +66,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..e282da2e6d219c9f1f5f5c496e13d3f5223e85a0 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV080zaSW-L^Y)fv5tE_Fv5)M* zTiLoFNQuU76h9G?q?PF(v~}OKc?qfM=Nn!aIwTlcm)`bdf8i55>-s+NAOCq~v`o*B zYw};Mnioao?gRevh57;hm4u z1+E8br3e09IDK1f&i?6omJL63PV8h>5s^P&lD;AIceYpD0q+ThWsNf14Tpf6fRp2ZBkwXY2#4fJKjIvc<+yJ$e(^tD`1RwTuaQX%C(E1dk8)qC zaF2Ku-S~#DWBStV-En^A$LimfMy@Q2Dr{d+cHwAl;}7fOdI6QwC&(Vi