From c2c8eaef13c4bb7789d26191db08cd550a019b79 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Mon, 12 Jan 2026 23:00:57 -0600 Subject: [PATCH] Add ammonia tank that can be purchased at logi for mixing space cleaner (#5167) * Add ammonia tank that can be purchased at logi for mixing space cleaner * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Velcroboy Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../_DV/Catalog/Cargo/cargo_materials.yml | 11 +++++ .../Structures/Storage/Tanks/tanks.yml | 45 ++++++++++++++++++ .../tanks.rsi/highcapacityammoniatank.png | Bin 0 -> 931 bytes .../Storage/tanks.rsi/highcapacitytank-1.png | Bin 0 -> 1105 bytes .../tanks.rsi/highcapacitytank-2-1.png | Bin 0 -> 213 bytes .../tanks.rsi/highcapacitytank-2-2.png | Bin 0 -> 225 bytes .../tanks.rsi/highcapacitytank-2-3.png | Bin 0 -> 228 bytes .../tanks.rsi/highcapacitytank-2-4.png | Bin 0 -> 258 bytes .../tanks.rsi/highcapacitytank-2-5.png | Bin 0 -> 317 bytes .../tanks.rsi/highcapacitytank-2-6.png | Bin 0 -> 335 bytes .../tanks.rsi/highcapacitytank-2-7.png | Bin 0 -> 369 bytes .../Structures/Storage/tanks.rsi/meta.json | 38 +++++++++++++++ 12 files changed, 94 insertions(+) create mode 100644 Resources/Prototypes/_DV/Catalog/Cargo/cargo_materials.yml create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacityammoniatank.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-1.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-1.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-2.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-3.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-4.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-5.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-6.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-7.png create mode 100644 Resources/Textures/_DV/Structures/Storage/tanks.rsi/meta.json diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_materials.yml new file mode 100644 index 00000000000..cfd931ab0ef --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_materials.yml @@ -0,0 +1,11 @@ +- type: cargoProduct + id: MaterialAmmoniaTank + name: ammonia tank + description: A high capacity liquid storage tank. It is filled with ammonia. + icon: + sprite: _DV/Structures/Storage/tanks.rsi + state: highcapacityammoniatank + product: TankHighCapacityAmmonia + cost: 3000 + category: cargoproduct-category-name-materials + group: market diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Tanks/tanks.yml index 563785dfd1e..88bcda27650 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Tanks/tanks.yml @@ -19,3 +19,48 @@ reagents: - ReagentId: Kvass Quantity: 1500 + +# Generic High Capacity +- type: entity + id: GenericTankHighCapacity + parent: [StorageTankBig, StructureWheeled] + name: high-capacity tank + suffix: Empty + components: + - type: StaticPrice + price: 750 + - type: Sprite + sprite: _DV/Structures/Storage/tanks.rsi + layers: + - state: highcapacitytank-1 + - state: highcapacitytank-2-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 7 + fillBaseName: highcapacitytank-2- + - type: ExaminableSolution + solution: tank + - type: SolutionContainerManager + solutions: + tank: + maxVol: 5000 + +- type: entity + id: TankHighCapacityAmmonia + parent: [GenericTankHighCapacity, StructureWheeled] + name: high-capacity tank + suffix: Ammonia + components: + - type: StaticPrice + price: 2500 + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Ammonia + Quantity: 5000 + maxVol: 5000 + - type: Label + currentLabel: reagent-name-ammonia diff --git a/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacityammoniatank.png b/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacityammoniatank.png new file mode 100644 index 0000000000000000000000000000000000000000..4196041e8615a058b908a25a44e54f583e3c37f4 GIT binary patch literal 931 zcmV;U16=%xP)<3r~3FwNS!ujhWu%)NP|^)P4dIs2Zy z&R%=(Gm{>R#pr(`-D>jU&Fd*yy}0+p^G^uCd1-A0O^=2MqhMcJ8f9edr%!#OJP$iJ zNazR{ov+LPC@=a=iI$w-H`-m%vPS zKP^o!(Amo^+Y@su)L37qt@jTHHRprfy|g(xL(M()duk*)0ta*RD6h1THwWMV7=JrJ zfzu5fG62K{7pp#%H z%qom)@}6D59#PW~z~rSXSE=XKOFq3S0Wx0gda48&@n>&&3vDgGGo4moe1;#DM7r8S zkpm^Am9{0AL6xlcGKsslZ)qXML4e1P9%|3nySQxka+9uT$^j=5h{N#YcG;pN6Tzwi zI0Et|I5y6sQwgv!h_s$>qhzS732-FDk46AtfF^}UeO%K{C6F92X1|o73J?%Kaw+Xu z0)!u9s(Qz|6-=GbsRT$YwBlsW0jx`MCM57TRgf(4>_8*1@O_a-r;SKpR|4^4B7iIf zK6mx-r2{0B0Cs9!+m%3)&_qChO|f|@sLmk+8c{>jIhuICTV~RTs;UDt(D$0(@p<)< zX#}1>d&+GRkZ1slVS9Hy60x=I0uxa4LY>FH@S`Ijtr+Z#i%tQZk;ulbC-c}JejtIV z6@#gil$^lHFCEpXdOND~vcC!@0PUcW7$@r6sUQ(FzAy8Vd}^*}tyow`c7ElM%TRsb zu-bKu4=m(gt0v!sN0-HJB9RX!fG8j-R>}JBlN(6n;}3pI4hIcX@nuvG3f?L|3EKM^imW>y+qMV|3DNJg?S1@ zi8Mn}Gz%SNDD#q3Ix{&ocCn1i{PwU;XU>_KGc*(Jmzi_c-h2Jdx4yN{Oced+5#=xc z9_i4W5!ZeBmfy8T>$Gv*CP;4GCCP95`)O4{fzSN()MV;vZWZ@!jj|L82p<4#a;Muv zsYzy1e-`EEMifE^kXl?O{}_KKp3)xxfS}Ie^p)i7YE@JyE#7EYwzjTro#FujiYv;f z$3Cc2z#jmTpTBh3u>5CEo**qmPyp;W?wrtVtW_YQ05Bk=M;U&89Fery7cI+@AwQI0 zBSs9snwK+|ZP_eacJ2}NpSHJ2TQ;p%7}}q`pxFFU8Oi$|-lyTdPRV3mCgKq(0iGmh z^DfylHY7Gh0&8&z*}6K2KLLoCIU|RLIvXW(ate7ST#*CF+rD3(o&GEU7RDx!tFKi` zv6RXDsg4aiz9UU}K8m?@4NZn7tf{Ib+rW^I?|d$}1WCC?UI3Fx=>pyz@{bLVl6$a6 zD1;5M?$o&pVv60?OZnD9x_RRU9j>iat`WO<_H=LnZ3%)s5|;pNg>^@d9rsDb0BWdf zSFZ$aLp%ixmArN%&CY!HDi9r`V^GH?UUd^nfOVk)V7|Hxq6A1@U9*o`njca2x?4bI(y9$Jm4^#j^ zU~APunsz%34HcV|Mo$}Vi+L$)wv+4iW1&Q#fgG8+YiWInJXL zwWb^HyzA9*PxMd`Q;!cyRGO2FO;8vq-@90ldoA$LK4OTBP5 z6o3gsDFK^M=K-7pFM4ePqIB;Op=7XwsO{c$ksKo;C13z-2neI0?Rl(WBWu^P@ze*A zP5~?egmySwE+ZBZM+dpgVj+V!-y#Wd=#?>Ldq6k5+CQ`^2=@EdmZgnoBEPnZMT_v~0h2 zYuERC^FIZhI#qXx;pEq!H#y=`?_2aNxVCGraZ}W5Rci&MPYe;|^6whI{hkDL8iS{+ KpUXO@geCxK@>vQ1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-2.png b/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-2.png new file mode 100644 index 0000000000000000000000000000000000000000..94399242b9530769430c040dd09aac1854835574 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}vproLLn2z= zUOvdltSG>GVZY+_`VE5pW(mC0l3nBWR?c(FImmQI(eDKq2|0RxP9A28YCjyD(HO@=4%O-VOzrUi?<0zZ(u0ynh?u5JH@$Z27A+=exn}_2Ml-) z8`PaK;=W$`mcgOu`qpa<42H*E-VEQF(>x_eopX|aV8weyrQ}ut2O-U+b;lU4=RTO@ zteN^Ido6$Mxyq7w$%ZF8YL-2S{LW|1x>Q6au%Ldazai_g2meJ@yee{OTs7~LuvA;( a9fp)u&TRT^6B~doW$<+Mb6Mw<&;$UycU9y7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-4.png b/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-4.png new file mode 100644 index 0000000000000000000000000000000000000000..0d05a27c5d4ae766086cff6153f657b5f6107e7a GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2z= zPTk1cY#`#&uklv2o@4tIlPMj7630a!U%2%5m-!lp<6Jxrt0K7EG`LEB`ftj)`!ZTR zKJh@I%=7!2eMb@{%or3nLv?R$yL<2Vu5}Cz>t6Gv>$7(l=9R`WGq|uQvYh!m=Z^r> zvdpHL3*Y}ftvIiGp^o>ANGtu*pC0x66c}o!b*%@rKoy*>gfm$AVQ_ z9Uf7>mm5;5maeW~jcW{lAeth&BI~0s>#C~L=}#>BJ~IVhO#B(>G^-5g4+c+HKbLh* G2~7Yc3};UO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-5.png b/Resources/Textures/_DV/Structures/Storage/tanks.rsi/highcapacitytank-2-5.png new file mode 100644 index 0000000000000000000000000000000000000000..50b6075df5b04eead9d78e01d1f2f998edb098e8 GIT binary patch literal 317 zcmV-D0mA-?P)Px#_en%SR9J=Wma%QcAP_*$QQ9kR0e5aGE%(SH*vnYV;6Z3zSVAt5%na@rfQA7s z)kliI^M91^(}X9Tkl;ArUIRd(P`E&A%{O9JtGoL`}o;t&Em=PqCAoZ}DzE2Xk@;r%=zgn)UTzud4aOUir61rRY6 zU)Pn5F;(C9X^b(Zyd1opC#Px$2}wjjR9J=WmOqMxFc61-KDM1=E?}3&B4w}_ui#}QXYe3-rG=0>V6Nc-(s+Pu zwSiUFT^@N`<%2Mg$)6$L6afl_3yd)_gb=;=ao_h-G{(eScRh|5d+#FvF!Sw3?|qg+ z9(PHl6ab)Unr|^DAIAwH1OVXqd}3YK>X>iaHr90wAq2K<%U%$)*2(`>-g_TI2vKXD zr4LRoAf?1KO+Rj!=Q*u=O94cb4quifT5GGm?^E3OJ*~^ZsR^BPAR-VEm>J_ZMrOt^ z43U}9bsdNZ&bcfFTq^iFTuOOrw0~7_^~`sZjfDUJ002ovPDHLkV1kPx$D@jB_R9J=WRy%HlFc5u2X}$Ed36$A+e9wz^9Q2qCt^ z+qPw6Ops;S=B>3`oeS)iu?)+ z(f(9|qcK0roxw{9q?90{&AbF&0xyA=;BpC!F~K_$7-J59)E*ul9>2vGL22e-FXQe^ P00000NkvXXu0mjftG=H` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Structures/Storage/tanks.rsi/meta.json b/Resources/Textures/_DV/Structures/Storage/tanks.rsi/meta.json new file mode 100644 index 00000000000..1624f1c8efc --- /dev/null +++ b/Resources/Textures/_DV/Structures/Storage/tanks.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d, edited by Velcroboy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "highcapacitytank-1" + }, + { + "name": "highcapacitytank-2-1" + }, + { + "name": "highcapacitytank-2-2" + }, + { + "name": "highcapacitytank-2-3" + }, + { + "name": "highcapacitytank-2-4" + }, + { + "name": "highcapacitytank-2-5" + }, + { + "name": "highcapacitytank-2-6" + }, + { + "name": "highcapacitytank-2-7" + }, + { + "name": "highcapacityammoniatank" + } + ] +}