New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00
parent e7df2bc14a
commit bcab389ca2
69 changed files with 358 additions and 245 deletions
@@ -52,8 +52,8 @@
 		"toxin"
 	)

-/obj/machinery/chem_dispenser/New()
-	..()
+/obj/machinery/chem_dispenser/Initialize()
+	. = ..()
 	recharge()
 	dispensable_reagents = sortList(dispensable_reagents)

@@ -244,8 +244,8 @@
 		)
 	)

-/obj/machinery/chem_dispenser/constructable/New()
-	..()
+/obj/machinery/chem_dispenser/constructable/Initialize()
+	. = ..()
 	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/chem_dispenser(null)
 	B.apply_default_parts(src)

@@ -12,8 +12,8 @@
 	var/heater_coefficient = 0.10
 	var/on = FALSE

-/obj/machinery/chem_heater/New()
-	..()
+/obj/machinery/chem_heater/Initialize()
+	. = ..()
 	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/chem_heater(null)
 	B.apply_default_parts(src)

@@ -17,12 +17,12 @@
 	var/useramount = 30 // Last used amount
 	layer = BELOW_OBJ_LAYER

-/obj/machinery/chem_master/New()
+/obj/machinery/chem_master/Initialize()
 	create_reagents(100)
 	add_overlay("waitlight")
 	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/chem_master(null)
 	B.apply_default_parts(src)
-	..()
+	. = ..()

 /obj/item/weapon/circuitboard/machine/chem_master
 	name = "ChemMaster 3000 (Machine Board)"
@@ -13,8 +13,8 @@
 	var/wait = null
 	var/obj/item/weapon/reagent_containers/beaker = null

-/obj/machinery/computer/pandemic/New()
-	..()
+/obj/machinery/computer/pandemic/Initialize()
+	. = ..()
 	update_icon()

 /obj/machinery/computer/pandemic/proc/GetVirusByIndex(index)
@@ -89,10 +89,9 @@

 		var/list/holdingitems = list()

-/obj/machinery/reagentgrinder/New()
-	..()
+/obj/machinery/reagentgrinder/Initialize()
+	. = ..()
 	beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src)
-	return

 /obj/machinery/reagentgrinder/Destroy()
 	if(beaker)