From 0bde4a75e9e1194e4ad8f6f82eecc3f966e37593 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Thu, 11 May 2017 15:53:43 -0400
Subject: [PATCH] Cleans up meter's Initialize (#27127)

---
 code/modules/atmospherics/machinery/other/meter.dm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index b9d15b68595..bd9f3e35df2 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/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"