New to init final (#17512)

* Initial

* some more

* next few

* only light left

* fix things up

* some rmore fixes

* guh

* Update ai_vr.dm

* comment

* lets try something

* .

* hmm

* .

* .

* hmm

* push that here

* fix layout

* grrr

code/modules/mob/living/simple_mob/overmap_mob_vr.dm

@@ -30,13 +30,9 @@
 	var/mob/living/simple_mob/vore/overmap/parent_mob_type
 	var/mob/living/simple_mob/vore/overmap/parent
 
-/obj/effect/overmap/visitable/simplemob/New(newloc, new_parent)
-	if(new_parent)
-		parent = new_parent
-	return ..()
-
-/obj/effect/overmap/visitable/simplemob/Initialize(mapload)
+/obj/effect/overmap/visitable/simplemob/Initialize(mapload, new_parent)
 	. = ..()
+	parent = new_parent
 	if(!parent_mob_type && !parent)
 		log_and_message_admins("An improperly configured OM mob event tried to spawn, and was deleted.")
 		return INITIALIZE_HINT_QDEL
@@ -140,13 +136,9 @@
 	var/om_child_type
 	var/shipvore = FALSE	//Enable this to allow the mob to eat spaceships by dragging them onto its sprite.
 
-/mob/living/simple_mob/vore/overmap/New(mapload, new_child)
-	if(new_child)
-		child_om_marker = new_child
-	return ..()
-
-/mob/living/simple_mob/vore/overmap/Initialize(mapload)
+/mob/living/simple_mob/vore/overmap/Initialize(mapload, new_child)
 	. = ..()
+	child_om_marker = new_child
 	if(!om_child_type)
 		log_and_message_admins("An improperly configured OM mob tried to spawn, and was deleted.")
 		return INITIALIZE_HINT_QDEL
@@ -174,13 +166,9 @@
 	var/mob/living/simple_mob/vore/overmap/parent_mob_type
 	var/mob/living/simple_mob/vore/overmap/parent
 
-/obj/effect/overmap/visitable/ship/simplemob/New(newloc, new_parent)
-	if(new_parent)
-		parent = new_parent
-	return ..()
-
-/obj/effect/overmap/visitable/ship/simplemob/Initialize(mapload)
+/obj/effect/overmap/visitable/ship/simplemob/Initialize(mapload, new_parent)
 	. = ..()
+	parent = new_parent
 	if(!parent_mob_type && !parent)
 		log_and_message_admins("An improperly configured OM mob event tried to spawn, and was deleted.")
 		return INITIALIZE_HINT_QDEL

code/modules/mob/living/simple_mob/sd_pets.dm

@@ -38,20 +38,16 @@
 	desc = "Don't make fun, they have a condition."
 	digestable = 0
 
-/mob/living/simple_mob/animal/passive/mouse/jerboa/leggy/New()
-	..()
-	name = initial(name)
-	desc = initial(desc)
+/mob/living/simple_mob/animal/passive/mouse/jerboa/leggy/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 /mob/living/simple_mob/animal/passive/mouse/brown/feivel
 	name = "Feivel"
 	desc = "Heading out west wasn't far enough, so he's going to space!"
 	digestable = 0
 
-/mob/living/simple_mob/animal/passive/mouse/brown/feivel/New()
-	..()
-	name = initial(name)
-	desc = initial(desc)
+/mob/living/simple_mob/animal/passive/mouse/brown/feivel/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 /mob/living/simple_mob/animal/passive/cat/jones
 	name = "Jones"

code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm

@@ -122,12 +122,12 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
 		if(prob(25))
 			L.adjustHalLoss(leech)
 
-/mob/living/simple_mob/vore/alienanimals/space_jellyfish/New(newloc, jellyfish)
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Initialize(mapload, jellyfish)
+	. = ..()
 	GLOB.jellyfish_count ++
 	var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/parent = jellyfish
 	if(parent)
 		parent.faction = faction
-	..()
 
 /mob/living/simple_mob/vore/alienanimals/space_jellyfish/death()
 	. = ..()
@@ -176,11 +176,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
 
 	var/inherited_nutriment = 0
 
-/obj/item/reagent_containers/food/snacks/jellyfishcore/New(newloc, inherit)
-	inherited_nutriment	= inherit
-	. = ..()
-
-/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize(mapload)
-	nutriment_amt += inherited_nutriment
+/obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize(mapload, inherit)
 	. = ..()
+	nutriment_amt += inherit
 	reagents.add_reagent(REAGENT_ID_NUTRIMENT, nutriment_amt, nutriment_desc)

code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm

@@ -687,7 +687,6 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 			var/nutrition_cost = 500 + (nutrition / 2)
 			adjust_nutrition(-nutrition_cost)
 			new /mob/living/simple_mob/vore/alienanimals/teppi(loc, src)
-			qdel(src)
 		else
 			visible_message("\The [src] whines pathetically...", runemessage = "whines")
 			if(prob(50))
@@ -762,13 +761,14 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 		return TRUE
 
 //Handles both growing up from a baby and also passing parent details to new babies.
-/mob/living/simple_mob/vore/alienanimals/teppi/New(newloc, teppi1, teppi2)
+/mob/living/simple_mob/vore/alienanimals/teppi/Initialize(mapload, teppi1, teppi2)
 	GLOB.teppi_count ++
 	if(teppi1 && !teppi2)
 		inherit_from_baby(teppi1)
+		qdel(teppi1)
 	else if (teppi1 && teppi2)
 		inherit_from_parents(teppi1, teppi2)
-	..()
+	. = ..()
 
 /mob/living/simple_mob/vore/alienanimals/teppi/Destroy()
 	GLOB.teppi_count --
@@ -1134,13 +1134,13 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 			return
 
 //This a teppi with funny colors will spawn!
-/mob/living/simple_mob/vore/alienanimals/teppi/mutant/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/mutant/Initialize(mapload)
 	teppi_mutate = TRUE
 	. = ..()
 
 //Custom teppi colors! For funzies.
 
-/mob/living/simple_mob/vore/alienanimals/teppi/cass/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/cass/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#c69c85"
 	marking_color = "#eeb698"
@@ -1151,7 +1151,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	horn_type =  "0"
 	. = ..()
 
-/mob/living/simple_mob/vore/alienanimals/teppi/baby/cass/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/baby/cass/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#c69c85"
 	marking_color = "#eeb698"
@@ -1162,7 +1162,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	horn_type =  "0"
 	. = ..()
 
-/mob/living/simple_mob/vore/alienanimals/teppi/aronai/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/aronai/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#404040"
 	marking_color = "#222222"
@@ -1173,7 +1173,7 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	horn_type = "1"
 	. = ..()
 
-/mob/living/simple_mob/vore/alienanimals/teppi/lira/New()
+/mob/living/simple_mob/vore/alienanimals/teppi/lira/Initialize(mapload)
 	inherit_colors = TRUE
 	color = "#fdfae9"
 	marking_color = "#ffffc0"

code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm

@@ -32,8 +32,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)	// How mant chickens DO we have?
 	var/eggsleft = 0
 	var/body_color
 
