Merge branch 'master' into upstream-merge-26140

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -64,6 +64,8 @@
 	setDir(pick(GLOB.cardinal))
 	air_update_turf()
 
+/obj/effect/hotspot/make_frozen_visual()
+	return	//you take my fun i take yours
 
 /obj/effect/hotspot/proc/perform_exposure()
 	var/turf/open/location = loc

code/modules/atmospherics/machinery/other/meter.dm

@@ -16,22 +16,17 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 40, acid = 0)
 
 
-/obj/machinery/meter/New()
-	..()
+/obj/machinery/meter/Initialize(mapload)
+	. = ..()
 	SSair.atmos_machinery += src
-	src.target = locate(/obj/machinery/atmospherics/pipe) in loc
-	return 1
+	if (mapload && !target)
+		target = locate(/obj/machinery/atmospherics/pipe) in loc
 
 /obj/machinery/meter/Destroy()
 	SSair.atmos_machinery -= src
 	src.target = null
 	return ..()
 
-/obj/machinery/meter/Initialize(mapload)
-	..()
-	if (mapload && !target)
-		src.target = locate(/obj/machinery/atmospherics/pipe) in loc
-
 /obj/machinery/meter/process_atmos()
 	if(!target)
 		icon_state = "meterX"