[MIRROR] next new to init (#10524)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

modular_chomp/code/modules/clothing/gateway/gateway.dm

@@ -91,9 +91,9 @@
 			H.custom_pain("Your hands feel strange",1)
 	..()
 
-/obj/item/clothing/gloves/stamina/New()
+/obj/item/clothing/gloves/stamina/Initialize(mapload)
+	. = ..()
 	START_PROCESSING(SSobj, src)
-	..()
 
 /obj/item/clothing/gloves/stamina/Destroy()
 	STOP_PROCESSING(SSobj, src)

modular_chomp/code/modules/exploration/lootsafe.dm

@@ -102,8 +102,8 @@
 	hackguard = 5
 	codelen = 3
 
-/obj/structure/closet/crate/secure/lootsafe/numberlock/New()
-	..()
+/obj/structure/closet/crate/secure/lootsafe/numberlock/Initialize(mapload)
+	. = ..()
 	var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
 
 	for(var/i in 1 to codelen)
@@ -203,8 +203,8 @@
 	access = list(150)
 
 
-/obj/structure/closet/crate/secure/lootsafe/devillock/New()
-	..()
+/obj/structure/closet/crate/secure/lootsafe/devillock/Initialize(mapload)
+	. = ..()
 	var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z")
 
 	for(var/i in 1 to codelen)

modular_chomp/code/modules/exploration/tyr_tribal_gear.dm

@@ -109,8 +109,8 @@
 	desc = "A strange plant."
 	icon_state = "tyrflora"
 
-/obj/structure/flora/tyr/flowers/New()
-	..()
+/obj/structure/flora/tyr/flowers/Initialize(mapload)
+	. = ..()
 	icon_state = "tyrflora[rand(1, 5)]gb"
 
 //tier 2

modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm

@@ -3,10 +3,12 @@
 	if(!istype(SK))
 		to_chat(src, span_warning("Only a shadekin can use that!"))
 		return FALSE
-	else if(stat)
+
+	if(stat)
 		to_chat(src, span_warning("Can't use that ability in your state!"))
 		return FALSE
-	else if((ability_flags & AB_DARK_RESPITE || has_modifier_of_type(/datum/modifier/dark_respite)) && !(ability_flags & AB_PHASE_SHIFTED))
+
+	if((ability_flags & AB_DARK_RESPITE || has_modifier_of_type(/datum/modifier/dark_respite)) && !(ability_flags & AB_PHASE_SHIFTED))
 		to_chat(src, span_warning("You can't use that so soon after an emergency warp!"))
 		return FALSE
 	return TRUE
@@ -47,10 +49,12 @@
 
 	if(!shadekin_ability_check())
 		return FALSE
-	else if(ability_flags & AB_PHASE_SHIFTED)
+
+	if(ability_flags & AB_PHASE_SHIFTED)
 		to_chat(src, span_warning("You can't use that while phase shifted!"))
 		return FALSE
-	else if(ability_flags & AB_DARK_TUNNEL)
+
+	if(ability_flags & AB_DARK_TUNNEL)
 		to_chat(src, span_warning("You have already made a tunnel to the Dark!"))
 		return FALSE
 
@@ -95,8 +99,7 @@
 		ability_flags |= AB_DARK_TUNNEL
 		shadekin_adjust_energy(-(ability_cost - 10)) //Leaving enough energy to actually activate the portal
 		return TRUE
-	else
-		return FALSE
+	return FALSE
 
 /datum/power/shadekin/dark_respite
 	name = "Dark Respite (Only in Dark)"
@@ -113,18 +116,23 @@
 	if(!istype(SK))
 		to_chat(src, span_warning("Only a shadekin can use that!"))
 		return FALSE
-	else if(!istype(get_area(src), /area/shadekin))
+
+	if(!istype(get_area(src), /area/shadekin))
 		to_chat(src, span_warning("Can only trigger Dark Respite in the Dark!"))
 		return FALSE
-	else if(stat)
+
+	if(stat)
 		to_chat(src, span_warning("Can't use that ability in your state!"))
 		return FALSE
-	else if(ability_flags & AB_DARK_RESPITE)
+
+	if(ability_flags & AB_DARK_RESPITE)
 		to_chat(src, span_warning("You can't use that so soon after an emergency warp!"))
 		return FALSE
-	else if(has_modifier_of_type(/datum/modifier/dark_respite) && !SK.manual_respite)
+
+	if(has_modifier_of_type(/datum/modifier/dark_respite) && !SK.manual_respite)
 		to_chat(src, span_warning("You cannot manually end a Dark Respite triggered by an emergency warp!"))
-	else if(ability_flags & AB_PHASE_SHIFTED)
+
+	if(ability_flags & AB_PHASE_SHIFTED)
 		to_chat(src, span_warning("You can't use that while phase shifted!"))
 		return FALSE
 
@@ -155,26 +163,28 @@
 	icon = 'modular_chomp/icons/obj/Shadekin_powers_2.dmi'
 	icon_state = "dark_maw_waiting"
 
-/obj/effect/abstract/dark_maw/New(loc, var/mob/living/user, var/trigger_now = 0)
+/obj/effect/abstract/dark_maw/Initialize(mapload, var/mob/living/user, var/trigger_now = 0)
 	. = ..()
-	if(istype(user))
-		owner = user
-		target = owner.vore_selected
 
 	if(!isturf(loc))
 		return INITIALIZE_HINT_QDEL
+
 	var/turf/T = loc
 	if(T.get_lumcount() >= 0.5)
 		visible_message(span_notice("A set of shadowy lines flickers away in the light."))
 		icon_state = "dark_maw_used"
-		qdel(src)
-		return
+		return INITIALIZE_HINT_QDEL
+
+	if(istype(user))
+		owner = user
+		target = owner.vore_selected
 
 	var/mob/living/target_user = null
 	for(var/mob/living/L in T)
 		if(L != owner && !L.incorporeal_move)
 			target_user = L
 			break
+
 	if(istype(target_user))
 		triggered_by(target_user, 1)
 		// to trigger rebuild
@@ -182,8 +192,7 @@
 		icon_state = "dark_maw_used"
 		flick("dark_maw_tr", src)
 		visible_message(span_warning("A set of crystals suddenly springs from the ground and shadowy tendrils wrap around nothing before vanishing."))
-		spawn(30)
-			qdel(src)
+		QDEL_IN(src, 3 SECONDS)
 	else
 		var/mob/living/carbon/human/carbon_owner = owner
 		var/mob/living/simple_mob/shadekin/sm_owner = owner
@@ -207,6 +216,8 @@
 				SK.active_dark_maws -= src
 		else if(istype(sm_owner))
 			sm_owner.active_dark_maws -= src
+	target = null
+	owner = null
 	return ..()
 
 /obj/effect/abstract/dark_maw/Crossed(O)
@@ -240,30 +251,35 @@
 	visible_message(span_warning("A set of crystals spring out of the ground and shadowy tendrils start wrapping around [L]."))
 	if(owner && !triggered_instantly)
 		to_chat(owner, span_warning("A dark maw you deployed has triggered!"))
-	spawn(10)
-		var/will_vore = 1
+	addtimer(CALLBACK(src, PROC_REF(do_trigger), L), 1 SECOND, TIMER_DELETE_ME)
 
-		if(!owner || !(target in owner) || !L.devourable || !L.can_be_drop_prey || !owner.can_be_drop_pred || !L.phase_vore)
-			will_vore = 0
+/obj/effect/abstract/dark_maw/proc/do_trigger(var/mob/living/L)
+	var/will_vore = 1
 
-		if(!src || src.gc_destroyed)
-			//We got deleted probably, do nothing more
-			return
+	if(!owner || !(target in owner) || !L.devourable || !L.can_be_drop_prey || !owner.can_be_drop_pred || !L.phase_vore)
+		will_vore = 0
 
-		if(L.loc != get_turf(src))
-			visible_message(span_notice("The shadowy tendrils fail to catch anything and dissipate."))
-			qdel(src)
-		else if(will_vore)
-			visible_message(span_warning("The shadowy tendrils grab around [L] and drag them into the floor, leaving nothing behind."))
-			L.forceMove(target)
-			qdel(src)
-		else
-			var/obj/effect/energy_net/dark/net = new /obj/effect/energy_net/dark(get_turf(src))
-			if(net.buckle_mob(L))
-				visible_message(span_warning("The shadowy tendrils wrap around [L] and traps them in a net of dark energy."))
-			else
-				visible_message(span_notice("The shadowy tendrils wrap around [L] and then dissipate, leaving them in place."))
-			qdel(src)
+	if(!src || src.gc_destroyed)
+		//We got deleted probably, do nothing more
+		return
+
+	if(L.loc != get_turf(src))
+		visible_message(span_notice("The shadowy tendrils fail to catch anything and dissipate."))
+		qdel(src)
+		return
+
+	if(will_vore)
+		visible_message(span_warning("The shadowy tendrils grab around [L] and drag them into the floor, leaving nothing behind."))
+		L.forceMove(target)
+		qdel(src)
+		return
+
+	var/obj/effect/energy_net/dark/net = new /obj/effect/energy_net/dark(get_turf(src))
+	if(net.buckle_mob(L))
+		visible_message(span_warning("The shadowy tendrils wrap around [L] and traps them in a net of dark energy."))
+	else
+		visible_message(span_notice("The shadowy tendrils wrap around [L] and then dissipate, leaving them in place."))
+	qdel(src)
 
 /obj/effect/energy_net/dark
 	name = "dark net"
@@ -278,7 +294,8 @@
 		visible_message(span_danger("[user] dissipates \the [src] with a touch!"))
 		unbuckle_mob(buckled_mob)
 		return
-	else if(istype(user,/mob/living/carbon/human))
+
+	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		var/datum/species/shadekin/SK = H.species
 		if(istype(SK))
@@ -309,14 +326,17 @@
 
 	if(!shadekin_ability_check())
 		return FALSE
-	else if(shadekin_get_energy() < ability_cost)
+
+	if(shadekin_get_energy() < ability_cost)
 		to_chat(src, span_warning("Not enough energy for that ability!"))
 		return FALSE
+
 	var/turf/T = get_turf(src)
 	if(!istype(T))
 		to_chat(src, span_warning("You don't seem to be able to set a trap here!"))
 		return FALSE
-	else if(T.get_lumcount() >= 0.5)
+
+	if(T.get_lumcount() >= 0.5)
 		to_chat(src, span_warning("There is too much light here for your trap to last!"))
 		return FALSE
 
@@ -328,8 +348,7 @@
 		shadekin_adjust_energy(-ability_cost)
 
 		return TRUE
-	else
-		return FALSE
+	return FALSE
 
 /mob/living/carbon/human/proc/clear_dark_maws()
 	set name = "Dispel dark maws"

modular_chomp/code/modules/mob/living/living.dm

@@ -51,8 +51,8 @@ Maybe later, gotta figure out a way to click yourself when in a locker etc.
 
 	ClickOn(src)
 
-/mob/living/New(var/newloc)
-	..()
+/mob/living/Initialize(mapload)
+	. = ..()
 	add_verb(src,/mob/living/proc/click_self) //CHOMPEdit TGPanel
 */
 

modular_chomp/code/modules/mob/living/simple_animal/aliens/synx.dm

@@ -217,9 +217,9 @@
 	)
 */
 
