/obj/item/reagent_container is Initialize (ParadiseSS13#18555)

simb11 · Aug 5, 2022 · e639b8a · e639b8a
1 parent bad1ec7
commit e639b8a
Show file tree

Hide file tree

Showing 24 changed files with 96 additions and 93 deletions.
diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
@@ -23,8 +23,8 @@
 	name = "pill"
 	desc = "A cocktail of illicit designer drugs, who knows what might be in here."
 
-/obj/item/reagent_containers/food/pill/random_drugs/New()
-	..()
+/obj/item/reagent_containers/food/pill/random_drugs/Initialize(mapload)
+	. = ..()
 	icon_state = "pill" + pick("2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20")
 
 	name = "[pick_list("chemistry_tools.json", "CYBERPUNK_drug_prefixes")] [pick_list("chemistry_tools.json", "CYBERPUNK_drug_suffixes")]"

diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
@@ -45,8 +45,8 @@
 	name = "unlabelled bottle"
 	//	identify_probability = 0
 
-/obj/item/reagent_containers/glass/bottle/random_reagent/New()
-	..()
+/obj/item/reagent_containers/glass/bottle/random_reagent/Initialize(mapload)
+	. = ..()
 	var/list/possible_chems = GLOB.chemical_reagents_list.Copy()
 	possible_chems -= GLOB.blocked_chems.Copy()
 	var/datum/reagent/R = pick(possible_chems)
@@ -62,8 +62,8 @@
 	name = "unlabelled chemical bottle"
 	//	identify_probability = 0
 
-/obj/item/reagent_containers/glass/bottle/random_chem/New()
-	..()
+/obj/item/reagent_containers/glass/bottle/random_chem/Initialize(mapload)
+	. = ..()
 	var/R = get_random_reagent_id()
 	if(GLOB.rare_chemicals.Find(R))
 		reagents.add_reagent(R, 10)
@@ -77,8 +77,8 @@
 	name = "unlabelled chemical bottle"
 	//	identify_probability = 0
 
-/obj/item/reagent_containers/glass/bottle/random_base_chem/New()
-	..()
+/obj/item/reagent_containers/glass/bottle/random_base_chem/Initialize(mapload)
+	. = ..()
 	var/datum/reagent/R = pick(GLOB.base_chemicals)
 	reagents.add_reagent(R, rand(2, 6)*5)
 	name = "unlabelled bottle"
@@ -89,8 +89,8 @@
 	name = "unlabelled drink"
 	icon = 'icons/obj/drinks.dmi'
 
-/obj/item/reagent_containers/food/drinks/bottle/random_drink/New()
-	..()
+/obj/item/reagent_containers/food/drinks/bottle/random_drink/Initialize(mapload)
+	. = ..()
 	var/list/possible_drinks = GLOB.drinks.Copy()
 	if(prob(50))
 		possible_drinks += list("pancuronium","lsd","omnizine","blood")
@@ -106,8 +106,8 @@
 	name = "unlabelled drink?"
 	icon = 'icons/obj/drinks.dmi'
 
-/obj/item/reagent_containers/food/drinks/bottle/random_reagent/New()
-	..()
+/obj/item/reagent_containers/food/drinks/bottle/random_reagent/Initialize(mapload)
+	. = ..()
 
 	var/R = get_random_reagent_id()
 	if(GLOB.rare_chemicals.Find(R))

diff --git a/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm b/code/modules/awaymissions/mission_code/UO71-terrorspiders.dm
@@ -204,8 +204,8 @@
 /obj/item/reagent_containers/glass/beaker/terror_black_toxin
 	name = "beaker 'Black Terror Venom'"
 
-/obj/item/reagent_containers/glass/beaker/terror_black_toxin/New()
-	..()
+/obj/item/reagent_containers/glass/beaker/terror_black_toxin/Initialize(mapload)
+	. = ..()
 	reagents.add_reagent("terror_black_toxin", 50)
 	update_icon()
 

diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
@@ -80,24 +80,24 @@
 	icon = 'icons/obj/food/seafood.dmi'
 	icon_state = "shrimp_raw"
 	filling_color = "#FF1C1C"
+	bitesize = 1
 
-/obj/item/reagent_containers/food/snacks/shrimp/New()
-	..()
+/obj/item/reagent_containers/food/snacks/shrimp/Initialize(mapload)
+	. = ..()
 	desc = pick("Anyway, like I was sayin', shrimp is the fruit of the sea.", "You can barbecue it, boil it, broil it, bake it, saute it.")
 	reagents.add_reagent("protein", 1)
-	src.bitesize = 1
 
 /obj/item/reagent_containers/food/snacks/feederfish
 	name = "feeder fish"
 	desc = "A tiny feeder fish. Sure doesn't look very filling..."
 	icon = 'icons/obj/food/seafood.dmi'
 	icon_state = "feederfish"
 	filling_color = "#FF1C1C"
+	bitesize = 1
 
-/obj/item/reagent_containers/food/snacks/shrimp/New()
-	..()
+/obj/item/reagent_containers/food/snacks/feederfish/Initialize(mapload)
+	. = ..()
 	reagents.add_reagent("protein", 1)
-	src.bitesize = 1
 
 /obj/item/fish
 	name = "fish"
@@ -117,9 +117,9 @@
 	desc = "A small bio-luminescent fish. Not very bright, but at least it's pretty!"
 	icon_state = "glofish"
 
-/obj/item/fish/glofish/New()
-	..()
-	set_light(2,1,"#99FF66")
+/obj/item/fish/glofish/Initialize(mapload)
+	. = ..()
+	set_light(2, 1, "#99FF66")
 
 /obj/item/fish/electric_eel
 	name = "electric eel"
@@ -157,8 +157,8 @@
 	throwforce = 5.0
 	materials = list()
 
-/obj/item/shard/shark_teeth/New()
-	..()
+/obj/item/shard/shark_teeth/Initialize(mapload)
+	. = ..()
 	src.pixel_x = rand(-5,5)
 	src.pixel_y = rand(-5,5)
 

diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -14,8 +14,8 @@
 	antable = FALSE
 	var/chugging = FALSE
 
-/obj/item/reagent_containers/food/drinks/New()
-	..()
+/obj/item/reagent_containers/food/drinks/Initialize(mapload)
+	. = ..()
 	pixel_x = rand(-5, 5)
 	pixel_y = rand(-5, 5)
 	bitesize = amount_per_transfer_from_this
@@ -191,8 +191,8 @@
 	item_state = "coffee"
 	list_reagents = list("tea" = 30)
 
-/obj/item/reagent_containers/food/drinks/tea/New()
-	..()
+/obj/item/reagent_containers/food/drinks/tea/Initialize(mapload)
+	. = ..()
 	if(prob(20))
 		reagents.add_reagent("mugwort", 3)
 
@@ -232,8 +232,8 @@
 	item_state = "ramen"
 	list_reagents = list("dry_ramen" = 30)
 
-/obj/item/reagent_containers/food/drinks/dry_ramen/New()
-	..()
+/obj/item/reagent_containers/food/drinks/dry_ramen/Initialize(mapload)
+	. = ..()
 	if(prob(20))
 		reagents.add_reagent("enzyme", 3)
 

diff --git a/code/modules/food_and_drinks/drinks/drinks/mugs.dm b/code/modules/food_and_drinks/drinks/drinks/mugs.dm
@@ -86,8 +86,8 @@
 	description = "So mesmerizing!"
 	state = "mug_rainbow"
 
-/obj/item/reagent_containers/food/drinks/mug/New()
-	..()
+/obj/item/reagent_containers/food/drinks/mug/Initialize(mapload)
+	. = ..()
 	if(preset)
 		return
 	if(novelty)

diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -304,8 +304,8 @@
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
 	tastes = list("pie" = 1, "mushroom" = 1)
 
-/obj/item/reagent_containers/food/snacks/plump_pie/New()
-	..()
+/obj/item/reagent_containers/food/snacks/plump_pie/Initialize(mapload)
+	. = ..()
 	if(prob(10))
 		name = "exceptional plump pie"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" // What
@@ -375,8 +375,8 @@
 	var/donut_sprite_type = DONUT_NORMAL
 	tastes = list("donut" = 1)
 
-/obj/item/reagent_containers/food/snacks/donut/New()
-	..()
+/obj/item/reagent_containers/food/snacks/donut/Initialize(mapload)
+	. = ..()
 	if(randomized_sprinkles && prob(30))
 		icon_state = "donut2"
 		name = "frosted donut"
@@ -398,8 +398,8 @@
 	bitesize = 10
 	tastes = list("donut" = 3, "chaos" = 1)
 
-/obj/item/reagent_containers/food/snacks/donut/chaos/New()
-	..()
+/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize(mapload)
+	. = ..()
 	extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
 	reagents.add_reagent("[extra_reagent]", 3)
 	if(prob(30))
@@ -415,8 +415,8 @@
 	extra_reagent = "berryjuice"
 	tastes = list("jelly" = 1, "donut" = 3)
 
-/obj/item/reagent_containers/food/snacks/donut/jelly/New()
-	..()
+/obj/item/reagent_containers/food/snacks/donut/jelly/Initialize(mapload)
+	. = ..()
 	if(extra_reagent)
 		reagents.add_reagent("[extra_reagent]", 3)
 	if(prob(30))
@@ -500,8 +500,8 @@
 	list_reagents = list("nutriment" = 5)
 	tastes = list("mushroom" = 1, "biscuit" = 1)
 
-/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/New()
-	..()
+/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize(mapload)
+	. = ..()
 	if(prob(10))
 		name = "exceptional plump helmet biscuit"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" // Is this a reference?

diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm
@@ -55,8 +55,8 @@
 	filling_color = "#7D5F46"
 	list_reagents = list("nutriment" = 3, "sugar" = 3)
 
-/obj/item/reagent_containers/food/snacks/candy/taffy/New()
-	..()
+/obj/item/reagent_containers/food/snacks/candy/taffy/Initialize(mapload)
+	. = ..()
 	icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5")
 
 /obj/item/reagent_containers/food/snacks/candy/fudge

diff --git a/code/modules/food_and_drinks/food/foods/desserts.dm b/code/modules/food_and_drinks/food/foods/desserts.dm
@@ -12,8 +12,8 @@
 	list_reagents = list("nutriment" = 1, "sugar" = 1)
 	tastes = list("ice cream" = 1)
 
-/obj/item/reagent_containers/food/snacks/icecream/New()
-	..()
+/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload)
+	. = ..()
 	update_icon(UPDATE_OVERLAYS)
 
 /obj/item/reagent_containers/food/snacks/icecream/update_overlays()

diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -192,10 +192,14 @@
 	list_reagents = list("nutriment" = 4, "porktonium" = 10)
 	tastes = list("bacon" = 1)
 
-/obj/item/reagent_containers/food/snacks/telebacon/New()
-	..()
+/obj/item/reagent_containers/food/snacks/telebacon/Initialize(mapload)
+	. = ..()
 	baconbeacon = new /obj/item/radio/beacon/bacon(src)
 
+/obj/item/reagent_containers/food/snacks/telebacon/Destroy()
+	QDEL_NULL(baconbeacon)
+	return ..()
+
 /obj/item/reagent_containers/food/snacks/telebacon/On_Consume(mob/M, mob/user)
 	if(!reagents.total_volume)
 		baconbeacon.forceMove(user)
@@ -408,8 +412,8 @@
 /obj/item/reagent_containers/food/snacks/egg/gland
 	desc = "An egg! It looks weird..."
 
-/obj/item/reagent_containers/food/snacks/egg/gland/New()
-	..()
+/obj/item/reagent_containers/food/snacks/egg/gland/Initialize(mapload)
+	. = ..()
 	reagents.add_reagent(get_random_reagent_id(), 15)
 
 	var/reagent_color = mix_color_from_reagents(reagents.reagent_list)

diff --git a/code/modules/food_and_drinks/food/foods/misc.dm b/code/modules/food_and_drinks/food/foods/misc.dm
@@ -164,8 +164,8 @@
 	list_reagents = list("nutriment" = 2)
 	tastes = list("popcorn" = 3, "butter" = 1)
 
