Merge pull request tgstation#18402 from optimumtact/flamingfunremoval

Better logging and notification of setting on fire

code/game/objects/items/weapons/cigs_lighters.dm

@@ -73,7 +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
-	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)
@@ -528,8 +530,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	return
 
 /obj/item/weapon/lighter/attack(mob/living/carbon/M, mob/living/carbon/user)
-	if(lit)
-		M.IgniteMob()
+	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")
 	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

@@ -319,7 +319,9 @@
 
 		if(isliving(O))
 			var/mob/living/L = O
-			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)

code/modules/hydroponics/grown/flowers.dm

@@ -181,7 +181,9 @@
 	if(istype(M, /mob/living))
 		M << "<span class='danger'>You are lit on fire from the intense heat of the [name]!</span>"
 		M.adjust_fire_stacks(seed.potency / 20)
-		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
@@ -196,4 +198,4 @@
 	..()
 	if(!user.gloves)
 		user << "<span class='danger'>The [name] burns your bare hand!</span>"
-		user.adjustFireLoss(rand(1, 5))
+		user.adjustFireLoss(rand(1, 5))

code/modules/mob/living/carbon/human/life.dm

@@ -118,8 +118,11 @@
 	return thermal_protection
 
 /mob/living/carbon/human/IgniteMob()
-	if(!dna || !dna.species.IgniteMob(src))
-		..()
+	//If have no DNA or can be Ignited, call parent handling to light user
+	//If firestacks are high enough
+	if(!dna || dna.species.CanIgniteMob(src))
+		return ..()
+	. = FALSE //No ignition
 
 /mob/living/carbon/human/ExtinguishMob()
 	if(!dna || !dna.species.ExtinguishMob(src))

code/modules/mob/living/carbon/human/species.dm

@@ -1510,9 +1510,10 @@
 	if((RESISTTEMP in specflags) || (NOFIRE in specflags))
 		return 1
 
-/datum/species/proc/IgniteMob(mob/living/carbon/human/H)
+/datum/species/proc/CanIgniteMob(mob/living/carbon/human/H)
 	if((RESISTTEMP in specflags) || (NOFIRE in specflags))
-		return 1
+		return FALSE
+	return TRUE
 
 /datum/species/proc/ExtinguishMob(mob/living/carbon/human/H)
 	return

code/modules/mob/living/living_defense.dm

@@ -112,6 +112,8 @@
 		src.AddLuminosity(3)
 		throw_alert("fire", /obj/screen/alert/fire)
 		update_fire()
+		return TRUE
+	return FALSE
 
 /mob/living/proc/ExtinguishMob()
 	if(on_fire)
@@ -161,7 +163,8 @@
 	if(on_fire) //Only spread fire stacks if we're on fire
 		fire_stacks /= 2
 		L.fire_stacks += fire_stacks
-		L.IgniteMob()
+		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

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -448,7 +448,7 @@
 	return
 
 /mob/living/simple_animal/IgniteMob()
-	return
+	return FALSE
 
 /mob/living/simple_animal/ExtinguishMob()
 	return