From dd9509eaf868f58529970c9fe4decc3a1b2ae55c Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 4 Feb 2019 16:23:03 -0200 Subject: [PATCH] Fixes welding fuel behaving like Zo'rane fire (#6022) --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm | 4 ++-- html/changelogs/alberyk-fuel.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/alberyk-fuel.yml diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 8b71cb11650..8dd32344486 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -259,7 +259,7 @@ var/mob/living/carbon/slime/S = M S.adjustToxLoss(12 * removed) // A slime having water forced down its throat would cause much more damage then being splashed on it if (!S.client && S.Target) - + S.Target = null ++S.Discipline @@ -309,7 +309,7 @@ remove_self(volume) return -/datum/reagent/fuel/touch_mob(var/mob/living/L, var/amount) +/datum/reagent/fuel/napalm/touch_mob(var/mob/living/L, var/amount) . = ..() if(istype(L)) L.adjust_fire_stacks(amount / 10) // Splashing people with welding fuel to make them easy to ignite! diff --git a/html/changelogs/alberyk-fuel.yml b/html/changelogs/alberyk-fuel.yml new file mode 100644 index 00000000000..9c41b068b2c --- /dev/null +++ b/html/changelogs/alberyk-fuel.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Welding fuel should now behave properly when splashed on people."