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)
@@ -12,9 +12,9 @@
 	var/disease_amount = 20
 	var/spillable = 0

-/obj/item/weapon/reagent_containers/New(location, vol = 0)
-	..()
-	if (isnum(vol) && vol > 0)
+/obj/item/weapon/reagent_containers/Initialize(mapload, vol)
+	. = ..()
+	if(isnum(vol) && vol > 0)
 		volume = vol
 	create_reagents(volume)
 	if(spawned_disease)
@@ -7,8 +7,8 @@
 	var/blood_type = null
 	var/labelled = 0

-/obj/item/weapon/reagent_containers/blood/New()
-	..()
+/obj/item/weapon/reagent_containers/blood/Initialize()
+	. = ..()
 	if(blood_type != null)
 		reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
 		update_icon()
@@ -43,9 +43,9 @@
 		if(51 to INFINITY)
 			icon_state = "full"

-/obj/item/weapon/reagent_containers/blood/random/New()
+/obj/item/weapon/reagent_containers/blood/random/Initialize()
 	blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L")
-	..()
+	. = ..()

 /obj/item/weapon/reagent_containers/blood/APlus
 	blood_type = "A+"
@@ -30,8 +30,8 @@ Borg Hypospray
 								//Used as list for input() in shakers.


-/obj/item/weapon/reagent_containers/borghypo/New()
-	..()
+/obj/item/weapon/reagent_containers/borghypo/Initialize()
+	. = ..()

 	for(var/R in reagent_ids)
 		add_reagent(R)
@@ -9,8 +9,8 @@
 	volume = 30


-/obj/item/weapon/reagent_containers/glass/bottle/New()
-	..()
+/obj/item/weapon/reagent_containers/glass/bottle/Initialize()
+	. = ..()
 	if(!icon_state)
 		icon_state = "bottle"
 	update_icon()
@@ -139,8 +139,8 @@
 	icon_state = "bottle16"
 	var/extra_reagent = null

-/obj/item/weapon/reagent_containers/glass/bottle/traitor/New()
-	..()
+/obj/item/weapon/reagent_containers/glass/bottle/traitor/Initialize()
+	. = ..()
 	extra_reagent = pick("polonium", "histamine", "formaldehyde", "venom", "neurotoxin2", "cyanide")
 	reagents.add_reagent("[extra_reagent]", 3)

@@ -122,8 +122,8 @@
 	item_state = "beaker"
 	materials = list(MAT_GLASS=500)

-/obj/item/weapon/reagent_containers/glass/beaker/New()
-	..()
+/obj/item/weapon/reagent_containers/glass/beaker/Initialize()
+	. = ..()
 	update_icon()

 /obj/item/weapon/reagent_containers/glass/beaker/on_reagent_change()
@@ -176,8 +176,8 @@
 	origin_tech = "materials=2;engineering=3;plasmatech=3"
 	flags = OPENCONTAINER

-/obj/item/weapon/reagent_containers/glass/beaker/noreact/New()
-	..()
+/obj/item/weapon/reagent_containers/glass/beaker/noreact/Initialize()
+	. = ..()
 	reagents.set_reacting(FALSE)

 /obj/item/weapon/reagent_containers/glass/beaker/bluespace
@@ -11,8 +11,8 @@
 	var/roundstart = 0
 	var/self_delay = 0 //pills are instant, this is because patches inheret their aplication from pills

-/obj/item/weapon/reagent_containers/pill/New()
-	..()
+/obj/item/weapon/reagent_containers/pill/Initialize()
+	. = ..()
 	if(!icon_state)
 		icon_state = "pill[rand(1,20)]"
 	if(reagents.total_volume && roundstart)
@@ -16,8 +16,8 @@
 	materials = list(MAT_METAL=10, MAT_GLASS=20)
 	container_type = TRANSPARENT

-/obj/item/weapon/reagent_containers/syringe/New()
-	..()
+/obj/item/weapon/reagent_containers/syringe/Initialize()
+	. = ..()
 	if(list_reagents) //syringe starts in inject mode if its already got something inside
 		mode = SYRINGE_INJECT
 		update_icon()
@@ -242,7 +242,7 @@
 	volume = 20
 	origin_tech = "materials=3;engineering=3"

-/obj/item/weapon/reagent_containers/syringe/noreact/New()
+/obj/item/weapon/reagent_containers/syringe/noreact/Initialize()
 	. = ..()
 	reagents.set_reacting(FALSE)

@@ -23,10 +23,10 @@
 	else
 		return ..()

-/obj/structure/reagent_dispensers/New()
+/obj/structure/reagent_dispensers/Initialize()
 	create_reagents(tank_volume)
 	reagents.add_reagent(reagent_id, tank_volume)
-	..()
+	. = ..()

 /obj/structure/reagent_dispensers/examine(mob/user)
 	..()
@@ -129,8 +129,8 @@
 	density = 0
 	reagent_id = "condensedcapsaicin"

-/obj/structure/reagent_dispensers/peppertank/New()
-	..()
+/obj/structure/reagent_dispensers/peppertank/Initialize()
+	. = ..()
 	if(prob(1))
 		desc = "IT'S PEPPER TIME, BITCH!"