From 8e3f2cc1fa7a6efeb5ddd0b42a2174c2e1f6f6ba Mon Sep 17 00:00:00 2001 From: MisterMecky Date: Tue, 23 May 2023 23:24:42 +0800 Subject: [PATCH] fix watercooler sprite (Also adds solution visuals) (#16740) --- .../Entities/Structures/Storage/Tanks/tanks.yml | 12 ++++++++++-- .../Structures/Storage/tanks.rsi/meta.json | 15 +++++++++++++++ .../Storage/tanks.rsi/watercooler-2-1.png | Bin 0 -> 207 bytes .../Storage/tanks.rsi/watercooler-2-2.png | Bin 0 -> 222 bytes .../Storage/tanks.rsi/watercooler-2-3.png | Bin 0 -> 253 bytes .../Storage/tanks.rsi/watercooler-2-4.png | Bin 0 -> 273 bytes .../Storage/tanks.rsi/watercooler-2.png | Bin 0 -> 723 bytes 7 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-1.png create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-2.png create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-3.png create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-4.png create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index 184c458754..86cdfa62e5 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -58,7 +58,6 @@ - state: highfueltank-2-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false - - type: Appearance - type: SolutionContainerVisuals maxFillLevels: 7 fillBaseName: highfueltank-2- @@ -114,7 +113,14 @@ components: - type: Sprite sprite: Structures/Storage/tanks.rsi - state: watercooler + layers: + - state: watercooler-2 + - state: watercooler-2-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerVisuals + maxFillLevels: 4 + fillBaseName: watercooler-2- - type: SolutionContainerManager solutions: tank: @@ -147,5 +153,7 @@ Quantity: 10000 maxVol: 10000 # It's pressurized... + - type: ExaminableSolution + solution: tank - type: ReagentTank transferAmount: 100 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json index fdcadad7c5..5dfa9273d1 100644 --- a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json @@ -99,6 +99,21 @@ }, { "name": "highfueltank-2-7" + }, + { + "name": "watercooler-2" + }, + { + "name": "watercooler-2-1" + }, + { + "name": "watercooler-2-2" + }, + { + "name": "watercooler-2-3" + }, + { + "name": "watercooler-2-4" } ] } diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-1.png new file mode 100644 index 0000000000000000000000000000000000000000..b2a313c19420e7c6d05568cfb8ab007adca922ab GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ot`d^ArY-_ zFKy&yR^(v~m_KD2(@E|PysHfaS64{uCv+ZSp72U*$BUY-DI));ZgYsQ>0n@}ds9)g z;=A3<%9*nzw_bB9Z)5H_QBv-usk^&4E_-k7du=I)(3Ml1ET5mQb+KSDp1f+(ZhdRx z#j&RGyajfD*ERWn*6z1k*l{M7HMu9?KhPBn^$&S3Y*lBs-ZAeNi0kR<=d#Wzp$P!A CCQJGN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-2.png new file mode 100644 index 0000000000000000000000000000000000000000..34819cb0b822638f473d301c3be3a44df8f63eb5 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Gdx`!Ln2z= zUOvcqL_vV{g8Yru?1|@^?%rq!z15)WBYL^v!9k`w!F=9IDTmrp6Yr@$P=D+$XmIS# zfis_ZjQ!uP@%`{fSo Vz5IISb)Xv=JYD@<);T3K0RU9MS4{u_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2-3.png new file mode 100644 index 0000000000000000000000000000000000000000..b8621eb08dedccbecedd350433293eeb4460c7dc GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}+dW+zLn2z= zPI2TqtRUc8@4a1*XER^QMC}T;{x_nNTE$N!9Vj*6=AW=GO5<7sW3<=vTo(CrH6rW+ z|K^^a>1=qcHgZ}{y^MQFYc>cz^Nx-=*`q7HI&H{bSyv6C!6n Tk9|G`=q(0MS3j3^P6(UV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/watercooler-2.png new file mode 100644 index 0000000000000000000000000000000000000000..fe50269baa66db187f0d30f8cf4380dd8723f5c6 GIT binary patch literal 723 zcmV;^0xbQBP)Px%jY&j7R9J=0mOpF~Q5?s=hX%RQLRv&oPX-`rA^~ICx^-$CI{0sOu*%@zMqHXE zHEGhgG~FE3(AuGKYaxL}U78L=Xh>-=G2z;Q9C}EgDQYM+^&FZ|y;Tm%RJE zcfa?!_r3SK2OP6F)(1udL8aZ8H=!Boyi5S2fuOR(_l8egaKd5ltH;lu*>9&liP+2M zV5)B2p@lff0ssJHa=BQp$4LA7RS!}CAZ}6TGq3_^>C3lr`$2jDkR{hcOcqFT1*iEO zQrKVaW|428AXhpAAUG_jb@yN|pTp|5+Gpj*cW~W35FD1y07!BLU8MxfR|a9Q_Nw}S z1Niwlf#R<&>YUWuaPs*JWmDXMvF|KuB?+f&f@%zj@0JU2dEA&7d(t*P^EPx|z653G zA~+MT>LYP6UZBp$v