From: Tunguso4ka <71643624+Tunguso4ka@users.noreply.github.com> Date: Mon, 13 Nov 2023 23:00:51 +0000 (+0200) Subject: space cleaner and fuel dispensers (#21610) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=aeceea0ff319b93c298cec49d838edb9e29c4d31;p=space-station-14.git 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> --- 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 0000000000..0d42fa402e Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png differ 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 0000000000..333ffde9a9 Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png differ 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 0000000000..f8b99b5244 Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png differ