Fixes some objects not returning initialize/destroy hints (#39957)

* Fixes crossbreeding stuff not returning init/destroy hints * Fixes some more missing initialize hints
2018-08-28 11:55:46 +02:00
parent 538fc4f542
commit 69293ce1a8
11 changed files with 17 additions and 16 deletions
@@ -38,7 +38,7 @@

 /obj/item/integrated_circuit/manipulation/weapon_firing/Destroy()
 	qdel(installed_gun)
-	..()
+	return ..()

 /obj/item/integrated_circuit/manipulation/weapon_firing/attackby(var/obj/O, var/mob/user)
 	if(istype(O, /obj/item/gun/energy))
@@ -745,6 +745,7 @@
 	var/mob/living/carbon/human/cloth_golem

 /obj/structure/cloth_pile/Initialize(mapload, mob/living/carbon/human/H)
+	. = ..()
 	if(!QDELETED(H) && is_species(H, /datum/species/golem/cloth))
 		H.unequip_everything()
 		H.forceMove(src)
@@ -38,7 +38,7 @@ To add a crossbreed:
 	throw_range = 6

 /obj/item/slimecross/Initialize()
-	..()
+	. = ..()
 	name =  effect + " " + colour + " extract"
 	var/itemcolor = "#FFFFFF"
 	switch(colour)
@@ -94,7 +94,7 @@ To add a crossbreed:
 	var/list/list_reagents

 /obj/item/slimecrossbeaker/Initialize()
-	..()
+	. = ..()
 	create_reagents(50)
 	if(list_reagents)
 		for(var/reagent in list_reagents)
@@ -11,7 +11,7 @@ Burning extracts:
 	icon_state = "burning"

 /obj/item/slimecross/burning/Initialize()
-	..()
+	. = ..()
 	create_reagents(10)

 /obj/item/slimecross/burning/attack_self(mob/user)
@@ -12,7 +12,7 @@ Charged extracts:
 	icon_state = "charged"

 /obj/item/slimecross/charged/Initialize()
-	..()
+	. = ..()
 	create_reagents(10)

 /obj/item/slimecross/charged/attack_self(mob/user)
@@ -196,7 +196,7 @@ Charged extracts:

 /obj/item/slimecross/charged/gold/Destroy()
 	STOP_PROCESSING(SSobj, src)
-	..()
+	return ..()

 /obj/item/slimecross/charged/oil
 	colour = "oil"
@@ -278,7 +278,7 @@ Consuming extracts:
 	var/colour = "#FFFFFF"

 /obj/item/slime_cookie/pyrite/Initialize()
-	..()
+	. = ..()
 	var/tastemessage = "paint remover"
 	switch(rand(1,7))
 		if(1)
@@ -21,7 +21,7 @@ Industrial extracts:
 	return

 /obj/item/slimecross/industrial/Initialize()
-	..()
+	. = ..()
 	create_reagents(100)
 	START_PROCESSING(SSobj,src)

@@ -14,7 +14,7 @@ Recurring extracts:
 	var/max_cooldown = 5 //In sets of 2 seconds.

 /obj/item/slimecross/recurring/Initialize()
-	..()
+	. = ..()
 	extract = new extract_type(src.loc)
 	visible_message("<span class='notice'>[src] wraps a layer of goo around itself!</span>")
 	extract.name = name
@@ -39,7 +39,7 @@ Recurring extracts:
 		qdel(src)

 /obj/item/slimecross/recurring/Destroy()
-	..()
+	. = ..()
 	STOP_PROCESSING(SSobj,src)

 /obj/item/slimecross/recurring/grey
@@ -142,7 +142,7 @@ Regenerative extracts:
 	do_sparks(5,FALSE,target)

 /obj/item/slimecross/regenerative/bluespace/Initialize()
-	..()
+	. = ..()
 	T = get_turf(src)

 /obj/item/slimecross/regenerative/sepia
@@ -15,7 +15,7 @@ Self-sustaining extracts:

 //Just divides into the actual item.
 /obj/item/slimecross/selfsustaining/Initialize()
-	. = ..()
+	..()
 	visible_message("<span class='warning'>The [src] shudders, and splits into four smaller extracts.</span>")
 	for(var/i = 0, i < 4, i++)
 		var/obj/item/autoslime/A = new /obj/item/autoslime(src.loc)
@@ -24,11 +24,11 @@ Self-sustaining extracts:
 		A.icon = icon
 		A.icon_state = icon_state
 		A.color = color
-	qdel(src)
+	return INITIALIZE_HINT_QDEL

 /obj/item/autoslime/Initialize()
 	name = "self-sustaining " + extract.name
-	..()
+	return ..()

 /obj/item/autoslime/attack_self(mob/user)
 	var/reagentselect = input(user, "Choose the reagent the extract will produce.", "Self-sustaining Reaction") as null|anything in extract.activate_reagents
@@ -15,7 +15,7 @@ Stabilized extracts:
 	var/mob/living/owner

 /obj/item/slimecross/stabilized/Initialize()
-	..()
+	. = ..()
 	START_PROCESSING(SSobj,src)

 /obj/item/slimecross/stabilized/Destroy()
@@ -111,7 +111,7 @@ Stabilized extracts:
 	mob_type = pick(mob_spawn_pets)

 /obj/item/slimecross/stabilized/gold/Initialize()
-	..()
+	. = ..()
 	generate_mobtype()

 /obj/item/slimecross/stabilized/gold/attack_self(mob/user)