From 0412ea0bbc1496d74d97bc4758dc231209d181c4 Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 1 Dec 2020 08:33:22 +0000 Subject: [PATCH] Fixes inhands for small gas tanks (#2658) * Initial * Hotfix --- .../Back => Objects/Tools}/gas_tanks.yml | 8 ++--- .../Tanks/emergency.rsi/equipped-BELT.png | Bin 0 -> 643 bytes .../Tanks/emergency.rsi/inhand-left.png | Bin 316 -> 445 bytes .../Tanks/emergency.rsi/inhand-right.png | Bin 358 -> 440 bytes .../Objects/Tanks/emergency.rsi/meta.json | 31 ++++++------------ .../emergency_double.rsi/equipped-BELT.png | Bin 0 -> 525 bytes .../emergency_double.rsi/inhand-left.png | Bin 340 -> 486 bytes .../emergency_double.rsi/inhand-right.png | Bin 341 -> 466 bytes .../Tanks/emergency_double.rsi/meta.json | 31 ++++++------------ .../emergency_yellow.rsi/equipped-BELT.png | Bin 0 -> 665 bytes .../emergency_yellow.rsi/inhand-left.png | Bin 340 -> 486 bytes .../emergency_yellow.rsi/inhand-right.png | Bin 341 -> 466 bytes .../Tanks/emergency_yellow.rsi/meta.json | 31 ++++++------------ .../Tanks/phoron.rsi/equipped-BELT.png | Bin 0 -> 383 bytes .../Objects/Tanks/phoron.rsi/meta.json | 31 ++++++------------ .../Tanks/plasmaman.rsi/equipped-BELT.png | Bin 0 -> 313 bytes .../Objects/Tanks/plasmaman.rsi/meta.json | 4 +++ 17 files changed, 47 insertions(+), 89 deletions(-) rename Resources/Prototypes/Entities/{Clothing/Back => Objects/Tools}/gas_tanks.yml (98%) create mode 100644 Resources/Textures/Objects/Tanks/emergency.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tanks/plasmaman.rsi/equipped-BELT.png diff --git a/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml similarity index 98% rename from Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml rename to Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 6164e8cc28..7f1b12ea5f 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -132,7 +132,6 @@ - type: Clothing sprite: Objects/Tanks/emergency.rsi Slots: - - Back - Pocket - Belt @@ -168,7 +167,6 @@ - type: Clothing sprite: Objects/Tanks/emergency_yellow.rsi Slots: - - Back - Pocket - Belt @@ -204,7 +202,6 @@ - type: Clothing sprite: Objects/Tanks/emergency_double.rsi Slots: - - Back - Pocket - Belt @@ -282,8 +279,9 @@ temperature: 293.15 - type: Clothing sprite: Objects/Tanks/phoron.rsi - Slots: [] # no straps - + Slots: + - Belt + - type: entity id: PhoronTankFilled parent: PhoronTank diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-BELT.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/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-left.png index 4cb29ce56cdf80ac46445455583a913676b689d4..720d3f4e6b58983d9354bfb99bcb882e56ec314c 100644 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KVpaSW-L^LExoFJ?!9w&yBK zTU#S;X$b0U30&-&lss$Btsh)b8ZRy{@ms9_NO_4MljDVRr#QYTE9=QPJ}uf_Y|QSFzerpomaMVcyByZ%Kt6Ie7&pou{{r;#4i)>ug>Y4 z`>icXR3`5J=3}BAeu0NP>ms#%CGNle7WvHAiQ%uu1mWG%y*pR2NUA@+eOR3@XtJOK zD`)8Xqxp{~3pog`cW`ia2vbimoT0vH&7WauiHBC_*}6%J{r;-94R-jcr{G zaq08B_s`0{;_7}DNum1ISYuikQ%rw1Q zr~5S>ubEdXtJJKMzx?Ly%wv-?r!32sOj&z(t*_m#$_H<|qhHOBGmU5Ro%XkWYQR%l sr!8C&b+tKPo;;tpb*(WdtTY{6;&+$&Y&`fz{{x8c>FVdQ&MBb@00PLun*aa+ delta 289 zcmV++0p9+-1H1x|B!2@*L_t(|obB2%4uU`sh2e?u02agxkWf+?V}q465N}~)!)dH- zJduqF2@NMuPcT-SP%6yAV*an+*OEzrinx(e!qFTFIC95=dt<-CiN+n$uS5|Lrb0L| z!6U0{?ths-h9^`Q=cn|D6~x7_@1AO~=cJ`vY=(8c$d`w^Z#JtfUdog2{o=m;-)GA$ z7qJ9P6l&kDI^&P$I)~2lYT*k$alYURy=s;A<3D38GZRZn0xPM+gwAZiM@{!6PuMoB zc0aM`nENDQ11rgt$q8A{UwzDHd^WdHM!hjBDEHOJy+6ES@10-fu37a{q9L;6-&Fl) zTw5-Morp8fPp;T4{`RkL{j~cGS#=hBL(|^=`SI!6zEU5auTeGoR?q*t`K`&BO~w8V nClwxX6$t*i#{>$gSsF{H9TwkE%6xXZ1BmbG>gTe~DWM4f?wGV* delta 331 zcmV-R0kr0SprjQ7gB)Fk7J>;1d}Mz zW~(iS-Ny9NW<-?LRIOa&HjEP;1>;gX%GY~YZ-&}xr(as(^XGT9Rs`F#1lH#ntUtes dWB>rbA>V<1a^xHJ8vXzP002ovPDHLkV1lsZnc)Bc diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json index 5123c111a0..6575e1e487 100644 --- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json @@ -1,38 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", "states": [ { "name": "icon", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 1 + }, + { + "name": "equipped-BELT", + "directions": 4 }, { "name": "inhand-left", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..f139bc6db2175ad897e62fca560e34f6a67ea9dc GIT binary patch literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV7%h#;uumf=k2Wh-cErc$NQDM zyj8cFm};~*nt0AW?->>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/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-left.png index 55ff15618f74f122d98a3e40fca80a873058c438..ad6e0f9beae3871c73caf508232ae95f124e8b29 100644 GIT binary patch delta 460 zcmcb@^o)6eO8r_-7srr_Id5kfdNUh}9KYY$ytsMC>h`={SFB>UM`Z@SW?!*5{)lhM zx79B$^eY6hEG+0QW*5Dq>@RhqU~BpHJx^r+)C;`0F#XSG?{^x$91L)<=0N5Ce3ieF z$zIzxt@+6{eQWfh$n%X^O~KadSSlyM_kvvckH zl-R?6&72s{s($GDyC-(mE}r;2fgh;Mlgpp`nQ}$9s~&eBbojHsNItnj{DP(Bv$SXPkE;B56`jIfQ(yb< zuIP_JFW;qIKRq*9Qth&hrIp9o&xco5y6(BV;PvXwAK0hn+{ycWaf5iu)9x~- zyT3W&SX%CUJFVhzFEmQS!F%(2Mqt1uaJqcq_ODNgpU+y#2?}UWS3j3^P6Z;JGi?wY6JNduN5aw=T>36%d<`=Nt3jhEB0000009a>> zHvul!u<|~@<=X&L+tnJY2QUu39F8X^r*th#JseLm4!t~nzHOJcV~hOGWQDHRdCO~N zw`F*lCXrsUd@^y|ZiUJ0eI>VEZ^B+Odv8P7Q)ch22QqsA!2j|K0fmgMJM0dA00000 LNkvXXu0mjf_Nb1` diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-right.png index e72d222b9440a093354e60704723c6614af914d7..4983a573c388871eabf642a98e10c0e307223f6d 100644 GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4Ugc;uumf=k2WhUd)aH?a$Zf z=pKo)-E#TZ46W;#DvrJU0^adQ{I+}x-Eu;?gT;{}CV8$C>+h+7W-=eeZvHmkeEfa$ z)2%7+t z|3~xxgf)rVbaJ=cs0m|w{@iYdygp-D(TcPB-Vf3j>IxKnF8i~cRcU&|HbK{&Yk&P0 z%#s#ZpwO&A8WFI~L0J80>AJv^;sMX+GDgpy@3}p=^6w?4S9^>PnC>)N|MBO?xYA1V zeb4iK=YIUk$Io?rg-^qkxr}kA=S7`YFHB|Hv+cmsqn$hV$1Od+J9+bd>De!J&e|8O zZk)Y(ZN{%zmo9%!``f+q-kvXW8$Yhte}k_#pV7CRtt&-C_W(;>Iw<@inmYC|?wgu) TJ<@KG1xUct)z4*}Q$iB}{|nCs delta 314 zcmV-A0mc5(1JweMB!3)9L_t(|obB2%4uU`sh2f1SurOW#LP=%pup=ZSMlQgOI1mk| zurjf+rce|5u`p{aG;w8NS@M59yECKEyip1O000000N?HNTwK>++rspLWV@Nw5R3+J zIiJ*WwVvfa;U{qvOuq5DO6}EH7TN1CADUO{S?4Z!4&l9iV}E6lNq0O*U8Ukn^I9AQ z(l()V$AkPegtEw_Z9*@b*WxIUx=N*OLh~W$hkb2c>(xiE_h&-p(gy$l00000002`q zMuKeP4&(iRU+5izA$JLEoju3^?ziipy9E0@m*r}$F6Wc&qwN?gSDajSSr(b>l5s=T z_q&|ufUXi{oihUey$@i6>o~pFK7g$PM!)n!4X%F(=bV2B0016&0HSq_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/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-left.png index 55ff15618f74f122d98a3e40fca80a873058c438..ad6e0f9beae3871c73caf508232ae95f124e8b29 100644 GIT binary patch delta 460 zcmcb@^o)6eO8r_-7srr_Id5kfdNUh}9KYY$ytsMC>h`={SFB>UM`Z@SW?!*5{)lhM zx79B$^eY6hEG+0QW*5Dq>@RhqU~BpHJx^r+)C;`0F#XSG?{^x$91L)<=0N5Ce3ieF z$zIzxt@+6{eQWfh$n%X^O~KadSSlyM_kvvckH zl-R?6&72s{s($GDyC-(mE}r;2fgh;Mlgpp`nQ}$9s~&eBbojHsNItnj{DP(Bv$SXPkE;B56`jIfQ(yb< zuIP_JFW;qIKRq*9Qth&hrIp9o&xco5y6(BV;PvXwAK0hn+{ycWaf5iu)9x~- zyT3W&SX%CUJFVhzFEmQS!F%(2Mqt1uaJqcq_ODNgpU+y#2?}UWS3j3^P6Z;JGi?wY6JNduN5aw=T>36%d<`=Nt3jhEB0000009a>> zHvul!u<|~@<=X&L+tnJY2QUu39F8X^r*th#JseLm4!t~nzHOJcV~hOGWQDHRdCO~N zw`F*lCXrsUd@^y|ZiUJ0eI>VEZ^B+Odv8P7Q)ch22QqsA!2j|K0fmgMJM0dA00000 LNkvXXu0mjf_Nb1` diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-right.png index e72d222b9440a093354e60704723c6614af914d7..4983a573c388871eabf642a98e10c0e307223f6d 100644 GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4Ugc;uumf=k2WhUd)aH?a$Zf z=pKo)-E#TZ46W;#DvrJU0^adQ{I+}x-Eu;?gT;{}CV8$C>+h+7W-=eeZvHmkeEfa$ z)2%7+t z|3~xxgf)rVbaJ=cs0m|w{@iYdygp-D(TcPB-Vf3j>IxKnF8i~cRcU&|HbK{&Yk&P0 z%#s#ZpwO&A8WFI~L0J80>AJv^;sMX+GDgpy@3}p=^6w?4S9^>PnC>)N|MBO?xYA1V zeb4iK=YIUk$Io?rg-^qkxr}kA=S7`YFHB|Hv+cmsqn$hV$1Od+J9+bd>De!J&e|8O zZk)Y(ZN{%zmo9%!``f+q-kvXW8$Yhte}k_#pV7CRtt&-C_W(;>Iw<@inmYC|?wgu) TJ<@KG1xUct)z4*}Q$iB}{|nCs delta 314 zcmV-A0mc5(1JweMB!3)9L_t(|obB2%4uU`sh2f1SurOW#LP=%pup=ZSMlQgOI1mk| zurjf+rce|5u`p{aG;w8NS@M59yECKEyip1O000000N?HNTwK>++rspLWV@Nw5R3+J zIiJ*WwVvfa;U{qvOuq5DO6}EH7TN1CADUO{S?4Z!4&l9iV}E6lNq0O*U8Ukn^I9AQ z(l()V$AkPegtEw_Z9*@b*WxIUx=N*OLh~W$hkb2c>(xiE_h&-p(gy$l00000002`q zMuKeP4&(iRU+5izA$JLEoju3^?ziipy9E0@m*r}$F6Wc&qwN?gSDajSSr(b>l5s=T z_q&|ufUXi{oihUey$@i6>o~pFK7g$PM!)n!4X%F(=bV2B0016&0HSq_-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&(ViL**xTD@Wo0F3C>--= zm}tr1ufR}ZQnJ`{iLa7xh|ytFpi0J)AirP+hi5m^fSih|kcbkO)Z*l#%z~24{5+t@ zoZzs6qSEhQf(t%=eWK;9t99jJaWn(XeIgchC znG~WByi!4ZqlLMlxuO0(6+?Y%J5AH&E}h-Rs+(6xq_BvmM+GM3X?5hDSi0uHtLIGH zSQwNK$lpGFFg_0G23JoP#}JRsSy)d~paItj zrk)m&8BziP6XrNf;*1DcJWW8DBXXkK39e)&KB+PWhFDLIA6*8g{DB5Cc)I$ztaD0e F0su7vY!?6k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json index 19e8d88681..6331b3935e 100644 --- a/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json @@ -15,6 +15,10 @@ "name": "equipped-BACKPACK", "directions": 4 }, + { + "name": "equipped-BELT", + "directions": 4 + }, { "name": "inhand-left", "directions": 4