-/mob/living/simple_mob/animal/synx/New() //this is really cool. Should be able to ventcrawl canonicaly, contort, and make random speech.
+/mob/living/simple_mob/animal/synx/Initialize(mapload) //this is really cool. Should be able to ventcrawl canonicaly, contort, and make random speech.
 //some things should be here that arent tho.
-	..()
+	. = ..()
 	add_verb(src,/mob/living/proc/ventcrawl) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/proc/distend_stomach) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/proc/contort) //CHOMPEdit TGPanel
@@ -901,8 +901,8 @@
 	faction = "SYN"
 
 
-/mob/living/simple_mob/animal/synx/ai/pet/greed/synth/New()
-	..()
+/mob/living/simple_mob/animal/synx/ai/pet/greed/synth/Initialize(mapload)
+	. = ..()
 	name = "SYN-KinC-([rand(100,999)])"
 
 /mob/living/simple_mob/animal/synx/ai/pet/greed/synth/goodboy
@@ -969,7 +969,8 @@
 	set category = "DEBUG"
 	icon_state = input(usr, "What would you like to change icon_state to?", "Respriting", null)
 
-/mob/living/simple_mob/animal/synx/ai/pet/debug/New()
+/mob/living/simple_mob/animal/synx/ai/pet/debug/Initialize(mapload)
+	. = ..()
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/rename) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/resprite) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/animal/synx/ai/pet/debug/proc/redesc) //CHOMPEdit TGPanel

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

