Adds alot more initialize() part two

2025-02-26 09:04:50 +00:00 · 2017-11-12 10:56:33 +00:00
parent de0d93467e
commit 5294c48be1
28 changed files with 78 additions and 73 deletions
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -391,8 +391,8 @@
 	list_reagents = list("lemon_lime" = 30)
 	foodtype = FRUIT

-/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/New()
-	..()
+/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
+	. = ..()
 	name = "Lemon-Lime Soda"

 /obj/item/reagent_containers/food/drinks/soda_cans/space_up
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -235,8 +235,8 @@
 	icon_state = "absinthebottle"
 	list_reagents = list("absinthe" = 100)

-/obj/item/reagent_containers/food/drinks/bottle/absinthe/New()
-	..()
+/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
+	. = ..()
 	redact()

 /obj/item/reagent_containers/food/drinks/bottle/absinthe/proc/redact()
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -74,8 +74,8 @@
 		desc = "A shot glass - the universal symbol for bad decisions."
 		return

-/obj/item/reagent_containers/food/drinks/drinkingglass/filled/New()
-	..()
+/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize()
+	. = ..()
 	on_reagent_change()

 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -276,8 +276,8 @@
 	icon = 'icons/obj/food/soupsalad.dmi'
 	icon_state = "wishsoup"

-/obj/item/reagent_containers/food/snacks/customizable/soup/New()
-	..()
+/obj/item/reagent_containers/food/snacks/customizable/soup/Initialize()
+	. = ..()
 	eatverb = pick("slurp","sip","suck","inhale","drink")


--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -315,8 +315,8 @@
 //	name = "Xenoburger"													//Name that displays in the UI.
 //	desc = "Smells caustic. Tastes like heresy."						//Duh
 //	icon_state = "xburger"												//Refers to an icon in food.dmi
-///obj/item/reagent_containers/food/snacks/xenoburger/New()		//Don't mess with this.
-//		..()															//Same here.
+///obj/item/reagent_containers/food/snacks/xenoburger/Initialize()		//Don't mess with this. | nO I WILL MESS WITH THIS
+//		. = ..()														//Same here.
 //		reagents.add_reagent("xenomicrobes", 10)						//This is what is in the food item. you may copy/paste
 //		reagents.add_reagent("nutriment", 2)							//this line of code for all the contents.
 //		bitesize = 3													//This is the amount each bite consumes.
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -66,8 +66,8 @@
 	tastes = list("popcorn" = 3, "butter" = 1)
 	foodtype = JUNKFOOD

-/obj/item/reagent_containers/food/snacks/popcorn/New()
-	..()
+/obj/item/reagent_containers/food/snacks/popcorn/Initialize()
+	. = ..()
 	eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp")

 /obj/item/reagent_containers/food/snacks/loadedbakedpotato
@@ -447,8 +447,8 @@
 	tastes = list("candy" = 1)
 	foodtype = JUNKFOOD | SUGAR

-/obj/item/reagent_containers/food/snacks/lollipop/New()
-	..()
+/obj/item/reagent_containers/food/snacks/lollipop/Initialize()
+	. = ..()
 	head = mutable_appearance('icons/obj/lollipop.dmi', "lollipop_head")
 	change_head_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255)))

@@ -466,8 +466,8 @@
 /obj/item/reagent_containers/food/snacks/lollipop/cyborg
 	var/spamchecking = TRUE

-/obj/item/reagent_containers/food/snacks/lollipop/cyborg/New()
-	..()
+/obj/item/reagent_containers/food/snacks/lollipop/cyborg/Initialize()
+	. = ..()
 	addtimer(CALLBACK(src, .proc/spamcheck), 1200)

 /obj/item/reagent_containers/food/snacks/lollipop/cyborg/equipped(mob/living/user, slot)
@@ -487,15 +487,15 @@
 	tastes = list("candy")
 	foodtype = JUNKFOOD

-/obj/item/reagent_containers/food/snacks/gumball/New()
-	..()
+/obj/item/reagent_containers/food/snacks/gumball/Initialize()
+	. = ..()
 	color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))

 /obj/item/reagent_containers/food/snacks/gumball/cyborg
 	var/spamchecking = TRUE

