Merge pull request #7648 from Poojawa/some-tweaks

Soft sync some fixes

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

@@ -53,3 +53,4 @@
 	var/creamed = FALSE //to use with creampie overlays
 	var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
 	var/lastpuke = 0
+	var/last_fire_update

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

@@ -122,6 +122,12 @@
 
 ///FIRE CODE
 /mob/living/carbon/human/handle_fire()
+	if(!last_fire_update)
+		last_fire_update = fire_stacks
+	if((fire_stacks > HUMAN_FIRE_STACK_ICON_NUM && last_fire_update <= HUMAN_FIRE_STACK_ICON_NUM) || (fire_stacks <= HUMAN_FIRE_STACK_ICON_NUM && last_fire_update > HUMAN_FIRE_STACK_ICON_NUM))
+		last_fire_update = fire_stacks
+		update_fire()
+
 	..()
 	if(dna)
 		dna.species.handle_fire(src)
@@ -154,6 +160,7 @@
 
 /mob/living/carbon/human/ExtinguishMob()
 	if(!dna || !dna.species.ExtinguishMob(src))
+		last_fire_update = null
 		..()
 //END FIRE CODE