@@ -99,8 +99,8 @@
 	else
 		to_chat(src, span_warning("Your mob does not have a PDA in its ID slot."))
 
-/mob/living/simple_mob/New(var/newloc)
-	..()
+/mob/living/simple_mob/Initialize(mapload)
+	. = ..()
 	add_verb(src,/mob/living/simple_mob/proc/use_headset) //CHOMPEdit TGPanel
 	add_verb(src,/mob/living/simple_mob/proc/use_pda) //CHOMPEdit TGPanel
 

modular_chomp/code/modules/mob/living/simple_mob/subtypes/fleshtaker.dm

@@ -19,8 +19,8 @@ Only physical attributes are copied.
 	ai_holder_type = /datum/ai_holder/simple_mob/melee/pack_mob //A pack of these would be absolutely terrifying.
 	var/flesh_mimic = FALSE //are we currently posing as something else?
 
-/mob/living/simple_mob/fleshtaker/New()
-	..()
+/mob/living/simple_mob/fleshtaker/Initialize(mapload)
+	. = ..()
 	base_values["name"] = name
 	base_values["desc"] = desc
 	base_values["icon"] = icon

modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm

@@ -21,15 +21,12 @@
 	var/amount_grown = 0
 	var/metroid_type = /mob/living/simple_mob/metroid/juvenile/baby
 