-/obj/item/reagent_containers/food/snacks/popcorn/New()
-	..()
+/obj/item/reagent_containers/food/snacks/popcorn/Initialize(mapload)
+	. = ..()
 	unpopped = rand(1,10)
 
 /obj/item/reagent_containers/food/snacks/popcorn/On_Consume(mob/M, mob/user)

diff --git a/code/modules/food_and_drinks/food/foods/soups.dm b/code/modules/food_and_drinks/food/foods/soups.dm
@@ -68,8 +68,8 @@
 	list_reagents = list("nutriment" = 6)
 	tastes = list("chaos" = 1)
 
-/obj/item/reagent_containers/food/snacks/soup/mysterysoup/New()
-	..()
+/obj/item/reagent_containers/food/snacks/soup/mysterysoup/Initialize(mapload)
+	. = ..()
 	extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine")
 	reagents.add_reagent("[extra_reagent]", 5)
 
@@ -81,8 +81,8 @@
 	list_reagents = list("water" = 10)
 	tastes = list("wishes" = 1)
 
-/obj/item/reagent_containers/food/snacks/soup/wishsoup/New()
-	..()
+/obj/item/reagent_containers/food/snacks/soup/wishsoup/Initialize(mapload)
+	. = ..()
 	if(prob(25))
 		desc = "A wish come true!" // hue
 		reagents.add_reagent("nutriment", 9)
