]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
refueling lit welder explosion fix (#23469)
authorthemias <89101928+themias@users.noreply.github.com>
Wed, 3 Jan 2024 21:23:36 +0000 (16:23 -0500)
committerGitHub <noreply@github.com>
Wed, 3 Jan 2024 21:23:36 +0000 (16:23 -0500)
* refueling lit welder explosion fix

* add DamgeOnToolInteract to wall dispenser

Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml

index cac59f9b753e2b17dac3a79076a22efa11c78f6e..264ec4a8ec4b4bf5e55270dd4eb74e8239176396 100644 (file)
@@ -27,7 +27,7 @@ namespace Content.Server.Damage.Systems
             if (args.Handled)
                 return;
 
-            if (!TryComp<ItemToggleComponent>(uid, out var itemToggle))
+            if (!TryComp<ItemToggleComponent>(args.Used, out var itemToggle))
                 return;
 
             if (component.WeldingDamage is {} weldingDamage
index fae044e729cecf44a16151d1c421da4d19ea8fd8..4d0e3cb5321d9e70020b8cf1a25400f042823ad3 100644 (file)
@@ -81,3 +81,9 @@
           Quantity: 1000
   - type: ReagentTank
     tankType: Fuel
+  - type: DamageOnToolInteract
+    tools:
+    - Welding
+    weldingDamage:
+      types:
+        Heat: 20
\ No newline at end of file