From bf9643563dc952cec315a3c42e55524f13fcd1a6 Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 11 Jun 2016 13:08:05 +0000 Subject: [PATCH] Ensure we only log and notify admins when person is set on fire This takes advantage of the now refactored IgniteMob returning true when it successfully ignites the mob --- code/game/objects/items/weapons/cigs_lighters.dm | 9 ++++----- code/game/objects/items/weapons/tools.dm | 6 +++--- code/modules/hydroponics/grown/flowers.dm | 6 +++--- code/modules/mob/living/living_defense.dm | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index f01252e9e31..507d99938f6 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -73,9 +73,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/match/attack(mob/living/carbon/M, mob/living/carbon/user) if(!isliving(M)) return - message_admins("[key_name_admin(user)] set (key_name_admin(M)) on fire") - log_game("[key_name(user)] set [key_name(M)] on fire") - M.IgniteMob() + if(M.IgniteMob()) + message_admins("[key_name_admin(user)] set (key_name_admin(M)) on fire") + log_game("[key_name(user)] set [key_name(M)] on fire") var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user) if(lit && cig && user.a_intent == "help") if(cig.lit) @@ -530,10 +530,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM return /obj/item/weapon/lighter/attack(mob/living/carbon/M, mob/living/carbon/user) - if(lit) + if(lit && M.IgniteMob()) message_admins("[key_name_admin(user)] set (key_name_admin(M)) on fire") log_game("[key_name(user)] set [key_name(M)] on fire") - M.IgniteMob() var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user) if(lit && cig && user.a_intent == "help") if(cig.lit) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 806ebfc56fd..d7d5b314e49 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -319,9 +319,9 @@ if(isliving(O)) var/mob/living/L = O - message_admins("[key_name_admin(user)] set (key_name_admin(L)) on fire") - log_game("[key_name(user)] set [key_name(L)] on fire") - L.IgniteMob() + if(L.IgniteMob()) + message_admins("[key_name_admin(user)] set (key_name_admin(L)) on fire") + log_game("[key_name(user)] set [key_name(L)] on fire") /obj/item/weapon/weldingtool/attack_self(mob/user) toggle(user) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 94be12359f1..54558ceb950 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -181,9 +181,9 @@ if(istype(M, /mob/living)) M << "You are lit on fire from the intense heat of the [name]!" M.adjust_fire_stacks(seed.potency / 20) - message_admins("[key_name_admin(user)] set (key_name_admin(M)) on fire") - log_game("[key_name(user)] set [key_name(M)] on fire") - M.IgniteMob() + if(M.IgniteMob()) + message_admins("[key_name_admin(user)] set (key_name_admin(M)) on fire") + log_game("[key_name(user)] set [key_name(M)] on fire") /obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) if(!proximity) return diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 3895cf1d3e5..598aab68e2d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -163,8 +163,8 @@ if(on_fire) //Only spread fire stacks if we're on fire fire_stacks /= 2 L.fire_stacks += fire_stacks - L.IgniteMob() - log_game("[key_name(src)] bumped into [key_name(L)] and set them on fire") + if(L.IgniteMob()) + log_game("[key_name(src)] bumped into [key_name(L)] and set them on fire") if(L_old_on_fire) //Only ignite us and gain their stacks if they were onfire before we bumped them L.fire_stacks /= 2