From 5abd1bcdd96d7afad1b2b25c1f3f84788a15a3a4 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 25 Nov 2017 16:16:13 -0500 Subject: [PATCH] Cleans up some qdel(src)'s in Initialize() --- code/game/gamemodes/blob/blobs/core.dm | 2 +- code/game/gamemodes/wizard/spellbook.dm | 2 +- code/game/machinery/launch_pad.dm | 2 +- .../objects/effects/spawners/bombspawner.dm | 39 +++++++++++++++++++ .../objects/effects/spawners/gibspawner.dm | 2 +- .../objects/effects/spawners/structure.dm | 2 +- code/game/objects/items/chrono_eraser.dm | 2 +- code/modules/library/soapstone.dm | 2 +- code/modules/mapping/mapping_helpers.dm | 4 +- code/modules/mining/machine_processing.dm | 2 +- .../carbon/human/species_types/golems.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 3 +- .../mob/living/simple_animal/bot/bot.dm | 2 +- .../mob/living/simple_animal/friendly/dog.dm | 2 +- 14 files changed, 53 insertions(+), 15 deletions(-) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index 91409ac4ed..9412e8582f 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/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 diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 4a407a4ef6..1cf172d3a6 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/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 diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 65f5b946ef..4f4e481905 100644 --- a/code/game/machinery/launch_pad.dm +++ b/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) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index da9eb76101..2a8407ad7a 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -8,6 +8,7 @@ /obj/effect/spawner/newbomb/Initialize() . = ..() +<<<<<<< HEAD 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) @@ -44,3 +45,41 @@ 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 + + +>>>>>>> 395c0ee... Cleans up some qdel(src)'s in Initialize() diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 303bcd7f33..43f10dc45e 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -38,7 +38,7 @@ if(directions.len) gib.streak(directions) - qdel(src) + return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 285aeeaf8c..f4abff67fb 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/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 diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index d65ef6fc2a..8ac9643c39 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/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 diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index ab78b582a6..cee4665f07 100644 --- a/code/modules/library/soapstone.dm +++ b/code/modules/library/soapstone.dm @@ -136,7 +136,7 @@ if(!good_chisel_message_location(T)) persists = FALSE - qdel(src) + return INITIALIZE_HINT_QDEL /obj/structure/chisel_message/proc/register(mob/user, newmessage) hidden_message = newmessage diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index e70786f80d..a4d3986020 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -15,7 +15,7 @@ for(var/turf/T in get_area_turfs(thearea, z)) if(T.baseturf != T.type) //Don't break indestructible walls and the like T.baseturf = baseturf - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/baseturf_helper/asteroid @@ -65,5 +65,5 @@ GLOBAL_LIST_EMPTY(z_is_planet) var/turf/T = get_turf(src) if(!turf_z_is_planet(T)) GLOB.z_is_planet["[T.z]"] = list() - qdel(src) + return INITIALIZE_HINT_QDEL diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 276c030175..757cad5e19 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -18,7 +18,7 @@ if (machine) machine.CONSOLE = src else - qdel(src) + return INITIALIZE_HINT_QDEL /obj/machinery/mineral/processing_unit_console/attack_hand(mob/user) 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 e3d2d5db61..9cb3f21ec0 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -710,7 +710,7 @@ to_chat(cloth_golem, "You start gathering your life energy, preparing to rise again...") addtimer(CALLBACK(src, .proc/revive), revive_time) else - qdel(src) + return INITIALIZE_HINT_QDEL /obj/structure/cloth_pile/Destroy() if(cloth_golem) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 3a5988e09a..0fb044429c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -88,8 +88,7 @@ . = ..() if(!target_ai) //If there is no player/brain inside. new/obj/structure/AIcore/deactivated(loc) //New empty terminal. - qdel(src)//Delete AI. - return + return INITIALIZE_HINT_QDEL //Delete AI. if(L && istype(L, /datum/ai_laws)) laws = L diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 5d943bc1e5..d4c459e996 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -800,7 +800,7 @@ Pass a positive integer as an argument to override a bot's default speed. . = ..() owner = loc if(!istype(owner)) - qdel(src) + return INITIALIZE_HINT_QDEL /mob/living/simple_animal/bot/proc/topic_denied(mob/user) //Access check proc for bot topics! Remember to place in a bot's individual Topic if desired. if(!user.canUseTopic(src)) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 2a94052274..95b63c98f5 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -310,7 +310,7 @@ P.gender = MALE P.desc = "It's the HoP's beloved corgi puppy." Write_Memory(FALSE) - qdel(src) + return INITIALIZE_HINT_QDEL else if(age == record_age) icon_state = "old_corgi" icon_living = "old_corgi"