Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502

[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct

code/datums/status_effects/gas.dm

@@ -4,6 +4,7 @@
 	status_type = STATUS_EFFECT_UNIQUE
 	alert_type = /obj/screen/alert/status_effect/freon
 	var/icon/cube
+	var/can_melt = TRUE
 
 /obj/screen/alert/status_effect/freon
 	name = "Frozen Solid"
@@ -20,7 +21,7 @@
 
 /datum/status_effect/freon/tick()
 	owner.update_canmove()
-	if(owner && owner.bodytemperature >= 310.055)
+	if(can_melt && owner.bodytemperature >= 310.055)
 		qdel(src)
 
 /datum/status_effect/freon/on_remove()
@@ -29,3 +30,7 @@
 	owner.cut_overlay(cube)
 	owner.bodytemperature += 100
 	owner.update_canmove()
+
+/datum/status_effect/freon/watcher
+	duration = 8
+	can_melt = FALSE