-/obj/item/reagent_containers/food/snacks/gumball/cyborg/New()
-	..()
+/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize()
+	. = ..()
 	addtimer(CALLBACK(src, .proc/spamcheck), 1200)

 /obj/item/reagent_containers/food/snacks/gumball/cyborg/equipped(mob/living/user, slot)
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -112,13 +112,13 @@
 	foodtype = GRAIN | VEGETABLES


-/obj/item/reagent_containers/food/snacks/pie/plump_pie/New()
+/obj/item/reagent_containers/food/snacks/pie/plump_pie/Initialize()
+	. = ..()
 	var/fey = prob(10)
 	if(fey)
 		name = "exceptional plump pie"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
 		bonus_reagents = list("nutriment" = 1, "omnizine" = 5, "vitamin" = 4)
-	..()
 	if(fey)
 		reagents.add_reagent("omnizine", 5)

--- a/code/modules/food_and_drinks/food/snacks_salad.dm
+++ b/code/modules/food_and_drinks/food/snacks_salad.dm
@@ -9,9 +9,9 @@
 	tastes = list("leaves" = 1)
 	foodtype = VEGETABLES

-/obj/item/reagent_containers/food/snacks/salad/New()
-	..()
-	eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp")
+/obj/item/reagent_containers/food/snacks/salad/Initialize()
+	. = ..()
+	eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") //who the fuck gnaws and devours on a salad

 /obj/item/reagent_containers/food/snacks/salad/aesirsalad
 	name = "\improper Aesir salad"
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -8,8 +8,8 @@
 	tastes = list("tasteless soup" = 1)
 	foodtype = VEGETABLES

-/obj/item/reagent_containers/food/snacks/soup/New()
-	..()
+/obj/item/reagent_containers/food/snacks/soup/Initialize()
+	. = ..()
 	eatverb = pick("slurp","sip","suck","inhale","drink")

 /obj/item/reagent_containers/food/snacks/soup/wish
@@ -19,12 +19,12 @@
 	list_reagents = list("water" = 10)
 	tastes = list("wishes" = 1)

-/obj/item/reagent_containers/food/snacks/soup/wish/New()
+/obj/item/reagent_containers/food/snacks/soup/wish/Initialize()
+	. = ..()
 	var/wish_true = prob(25)
 	if(wish_true)
 		desc = "A wish come true!"
 		bonus_reagents = list("nutriment" = 9, "vitamin" = 1)
-	..()
 	if(wish_true)
 		reagents.add_reagent("nutriment", 9)
 		reagents.add_reagent("vitamin", 1)
@@ -99,10 +99,10 @@
 	list_reagents = list("nutriment" = 6)
 	tastes = list("chaos" = 1)

-/obj/item/reagent_containers/food/snacks/soup/mystery/New()
+/obj/item/reagent_containers/food/snacks/soup/mystery/Initialize()
+	. = ..()
 	extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine")
 	bonus_reagents = list("[extra_reagent]" = 5, "nutriment" = 6)
-	..()
 	reagents.add_reagent("[extra_reagent]", 5)

 /obj/item/reagent_containers/food/snacks/soup/hotchili
@@ -173,8 +173,8 @@
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
 	foodtype = VEGETABLES

-/obj/item/reagent_containers/food/snacks/soup/beet/New()
-	..()
+/obj/item/reagent_containers/food/snacks/soup/beet/Initialize()
+	. = ..()
 	name = pick("borsch","bortsch","borstch","borsh","borshch","borscht")
 	tastes = list(name = 1)

--- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
@@ -166,8 +166,8 @@
 		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 			break

-/obj/structure/closet/crate/juice/Initialize()
-	. = ..()
+/obj/structure/closet/crate/juice/PopulateContents()
+	..()
 	new /obj/machinery/juicer(src)
 	new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
 	new /obj/item/reagent_containers/food/snacks/grown/carrot(src)
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -31,8 +31,9 @@
 	var/const/BOMB_TIMER_MAX = 10

 /obj/item/pizzabox/Initialize()
-	update_icon()
 	. = ..()
+	update_icon()
+	

 /obj/item/pizzabox/Destroy()
 	unprocess()
@@ -260,28 +261,30 @@
 	update_icon()

 /obj/item/pizzabox/bomb/Initialize()
+	. = ..()
 	var/randompizza = pick(subtypesof(/obj/item/reagent_containers/food/snacks/pizza))
 	pizza = new randompizza(src)
 	bomb = new(src)
 	wires = new /datum/wires/explosive/pizza(src)