-/mob/living/simple_mob/animal/passive/chicken/New()
-	..()
+/mob/living/simple_mob/animal/passive/chicken/Initialize(mapload)
+	. = ..()
 	if(!body_color)
 		body_color = pick( list("brown","black","white") )
 	icon_state = "chicken_[body_color]"
@@ -132,8 +132,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)	// How mant chickens DO we have?
 
 	var/amount_grown = 0
 
-/mob/living/simple_mob/animal/passive/chick/New()
-	..()
+/mob/living/simple_mob/animal/passive/chick/Initialize(mapload)
+	. = ..()
 	pixel_x = rand(-6, 6)
 	pixel_y = rand(0, 10)
 

code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm

@@ -24,10 +24,11 @@
 
 	var/datum/reagents/udder = null
 
-/mob/living/simple_mob/animal/passive/cow/New()
+/mob/living/simple_mob/animal/passive/cow/Initialize(mapload)
+	. = ..()
+
 	udder = new(50)
 	udder.my_atom = src
-	..()
 
 /mob/living/simple_mob/animal/passive/cow/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	var/obj/item/reagent_containers/glass/G = O

code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm

@@ -27,10 +27,10 @@
 
 	var/datum/reagents/udder = null
 
-/mob/living/simple_mob/animal/goat/New()
+/mob/living/simple_mob/animal/goat/Initialize(mapload)
+	. = ..()
 	udder = new(50)
 	udder.my_atom = src
