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

This commit is contained in:
CitadelStationBot
2017-04-26 17:15:48 -05:00
parent e7df2bc14a
commit bcab389ca2
69 changed files with 358 additions and 245 deletions
@@ -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)