-	. = ..()

 /obj/item/pizzabox/margherita/Initialize()
+	. = ..()
 	pizza = new /obj/item/reagent_containers/food/snacks/pizza/margherita(src)
 	boxtag = "Margherita Deluxe"
-	. = ..()
+

 /obj/item/pizzabox/vegetable/Initialize()
+	. = ..()
 	pizza = new /obj/item/reagent_containers/food/snacks/pizza/vegetable(src)
 	boxtag = "Gourmet Vegatable"
-	. = ..()
+

 /obj/item/pizzabox/mushroom/Initialize()
+	. = ..()
 	pizza = new /obj/item/reagent_containers/food/snacks/pizza/mushroom(src)
 	boxtag = "Mushroom Special"
-	. = ..()

 /obj/item/pizzabox/meat/Initialize()
+	. = ..()
 	pizza = new /obj/item/reagent_containers/food/snacks/pizza/meat(src)
 	boxtag = "Meatlover's Supreme"
-	. = ..()
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -43,8 +43,8 @@
 	..()

 /obj/item/holo/esword/Initialize()
-	item_color = pick("red","blue","green","purple")
 	. = ..()
+	item_color = pick("red","blue","green","purple")

 /obj/item/holo/esword/attack_self(mob/living/user as mob)
 	active = !active
--- a/code/modules/hydroponics/grown/random.dm
+++ b/code/modules/hydroponics/grown/random.dm
@@ -13,8 +13,8 @@
 	growthstages = 4

 /obj/item/seeds/random/Initialize()
-	randomize_stats()
 	. = ..()
+	randomize_stats()
 	if(prob(60))
 		add_random_reagents()
 	if(prob(50))
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -35,8 +35,8 @@
 	var/weed_rate = 1 //If the chance below passes, then this many weeds sprout during growth
 	var/weed_chance = 5 //Percentage chance per tray update to grow weeds

-/obj/item/seeds/New(loc, nogenes = 0)
-	..()
+/obj/item/seeds/Initialize(loc, nogenes = 0)
+	. = ..()
 	pixel_x = rand(-8, 8)
 	pixel_y = rand(-8, 8)

--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -4,11 +4,11 @@
 	var/list/alien_powers = list()

 /obj/item/organ/alien/Initialize()
+	. = ..()
 	for(var/A in alien_powers)
 		if(ispath(A))
 			alien_powers -= A
 			alien_powers += new A(src)
-	. = ..()

 /obj/item/organ/alien/Insert(mob/living/carbon/M, special = 0)
 	..()
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
@@ -124,6 +124,7 @@
 	name = "nutrient sac"

 /obj/item/udder/gutlunch/Initialize()
+	. = ..()
 	reagents = new(50)
 	reagents.my_atom = src

--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -122,8 +122,8 @@
 	return ..()

 /obj/item/computer_hardware/hard_drive/Initialize()
-	install_default_programs()
 	. = ..()	
+	install_default_programs()


 /obj/item/computer_hardware/hard_drive/advanced
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -186,8 +186,8 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
 	var/virgin = 1

 /obj/structure/filingcabinet/employment/Initialize()
+	. = ..()	
 	GLOB.employmentCabinets += src
-	return ..()

 /obj/structure/filingcabinet/employment/Destroy()
 	GLOB.employmentCabinets -= src
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -182,11 +182,11 @@


 /obj/item/pen/sleepy/Initialize()
+	. = ..()	
 	create_reagents(45)
 	reagents.add_reagent("chloralhydrate2", 20)
 	reagents.add_reagent("mutetoxin", 15)
 	reagents.add_reagent("tirizene", 10)
