From 69293ce1a85a31082afdb0c7351c4db12bcd926c Mon Sep 17 00:00:00 2001 From: Francesco Date: Tue, 28 Aug 2018 11:55:46 +0200 Subject: [PATCH] Fixes some objects not returning initialize/destroy hints (#39957) * Fixes crossbreeding stuff not returning init/destroy hints * Fixes some more missing initialize hints --- .../modules/integrated_electronics/subtypes/manipulation.dm | 2 +- .../modules/mob/living/carbon/human/species_types/golems.dm | 1 + .../research/xenobiology/crossbreeding/_corecross.dm | 4 ++-- code/modules/research/xenobiology/crossbreeding/burning.dm | 2 +- code/modules/research/xenobiology/crossbreeding/charged.dm | 4 ++-- .../modules/research/xenobiology/crossbreeding/consuming.dm | 2 +- .../research/xenobiology/crossbreeding/industrial.dm | 2 +- .../modules/research/xenobiology/crossbreeding/recurring.dm | 4 ++-- .../research/xenobiology/crossbreeding/regenerative.dm | 2 +- .../research/xenobiology/crossbreeding/selfsustaining.dm | 6 +++--- .../research/xenobiology/crossbreeding/stabilized.dm | 4 ++-- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index 5a9acfa0f2a..a62b2bc8d01 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -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)) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 426be98174c..97e88d4d550 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -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) diff --git a/code/modules/research/xenobiology/crossbreeding/_corecross.dm b/code/modules/research/xenobiology/crossbreeding/_corecross.dm index 43f23d013d3..d9d58083cb1 100644 --- a/code/modules/research/xenobiology/crossbreeding/_corecross.dm +++ b/code/modules/research/xenobiology/crossbreeding/_corecross.dm @@ -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) diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index 48f822f7ca6..3b2131dd817 100644 --- a/code/modules/research/xenobiology/crossbreeding/burning.dm +++ b/code/modules/research/xenobiology/crossbreeding/burning.dm @@ -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) diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index c95b892dde6..b664380d9ef 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -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" diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm index 2f6bf2a4f6a..b51a7b2553f 100644 --- a/code/modules/research/xenobiology/crossbreeding/consuming.dm +++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm @@ -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) diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm index 95f87ede0a0..2ab39eb06f0 100644 --- a/code/modules/research/xenobiology/crossbreeding/industrial.dm +++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm @@ -21,7 +21,7 @@ Industrial extracts: return /obj/item/slimecross/industrial/Initialize() - ..() + . = ..() create_reagents(100) START_PROCESSING(SSobj,src) diff --git a/code/modules/research/xenobiology/crossbreeding/recurring.dm b/code/modules/research/xenobiology/crossbreeding/recurring.dm index 8a6e5c3cbba..b8ea51bae50 100644 --- a/code/modules/research/xenobiology/crossbreeding/recurring.dm +++ b/code/modules/research/xenobiology/crossbreeding/recurring.dm @@ -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("[src] wraps a layer of goo around itself!") 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 diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index 50669ff4352..6c7ea102bc1 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -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 diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm index 93e5a8e739d..0b27b1e26f4 100644 --- a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm +++ b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm @@ -15,7 +15,7 @@ Self-sustaining extracts: //Just divides into the actual item. /obj/item/slimecross/selfsustaining/Initialize() - . = ..() + ..() visible_message("The [src] shudders, and splits into four smaller extracts.") 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 diff --git a/code/modules/research/xenobiology/crossbreeding/stabilized.dm b/code/modules/research/xenobiology/crossbreeding/stabilized.dm index fe1b498667a..0d589954d95 100644 --- a/code/modules/research/xenobiology/crossbreeding/stabilized.dm +++ b/code/modules/research/xenobiology/crossbreeding/stabilized.dm @@ -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)