-/obj/effect/metroid/egg/Initialize(mapload)
+/obj/effect/metroid/egg/Initialize(mapload, var/atom/parent)
+	get_light_and_color(parent)
+	. = ..()
 	pixel_x = rand(3,-3)
 	pixel_y = rand(3,-3)
 	START_PROCESSING(SSobj, src)
-	return ..()
-
-/obj/effect/metroid/egg/New(var/location, var/atom/parent)
-	get_light_and_color(parent)
-	..()
 
 /obj/effect/metroid/egg/Destroy()
 	STOP_PROCESSING(SSobj, src)

modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/syndimobs.dm

@@ -312,8 +312,8 @@
 				"bio" = 100,
 				"rad" = 100
 				)
-/mob/living/simple_mob/vore/wolftaur/New()
-	..()
+/mob/living/simple_mob/vore/wolftaur/Initialize(mapload)
+	. = ..()
 	var/oursize = rand(90, 200) / 100
 	resize(oursize)
 

modular_chomp/code/modules/projectiles/ammo_refactor/ammo_magazine_override.dm

@@ -1,9 +1,10 @@
 //Replace old magazine with new
-/obj/item/ammo_magazine/New(loc)
+/obj/item/ammo_magazine/Initialize(mapload)
+	. = ..()
 	var/replacement_type = magazine_overrides[type]
 	if(replacement_type)
-		qdel(src)
-		return new replacement_type(loc)
+		new replacement_type(loc)
+		return INITIALIZE_HINT_QDEL
 	. = ..()
 
 

modular_chomp/code/modules/projectiles/ammo_refactor/ammo_types.dm

@@ -62,8 +62,8 @@
 	projectile_type = /obj/item/projectile/simple_bullet
 	var/ammo_flags = 0
 
-/obj/item/ammo_casing/simple/New()
-	..()
+/obj/item/ammo_casing/simple/Initialize(mapload)
+	. = ..()
 	var/obj/item/projectile/simple_bullet/P = BB
 	if(istype(P))
 		P.ammo_flags = ammo_flags

modular_chomp/code/modules/spells/spells.dm

@@ -42,11 +42,12 @@
 	cast_sound = null			// Sound file played when this is used.
 	var/last_castcheck = null	// The last time this spell was cast.
 
-/obj/item/spell/unrestricted/New()
+/obj/item/spell/unrestricted/Initialize(mapload, coreless)
+	. = ..()
 	if(isliving(loc))
 		owner = loc
 	if(!owner)
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 	update_icon()
 
 /obj/item/spell/unrestricted/run_checks()

modular_chomp/code/modules/tickets/tickets.dm

@@ -175,9 +175,10 @@ GLOBAL_DATUM_INIT(tickets, /datum/tickets, new)
 /obj/effect/statclick/ticket_list
 	var/current_state
 
-/obj/effect/statclick/ticket_list/New(loc, name, state)
+INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket_list)
+/obj/effect/statclick/ticket_list/Initialize(mapload, name, state)
 	current_state = state
-	..()
+	. = ..()
 
 /obj/effect/statclick/ticket_list/Click()
 	GLOB.tickets.BrowseTickets(current_state)
@@ -657,9 +658,10 @@ GLOBAL_DATUM_INIT(tickets, /datum/tickets, new)
 /obj/effect/statclick/ticket
 	var/datum/ticket/ticket_datum
 
-/obj/effect/statclick/ticket/New(loc, datum/ticket/T)
+INITIALIZE_IMMEDIATE(/obj/effect/statclick/ticket)
+/obj/effect/statclick/ticket/Initialize(mapload, datum/ticket/T)
 	ticket_datum = T
-	..(loc)
+	. = ..()
 
 /obj/effect/statclick/ticket/update()
 	return ..(ticket_datum.name)