From 59b72ec25c56ccc035efe82af4d78eaa74982b5a Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 9 Jun 2016 06:19:16 +0000 Subject: [PATCH] Better logging and notification of setting on fire This also logs bump fire to the gamelog incase someone ever needs to find out who set who on fire with bumping (left out of admin notification) as it would be very spammy --- code/game/objects/items/weapons/cigs_lighters.dm | 4 ++++ code/game/objects/items/weapons/tools.dm | 2 ++ code/modules/hydroponics/grown/flowers.dm | 4 +++- code/modules/mob/living/living_defense.dm | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 00f12ae5119..f01252e9e31 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -73,6 +73,8 @@ 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() var/obj/item/clothing/mask/cigarette/cig = help_light_cig(M,user) if(lit && cig && user.a_intent == "help") @@ -529,6 +531,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/lighter/attack(mob/living/carbon/M, mob/living/carbon/user) if(lit) + 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") diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 8e371776775..806ebfc56fd 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -319,6 +319,8 @@ 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() /obj/item/weapon/weldingtool/attack_self(mob/user) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 9ac7c9fef1f..94be12359f1 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -181,6 +181,8 @@ 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() /obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity) @@ -196,4 +198,4 @@ ..() if(!user.gloves) user << "The [name] burns your bare hand!" - user.adjustFireLoss(rand(1, 5)) \ No newline at end of file + user.adjustFireLoss(rand(1, 5)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 22841c06765..7f4eabb8d5f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -162,6 +162,7 @@ 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_old_on_fire) //Only ignite us and gain their stacks if they were onfire before we bumped them L.fire_stacks /= 2