From aeceea0ff319b93c298cec49d838edb9e29c4d31 Mon Sep 17 00:00:00 2001 From: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com> Date: Tue, 14 Nov 2023 01:00:51 +0200 Subject: [PATCH] space cleaner and fuel dispensers (#21610) * cleaner and oil wall dispensers * fuel * meta jason * yaml * fixed error * suggest Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> * fuck webedit --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> --- .../Structures/Storage/Tanks/tanks.yml | 1 + .../Structures/Wallmounts/walldispenser.yml | 77 ++++++++++++++++++ .../Storage/tanks.rsi/cleanerdispenser.png | Bin 0 -> 1069 bytes .../Storage/tanks.rsi/fueldispenser.png | Bin 0 -> 1105 bytes .../Structures/Storage/tanks.rsi/meta.json | 11 ++- .../Storage/tanks.rsi/pepperdispenser.png | Bin 0 -> 1096 bytes 6 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png create mode 100644 Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index 5f3b841565..8a7965fdd7 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -178,3 +178,4 @@ fillBaseName: watertank-2- - type: ExaminableSolution solution: tank + diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml new file mode 100644 index 0000000000..26416c0ea6 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml @@ -0,0 +1,77 @@ +- type: entity + id: CleanerDispenser + name: space cleaner dispenser + description: Wallmount reagent dispenser. + components: + - type: WallMount + arc: 180 + - type: Sprite + sprite: Structures/Storage/tanks.rsi + state: cleanerdispenser + - type: Appearance + - type: InteractionOutline + - type: Clickable + - type: Transform + anchored: true + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 5 + behaviors: + - !type:SolutionExplosionBehavior + solution: tank + - trigger: + !type:DamageTypeTrigger + damageType: Piercing + damage: 5 + behaviors: + - !type:SolutionExplosionBehavior + solution: tank + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:SpillBehavior + solution: tank + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - !type:DoActsBehavior + acts: ["Destruction"] + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: SpaceCleaner + Quantity: 5000 + - type: DrainableSolution + solution: tank + - type: ReagentTank + - type: ExaminableSolution + solution: tank + +- type: entity + parent: CleanerDispenser + id: FuelDispenser + name: fuel dispenser + components: + - type: Sprite + sprite: Structures/Storage/tanks.rsi + state: fueldispenser + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: WeldingFuel + Quantity: 1000 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png new file mode 100644 index 0000000000000000000000000000000000000000..0d42fa402e435e1fbc12cffb18239c35a4cc8c2e GIT binary patch literal 1069 zcmV+|1k(G7P)(vT3CfBo+ykScb4D8;y1qCG% zR3Ivqri(UYQRRzFxU2NM1K-cy79H4n$*Y#sM)6>(3e9A{1nWjm-UOz@)X=&-i zC|c=(-+XObmUDUoS!j$wT=(+BKq|G?!es$>#x36ophO z)qVz|-uKzi#IKh~q{0?l!f>DP%nt%eyPzq9pSO zQU_7s68?4vMN#lPk3ylq>gp;1P{?FjE}#<$G*_{zs#G4{A`C+ki3F;uQvKx%0KzaN znM|@Z|2eX}Z{lEdVHhGR3JIVQMTcy+m4PUV$mjF%g@Z3(sZ@%cHUHbTjb&MgqKIJ_ zh@yxr%k1s#p=w&o4R|7f@$vCvPjow&oSbab>vcTOdud#jkt8W5&}t8ef5%xXG+$89 z^Ww~iqDV6Nat*gC!MPDQIOBpO0mS`rS`(fdfo62IT8&P_h@Gd?>3^pL2cwilvE_Fw zoEw2AW@cvzMUjz_5r&6{(K8vAS5|<(FoypWKi$2H_-Eu{7@}!fOXufGz%)&wD59^g n4>-Ofq9|(F0~ff!e~v!@r2Ft1c|%pH00000NkvXXu0mjfrGe~> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png new file mode 100644 index 0000000000000000000000000000000000000000..333ffde9a9cd0519f7f3b7344a6402d1e15ca16f GIT binary patch literal 1105 zcmV-X1g`suP)f#B!^H?MQO{IA=t#m1}|nm?A>(_)SCb%xGicA&2!p$HSf$b&pR^|J zKF|F8JTo&hXqt90fjVyMYa}B9MqiwT4Kwx4>JpOBe-5-`nkI%Z2!$xSyDQBT&~=?$F2|SIxA^(s zeE`x%nmyw&A3o?{WMqUwSAipEle-5u34(xiZJq7J8dcL|a&j_^B}o#pEaQ0|Ksb^Y zD&Tn@f*|nl;X@Qf0l;-#Y};mbb~X%_%jLp5f*_zM3eM*lgbe84rm$_BJ9~SifUgDy zFirDf0+wYV%QB{El1wJ)?(Qa&$>6#!sZ@&o{(cr07g1G}_V#xA`}^72+G1yC2Y{{z z1K75W7So8uVtm)x34o#~M5EE>6)++Ky=@Z3e44+q$RK^*%ob`8inm& z5N#VNa6`2|85;wRyWepfo-Ql^G^YR@kCLKDT<^I;WUov|ROQLaGu|6WA&L^)nLT#$ zCaGi_q9{>uG&ZvPc(oe0Z{6bly?c1oDxUA7sw%^yqx?8GhhZ4a5l|EbrxsyuX^n)@ z%I^LlS2{Xb`gNOx(MoRrkVLYZ<==Nu6p^x3p(oWxHk-wDU6RQp8yg#VKr$Y0xPZ67%0;yLZ2m-siyBLOnZQEf$%d$wP(}<#oVHk*_h%C!gDiu^sYq$Z=B``id ze&!e545p^0YUOen*L7b6mt`bL3JEmY1LEIF)(G`KsO!3+GNLGkDnjEYxHJMU&$u8- zz_9|rE1U4r2-K@9l}fZ3MwmPni~T!K@N$*1C^r0Vgi9k($IR?3z9=$0Jj~G05PCe$ z+WI>17sl|P;`>LB5dW;)_kA=?Ync2}2^5P(f*|19wQB$;c7$n~1VPZS2VUbf{&V~R Xdl>ufOHIYt00000NkvXXu0mjfe%1a$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json index 93b557cf5a..c4d31e80b2 100644 --- a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, dispensers taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/846ce475b2258a4336d8895f07f2c0f4053963bc", "size": { "x": 32, "y": 32 @@ -117,6 +117,15 @@ }, { "name": "generictank-1" + }, + { + "name": "cleanerdispenser" + }, + { + "name": "fueldispenser" + }, + { + "name": "pepperdispenser" } ] } diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png new file mode 100644 index 0000000000000000000000000000000000000000..f8b99b524446dd701aafb921634bae454f2068bd GIT binary patch literal 1096 zcmV-O1h@N%P)dAG#Z;aRR4f+R z+uJ)rU~zHr*en|9KYK1o(jk(^63}%$H0;~nWbM%-%0X?t*7rvCBpKk^wQHO`dlpqy ziO1vY?CdZ-JV+3Vqt+xG3~i>vcI49_IB)+Ri^KK zANn$k^Hi(V<|D z5oaW2@NQCN*30p6p~MHN)=>VufqWm>-rfe1n5KzgoQFb;t*v{_6VP>?d_K=7oxS{a z@ht!zyz+qEnHk=;+ZY-eqR?BQyt>Lq7cLM40n44stS>E5HBClGM?+tcNCZVu@H`J7 z9LWo*`CI2m)9vmARgbQ4@kY z6`x<63Kz8&YC;eM@U7(_s#UIBzRb-VH}I-eJl{uERR%9z;)mO}F$|+Q0zwFuk}vb= z!%cccgkLKj(XKAO+}xM%S3DBk-At^nqedilynwdeUW5?1u1h+dW@Tjs4@f5x4HwX{ z1nR3;RaNFvDSq~ST3T9ARh5NIh6TX)eWHrOOeTY(?7J|YG%HX3%Rg{7?jw=4_OG?8T)!!VF#8AVa3R4S;N)^GzJOJHPVL_z|M_JI6%f;B?@1$A9Ftc)znM59mFaHA_YH3A1`T#7^h!v1(( z6P_A@dUmB!iB`i1gU93Xf9DDgW~s<>!|z5oH3D@^Oitpv?lDY5uXqwhA_^A>o7K;QyKv!26aCAomLC~-VUf>1(bNmS!?EBEu{@2q0 O0000