From 3c3a01bdc08de308fc408857b9cf90bee2eebbd8 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawamanthing@gmail.com>
Date: Sat, 22 Sep 2018 03:42:00 -0500
Subject: [PATCH] Make these alarms initialized

---
 .../atmospherics/machinery/airalarm.dm        | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 071338e56c..0c23664790 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -193,36 +193,34 @@
 	var/list/air_vent_info = list()
 	var/list/air_scrub_info = list()
 
-/obj/machinery/airalarm/New(loc, ndir, nbuild)
-	..()
+/obj/machinery/airalarm/Initialize(mapload, ndir, nbuild)
+	. = ..()
 	wires = new /datum/wires/airalarm(src)
+	
 	if(ndir)
 		setDir(ndir)
-
+		
 	if(nbuild)
 		buildstage = 0
 		panel_open = TRUE
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
 		pixel_y = (dir & 3)? (dir == 1 ? -24 : 24) : 0
-		update_icon()
-
+		
 	if(name == initial(name))
 		name = "[get_area_name(src)] Air Alarm"
+		
+	power_change()
+	set_frequency(frequency)
 
 /obj/machinery/airalarm/Destroy()
 	SSradio.remove_object(src, frequency)
 	qdel(wires)
 	wires = null
 	return ..()
-
-/obj/machinery/airalarm/Initialize(mapload)
-	. = ..()
-	if(!mapload)
-		return
-	power_change()
-	set_frequency(frequency)
-	update_icon()
-
+		
+/obj/machinery/airalarm/on_construction()
+	..(dir,dir)
+	
 /obj/machinery/airalarm/examine(mob/user)
 	. = ..()
 	switch(buildstage)
@@ -436,7 +434,6 @@
 			. = TRUE
 	update_icon()
 
-
 /obj/machinery/airalarm/proc/reset(wire)
 	switch(wire)
 		if(WIRE_POWER)