-	..()
 
 /mob/living/simple_mob/animal/goat/Life()
 	. = ..()

code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm

@@ -44,13 +44,13 @@
 
 	var/body_color //brown, gray, white and black, leave blank for random
 
-/mob/living/simple_mob/animal/passive/mouse/New()
-	..()
+/mob/living/simple_mob/animal/passive/mouse/Initialize(mapload, keep_parent_data)
+	. = ..()
 
 	add_verb(src, /mob/living/proc/ventcrawl)
 	add_verb(src, /mob/living/proc/hide)
 
-	if(name == initial(name))
+	if(!keep_parent_data && name == initial(name))
 		name = "[name] ([rand(1, 1000)])"
 	real_name = name
 
@@ -61,7 +61,7 @@
 	icon_living = "mouse_[body_color]"
 	icon_dead = "mouse_[body_color]_dead"
 	icon_rest = "mouse_[body_color]_sleep"
-	if (body_color != "rat")
+	if (!keep_parent_data && body_color != "rat")
 		desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
 		holder_type = /obj/item/holder/mouse/rat
 	if (body_color == "operative")
@@ -131,10 +131,8 @@
 	name = "Tom"
 	desc = "Jerry the cat is not amused."
 
-/mob/living/simple_mob/animal/passive/mouse/brown/Tom/New()
-	..()
-	// Change my name back, don't want to be named Tom (666)
-	name = initial(name)
+/mob/living/simple_mob/animal/passive/mouse/brown/Tom/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 /mob/living/simple_mob/animal/passive/mouse/black
 	body_color = "black"
@@ -184,10 +182,8 @@
 	name = "Agent Cheese"
 	desc = "I like my cheese Swiss... not American."
 
-/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese/New()
-	..()
-	// Change my name back, don't want to be named agent_cheese (666)
-	name = initial(name)
+/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese/Initialize(mapload)
+	. = ..(mapload, TRUE)
 
 // Mouse noises
 /datum/say_list/mouse

code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm

@@ -56,11 +56,8 @@
 	desc = "Dainty, well groomed and cared for, her eyes glitter with untold knowledge..."
 	gender = FEMALE
 
-/mob/living/simple_mob/animal/passive/mouse/white/apple/New()
-	..()
-	// Change my name back, don't want to be named Apple (666)
-	name = initial(name)
-	desc = initial(desc)
+/mob/living/simple_mob/animal/passive/mouse/white/apple/Initialize(mapload, keep_parent_data)
+	. = ..(mapload, TRUE)
 
 /obj/item/holder/mouse/attack_self(mob/living/carbon/user)
 	user.setClickCooldown(user.get_attack_speed())

code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm

@@ -212,7 +212,7 @@
 	icon_state = "sneksnakbox"
 	storage_slots = 7
 
-/obj/item/storage/box/snakesnackbox/New()
+/obj/item/storage/box/snakesnackbox/Initialize(mapload)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
@@ -220,4 +220,4 @@
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
 	new /obj/item/reagent_containers/food/snacks/snakesnack(src)
-	..()
+	. = ..()

code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm

@@ -19,17 +19,13 @@
 	var/prey_ooc_likes
 	var/prey_ooc_dislikes
 
