Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087

[MIRROR] Cleans up some qdel(src)'s in Initialize()

code/game/gamemodes/blob/blobs/core.dm

@@ -19,7 +19,7 @@
 	GLOB.poi_list |= src
 	update_icon() //so it atleast appears
 	if(!placed && !overmind)
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 	if(overmind)
 		update_icon()
 	point_rate = new_rate

code/game/gamemodes/wizard/spellbook.dm

@@ -902,7 +902,7 @@
 	var/static/banned_spells = list(/obj/item/spellbook/oneuse/mimery_blockade, /obj/item/spellbook/oneuse/mimery_guns)
 	var/real_type = pick(subtypesof(/obj/item/spellbook/oneuse) - banned_spells)
 	new real_type(loc)
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/item/spellbook/oneuse/sacredflame
 	spell = /obj/effect/proc_holder/spell/targeted/sacred_flame

code/game/machinery/launch_pad.dm

@@ -155,7 +155,7 @@
 		briefcase = loc
 	else
 		log_game("[src] has been spawned without a briefcase.")
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 
 /obj/machinery/launchpad/briefcase/Destroy()
 	QDEL_NULL(briefcase)

code/game/objects/effects/spawners/bombspawner.dm

@@ -1,46 +1,46 @@
-/obj/effect/spawner/newbomb
-	name = "bomb"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x"
-	var/btemp1 = 1500
-	var/btemp2 = 1000	// tank temperatures
-	var/assembly_type
-
-/obj/effect/spawner/newbomb/Initialize()
+/obj/effect/spawner/newbomb
+	name = "bomb"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x"
+	var/btemp1 = 1500
+	var/btemp2 = 1000	// tank temperatures
+	var/assembly_type
+
+/obj/effect/spawner/newbomb/Initialize()
 	. = ..()
-	var/obj/item/device/transfer_valve/V = new(src.loc)
-	var/obj/item/tank/internals/plasma/full/PT = new(V)
-	var/obj/item/tank/internals/oxygen/OT = new(V)
-
-	PT.air_contents.temperature = btemp1 + T0C
-	OT.air_contents.temperature = btemp2 + T0C
-
-	V.tank_one = PT
-	V.tank_two = OT
-	PT.master = V
-	OT.master = V
-	
-	if(assembly_type)
-		var/obj/item/device/assembly/A = new assembly_type(V)
-		V.attached_device = A
-		A.holder = V
-		A.toggle_secure()
-
-	V.update_icon()
-	
-	qdel(src)
-
-/obj/effect/spawner/newbomb/timer
-	assembly_type = /obj/item/device/assembly/timer
-
-/obj/effect/spawner/newbomb/timer/syndicate
-	btemp1 = 150
-	btemp2 = 20
-
-/obj/effect/spawner/newbomb/proximity
-	assembly_type = /obj/item/device/assembly/prox_sensor
-
-/obj/effect/spawner/newbomb/radio
-	assembly_type = /obj/item/device/assembly/signaler
-	
-
+	var/obj/item/device/transfer_valve/V = new(src.loc)
+	var/obj/item/tank/internals/plasma/full/PT = new(V)
+	var/obj/item/tank/internals/oxygen/OT = new(V)
+
+	PT.air_contents.temperature = btemp1 + T0C
+	OT.air_contents.temperature = btemp2 + T0C
+
+	V.tank_one = PT
+	V.tank_two = OT
+	PT.master = V
+	OT.master = V
+	
+	if(assembly_type)
+		var/obj/item/device/assembly/A = new assembly_type(V)
+		V.attached_device = A
+		A.holder = V
+		A.toggle_secure()
+
+	V.update_icon()
+	
+	return INITIALIZE_HINT_QDEL
+
+/obj/effect/spawner/newbomb/timer
+	assembly_type = /obj/item/device/assembly/timer
+
+/obj/effect/spawner/newbomb/timer/syndicate
+	btemp1 = 150
+	btemp2 = 20
+
+/obj/effect/spawner/newbomb/proximity
+	assembly_type = /obj/item/device/assembly/prox_sensor
+
+/obj/effect/spawner/newbomb/radio
+	assembly_type = /obj/item/device/assembly/signaler
+	
+

code/game/objects/effects/spawners/gibspawner.dm

@@ -38,7 +38,7 @@
 					if(directions.len)
 						gib.streak(directions)
 
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 
 

code/game/objects/effects/spawners/structure.dm

@@ -13,7 +13,7 @@ again.
 	if(spawn_list && spawn_list.len)
 		for(var/I in spawn_list)
 			new I(get_turf(src))
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 
 //normal windows

code/game/objects/items/chrono_eraser.dm

@@ -62,7 +62,7 @@
 		TED = loc
 	else //admin must have spawned it
 		TED = new(src.loc)
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 
 /obj/item/gun/energy/chrono_gun/update_icon()
 	return