-	. = ..()

 /*
 * (Alan) Edaggers
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -194,17 +194,18 @@
 	icon_state = "tube-empty"

 /obj/machinery/light/built/Initialize()
+	. = ..()	
 	status = LIGHT_EMPTY
 	update(0)
-	. = ..()

 /obj/machinery/light/small/built
 	icon_state = "bulb-empty"

 /obj/machinery/light/small/built/Initialize()
+	. = ..()
 	status = LIGHT_EMPTY
 	update(0)
-	. = ..()
+


 // create a new lighting fixture
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -19,8 +19,8 @@
 	var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect	//the visual effect appearing when the ammo is fired.


-/obj/item/ammo_casing/New()
-	..()
+/obj/item/ammo_casing/Initialize()
+	. = ..()
 	if(projectile_type)
 		BB = new projectile_type(src)
 	pixel_x = rand(-10, 10)
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -284,8 +284,8 @@
 	icon_state = "cshell"
 	projectile_type = /obj/item/projectile/bullet/dart

-/obj/item/ammo_casing/shotgun/dart/New()
-	..()
+/obj/item/ammo_casing/shotgun/dart/Initialize()
+	. = ..()
 	container_type |= OPENCONTAINER_1
 	create_reagents(30)
 	reagents.set_reacting(TRUE)
@@ -296,8 +296,8 @@
 /obj/item/ammo_casing/shotgun/dart/bioterror
 	desc = "A shotgun dart filled with deadly toxins."

-/obj/item/ammo_casing/shotgun/dart/bioterror/New()
-	..()
+/obj/item/ammo_casing/shotgun/dart/bioterror/Initialize()
+	. = ..()
 	reagents.add_reagent("neurotoxin", 6)
 	reagents.add_reagent("spore", 6)
 	reagents.add_reagent("mutetoxin", 6) //;HELP OPS IN MAINT
--- a/code/modules/projectiles/box_magazine.dm
+++ b/code/modules/projectiles/box_magazine.dm
@@ -22,8 +22,8 @@
 	var/multiload = 1
 	var/start_empty = 0

-/obj/item/ammo_box/New()
-	..()
+/obj/item/ammo_box/Initialize()
+	. = ..()
 	if(!start_empty)
 		for(var/i = 1, i <= max_ammo, i++)
 			stored_ammo += new ammo_type(src)
--- a/code/modules/projectiles/boxes_magazines/internal_mag.dm
+++ b/code/modules/projectiles/boxes_magazines/internal_mag.dm
@@ -156,9 +156,9 @@
 	max_ammo = 6
 	multiload = 0

-/obj/item/ammo_box/magazine/internal/rus357/New()
+/obj/item/ammo_box/magazine/internal/rus357/Initialize()
 	stored_ammo += new ammo_type(src)
-	..()
+	. = ..()

 /obj/item/ammo_box/magazine/internal/boltaction
 	name = "bolt action rifle internal magazine"
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -13,10 +13,10 @@

 	var/obj/item/device/transfer_valve/bomb

-/obj/item/gun/blastcannon/New()
+/obj/item/gun/blastcannon/Initialize()
+	. = ..()
 	if(!pin)
 		pin = new
-	return ..()

 /obj/item/gun/blastcannon/Destroy()
 	if(bomb)
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -73,9 +73,9 @@
 	var/impact_effect_type //what type of impact effect to show when hitting something
 	var/log_override = FALSE //is this type spammed enough to not log? (KAs)

-/obj/item/projectile/New()
+/obj/item/projectile/Initialize()
+	. = ..()
 	permutated = list()
-	return ..()

 /obj/item/projectile/proc/Range()
 	range--
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -341,8 +341,8 @@
 	icon_state = "banana"
 	range = 200

-/obj/item/projectile/bullet/honker/New()
-	..()
+/obj/item/projectile/bullet/honker/Initialize()
+	. = ..()
 	SpinAnimation()

 // Mime
@@ -364,8 +364,8 @@
 	damage = 6
 	var/piercing = FALSE

-/obj/item/projectile/bullet/dart/New()
-	..()
+/obj/item/projectile/bullet/dart/Initialize()
+	. = ..()
 	create_reagents(50)
 	reagents.set_reacting(FALSE)

@@ -388,8 +388,8 @@
 	reagents.handle_reactions()
 	return TRUE

-/obj/item/projectile/bullet/dart/metalfoam/New()
-	..()
+/obj/item/projectile/bullet/dart/metalfoam/Initialize()
+	. = ..()
 	reagents.add_reagent("aluminium", 15)
 	reagents.add_reagent("foaming_agent", 5)
 	reagents.add_reagent("facid", 5)
--- a/code/modules/vehicles/speedbike.dm
+++ b/code/modules/vehicles/speedbike.dm
@@ -10,7 +10,7 @@
 	. = ..()
 	riding_datum = new/datum/riding/space/speedbike

-/obj/vehicle/space/speedbike/New()
+/obj/vehicle/space/speedbike/Initialize()
 	. = ..()
 	overlay = overlay ||  mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
 	add_overlay(overlay)