-/mob/living/dominated_brain/New(loc, var/mob/living/pred, preyname, var/mob/living/prey)
-	. = ..()
+/mob/living/dominated_brain/Initialize(mapload, var/mob/living/pred, preyname, var/mob/living/prey)
 	prey_name = preyname
 	if(prey)
 		prey_body = prey
 	pred_body = pred
-
-/mob/living/dominated_brain/Initialize(mapload)
 	if(!isliving(loc))
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
 	. = ..()
 	lets_register_our_signals()
 	add_verb(src, /mob/living/dominated_brain/proc/resist_control)

code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm

@@ -341,7 +341,8 @@ GLOBAL_LIST_INIT(valid_random_lamias, list(
 ))
 
 /mob/living/simple_mob/vore/lamia/random
-/mob/living/simple_mob/vore/lamia/random/New()
+
+/mob/living/simple_mob/vore/lamia/random/Initialize(mapload)
 	var/mob/living/simple_mob/vore/lamia/new_attrs = pick(GLOB.valid_random_lamias)
 
 	name = initial(new_attrs.name)

code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm

@@ -312,23 +312,22 @@
 	var/prey_ckey
 
 
-/mob/living/simple_mob/vore/morph/dominated_prey/New(loc, pckey, parent, prey)
+/mob/living/simple_mob/vore/morph/dominated_prey/Initialize(mapload, pckey, parent, prey)
 	. = ..()
-	if(pckey)
-		prey_ckey = pckey
-		parent_morph = parent
-		prey_body = prey
-		prey_body.forceMove(get_turf(parent_morph))
-		prey_body.muffled = FALSE
-		prey_body.absorbed = FALSE
-		absorbed = TRUE
-		ckey = prey_ckey
-		prey_body.ckey = parent_morph.original_ckey
-		parent_morph.forceMove(src)
-		name = "[prey_body.name]"
-		to_chat(prey_body, span_notice("You have completely assumed the form of [prey_body]. Your form is now unable to change anymore until you restore control back to them. You can do this by 'ejecting' them from your [prey_body.vore_selected]. This will not actually release them from your body in this state, but instead return control to them, and restore you to your original form."))
-	else
-		qdel(src)
+	if(!pckey)
+		return INITIALIZE_HINT_QDEL
+	prey_ckey = pckey
+	parent_morph = parent
+	prey_body = prey
+	prey_body.forceMove(get_turf(parent_morph))
+	prey_body.muffled = FALSE
+	prey_body.absorbed = FALSE
+	absorbed = TRUE
+	ckey = prey_ckey
+	prey_body.ckey = parent_morph.original_ckey
+	parent_morph.forceMove(src)
+	name = "[prey_body.name]"
+	to_chat(prey_body, span_notice("You have completely assumed the form of [prey_body]. Your form is now unable to change anymore until you restore control back to them. You can do this by 'ejecting' them from your [prey_body.vore_selected]. This will not actually release them from your body in this state, but instead return control to them, and restore you to your original form."))
 
 /mob/living/simple_mob/vore/morph/dominated_prey/death(gibbed)
 	. = ..()

code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm

@@ -31,8 +31,8 @@
 
 	faction = FACTION_SUCCUBUS
 
-/mob/living/simple_mob/vore/succubus/New()
-	..()
+/mob/living/simple_mob/vore/succubus/Initialize(mapload)
+	. = ..()
 	if(random_skin)
 		icon_living = pick(skins)
 		icon_rest = "[icon_living]asleep"

code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm

@@ -38,8 +38,8 @@
 	pixel_y = 0
 	faction = FACTION_WOLFTAUR
 
-/mob/living/simple_mob/vore/wolftaur/New()
-	..()
+/mob/living/simple_mob/vore/wolftaur/Initialize(mapload)
+	. = ..()
 	if(random_skin)
 		icon_living = pick(skins)
 		icon_rest = "[icon_living]_rest"