cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we only log and notify admins when person is set on fire

Browse Source 
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
This commit is contained in:
oranges
2016-06-11 13:08:05 +00:00
parent 8141d5d60b
commit bf9643563d
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/cigs_lighters.dm
+4 -5
View File
@@ -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)
code/game/objects/items/weapons/tools.dm
+3 -3
View File
@@ -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)