From 0235b196dc456c0afdf3c3e5b47dad9009ad6686 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Wed, 3 Jan 2024 16:23:36 -0500 Subject: [PATCH] refueling lit welder explosion fix (#23469) * refueling lit welder explosion fix * add DamgeOnToolInteract to wall dispenser --- Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs | 2 +- .../Entities/Structures/Wallmounts/walldispenser.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs index cac59f9b75..264ec4a8ec 100644 --- a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs @@ -27,7 +27,7 @@ namespace Content.Server.Damage.Systems if (args.Handled) return; - if (!TryComp(uid, out var itemToggle)) + if (!TryComp(args.Used, out var itemToggle)) return; if (component.WeldingDamage is {} weldingDamage diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml index fae044e729..4d0e3cb532 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml @@ -81,3 +81,9 @@ Quantity: 1000 - type: ReagentTank tankType: Fuel + - type: DamageOnToolInteract + tools: + - Welding + weldingDamage: + types: + Heat: 20 \ No newline at end of file -- 2.52.0