@@ -119,8 +119,8 @@
 	list_reagents = list("nutriment" = 7, "vitamin" = 2)
 	tastes = list("beet" = 1)
 
-/obj/item/reagent_containers/food/snacks/soup/beetsoup/New()
-	..()
+/obj/item/reagent_containers/food/snacks/soup/beetsoup/Initialize(mapload)
+	. = ..()
 	name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht")
 
 

diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
@@ -275,11 +275,11 @@
 	filling_color = "#211F02"
 	list_reagents = list("????" = 30)
 
-/obj/item/reagent_containers/food/snacks/badrecipe/New()
-	..()
+/obj/item/reagent_containers/food/snacks/badrecipe/Initialize(mapload)
+	. = ..()
 	// it's burned! it should start off being classed as any cooktype that burns
-	cooktype["grilled"] = 1
-	cooktype["deep fried"] = 1
+	cooktype["grilled"] = TRUE
+	cooktype["deep fried"] = TRUE
 
 // MISC
 

diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
@@ -158,7 +158,7 @@
 			setRegents(I, newfood)
 		if(istype(I, /obj/item/reagent_containers/food/snacks))
 			setCooked(I, newfood)
-		newfood.cooktype[thiscooktype] = 1
+		newfood.cooktype[thiscooktype] = TRUE
 		turnoff(I)
 		//qdel(I)
 

diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm
@@ -11,8 +11,8 @@
 	list_reagents = list("honey" = 5)
 	var/honey_color = ""
 
-/obj/item/reagent_containers/honeycomb/New()
-	..()
+/obj/item/reagent_containers/honeycomb/Initialize(mapload)
+	. = ..()
 	pixel_x = rand(8,-8)
 	pixel_y = rand(8,-8)
 	update_icon(UPDATE_OVERLAYS)

diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
@@ -18,8 +18,8 @@
 	resistance_flags = FLAMMABLE
 	origin_tech = "biotech=1"
 
-/obj/item/reagent_containers/food/snacks/grown/New(newloc, obj/item/seeds/new_seed = null)
-	..()
+/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, obj/item/seeds/new_seed = null)
+	. = ..()
 	if(!tastes)
 		tastes = list("[name]" = 1)
 
@@ -38,7 +38,7 @@
 
 	if(seed)
 		for(var/datum/plant_gene/trait/T in seed.genes)
-			T.on_new(src, newloc)
+			T.on_new(src)
 		seed.prepare_result(src)
 		transform *= TRANSFORM_USING_VARIABLE(seed.potency, 100) + 0.5 //Makes the resulting produce's sprite larger or smaller based on potency!
 		add_juice()