From 3a45d52fe0c3dd45d364e7407dabcf7b75b9427a Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Mon, 6 Jul 2015 09:20:39 -0700 Subject: [PATCH] Fix remaining non-returning Destroys() Plus a little refactor to mining flaps and spacepod doors- they now use CanAtmosPass instead of manually setting the turf to no-atmos-passing --- code/ATMOSPHERICS/atmospherics.dm | 2 +- .../binary_devices/binary_atmos_base.dm | 6 +-- .../components/unary/unary_base.dm | 2 +- code/datums/mind.dm | 2 +- code/game/gamemodes/blob/blobs/core.dm | 3 +- code/game/gamemodes/blob/blobs/node.dm | 3 +- code/game/gamemodes/blob/theblob.dm | 3 +- code/game/gamemodes/events/biomass.dm | 2 +- code/game/machinery/Beacon.dm | 4 +- .../atmoalter/portable_atmospherics.dm | 2 +- code/game/machinery/doors/poddoor.dm | 48 +++++++++---------- code/game/machinery/doors/spacepod.dm | 25 ++++------ code/game/objects/effects/effect_system.dm | 3 +- code/game/objects/items/devices/powersink.dm | 2 +- code/game/objects/items/shooting_range.dm | 2 +- .../objects/items/weapons/implants/implant.dm | 2 +- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/segway.dm | 2 +- code/game/supplyshuttle.dm | 18 ++++--- code/modules/assembly/assembly.dm | 4 +- code/modules/assembly/holder.dm | 2 +- code/modules/mob/living/carbon/brain/brain.dm | 2 +- .../simple_animal/friendly/spiderbot.dm | 4 +- code/modules/power/cable.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 4 +- .../projectiles/guns/energy/nuclear.dm | 2 +- .../projectiles/guns/energy/special.dm | 2 +- .../projectiles/guns/projectile/crossbow.dm | 2 +- code/modules/reagents/Chemistry-Holder.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 2 +- .../reagent_containers/food/condiment.dm | 6 +-- code/modules/recycling/disposal.dm | 6 +-- 33 files changed, 82 insertions(+), 93 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 9102ceb7164..0887540ef36 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -195,4 +195,4 @@ obj/machinery/atmospherics/proc/check_connect_types_construction(obj/machinery/a /obj/machinery/atmospherics/singularity_pull(S, current_size) if(current_size >= STAGE_FIVE) - Destroy() \ No newline at end of file + qdel(src) \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index fa529041cd0..5bfe19fd55a 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -57,7 +57,7 @@ obj/machinery/atmospherics/binary node1 = null node2 = null - ..() + return ..() initialize() if(node1 && node2) return @@ -85,7 +85,7 @@ obj/machinery/atmospherics/binary update_icon() update_underlays() - + build_network() if(!network1 && node1) network1 = new /datum/pipe_network() @@ -135,7 +135,7 @@ obj/machinery/atmospherics/binary else if(reference==node2) del(network2) node2 = null - + update_icon() update_underlays() diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index 46b6ee9a708..84405a835ab 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -37,7 +37,7 @@ node = null - ..() + return ..() initialize() if(node) return diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 73b92eda82d..d8221483127 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -625,7 +625,7 @@ datum/mind for(var/obj/item/weapon/implant/loyalty/I in H.contents) for(var/obj/item/organ/external/organs in H.organs) if(I in organs.implants) - I.Destroy() + qdel(I) H << "\blue Your loyalty implant has been deactivated." if("add") var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index 2dd69860b14..668901cca0b 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -25,8 +25,7 @@ if(overmind) del(overmind) processing_objects.Remove(src) - ..() - return + return ..() update_icon() if(health <= 0) diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index 8934582a6d4..a74d6d04f83 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -14,8 +14,7 @@ Destroy() blob_nodes -= src processing_objects.Remove(src) - ..() - return + return ..() Life() for(var/i = 1; i < 8; i += i) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 1ad62999ecf..b6656b349db 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -25,8 +25,7 @@ Destroy() blobs -= src - ..() - return + return ..() CanPass(atom/movable/mover, turf/target, height=0, air_group=0) diff --git a/code/game/gamemodes/events/biomass.dm b/code/game/gamemodes/events/biomass.dm index e820c1880e6..c338c34815e 100644 --- a/code/game/gamemodes/events/biomass.dm +++ b/code/game/gamemodes/events/biomass.dm @@ -18,7 +18,7 @@ if(master) master.vines -= src master.growth_queue -= src - ..() + return ..() /obj/effect/biomass/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (!W || !user || !W.type) return diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 9bc03867dc9..e368fc3b1eb 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -24,8 +24,8 @@ Destroy() if(Beacon) - del(Beacon) - ..() + qdel(Beacon) + return ..() // update the invisibility and icon hide(var/intact) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 1e6ce7e1253..f8629b47251 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -37,7 +37,7 @@ Destroy() del(air_contents) - ..() + return ..() update_icon() return null diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index eb40421beb6..b14fd005674 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -453,9 +453,9 @@ f2.set_opacity(opacity) Destroy() - del f1 - del f2 - ..() + qdel(f1) + qdel(f2) + return ..() /obj/machinery/door/poddoor/two_tile_ver var/obj/machinery/door/poddoor/filler_object/f1 @@ -472,9 +472,9 @@ f2.set_opacity(opacity) Destroy() - del f1 - del f2 - ..() + qdel(f1) + qdel(f2) + return ..() /obj/machinery/door/poddoor/three_tile_hor var/obj/machinery/door/poddoor/filler_object/f1 @@ -495,10 +495,10 @@ f3.set_opacity(opacity) Destroy() - del f1 - del f2 - del f3 - ..() + qdel(f1) + qdel(f2) + qdel(f3) + return ..() /obj/machinery/door/poddoor/three_tile_ver var/obj/machinery/door/poddoor/filler_object/f1 @@ -519,10 +519,10 @@ f3.set_opacity(opacity) Destroy() - del f1 - del f2 - del f3 - ..() + qdel(f1) + qdel(f2) + qdel(f3) + return ..() /obj/machinery/door/poddoor/four_tile_hor var/obj/machinery/door/poddoor/filler_object/f1 @@ -547,11 +547,11 @@ f4.set_opacity(opacity) Destroy() - del f1 - del f2 - del f3 - del f4 - ..() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) + return ..() /obj/machinery/door/poddoor/four_tile_ver var/obj/machinery/door/poddoor/filler_object/f1 @@ -576,11 +576,11 @@ f4.set_opacity(opacity) Destroy() - del f1 - del f2 - del f3 - del f4 - ..() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) + return ..() /obj/machinery/door/poddoor/filler_object name = "" diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm index 2aae6ed5f6d..244642021ad 100644 --- a/code/game/machinery/doors/spacepod.dm +++ b/code/game/machinery/doors/spacepod.dm @@ -7,23 +7,18 @@ density = 0 anchored = 1 - New() //set the turf below the flaps to block air - var/turf/T = get_turf(loc) - if(T) - T.blocks_air = 1 - ..() +/obj/structure/spacepoddoor/New() + ..() + air_update_turf(1) - Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor - var/turf/T = get_turf(loc) - if(T) - if(istype(T, /turf/simulated/floor)) - T.blocks_air = 0 - ..() +/obj/structure/spacepoddoor/CanAtmosPass(turf/T) + return 0 +/obj/structure/spacepoddoor/Destroy() + air_update_turf(1) + return ..() - -/obj/structure/spacepoddoor/CanPass(atom/A, turf/T) +/obj/structure/spacepoddoor/CanPass(atom/movable/A, turf/T) if(istype(A, /obj/spacepod)) return ..() - else return 0 - + else return 0 \ No newline at end of file diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index b897b1899dc..836fc78ba14 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1079,10 +1079,9 @@ steam.start() -- spawns the effect air_update_turf(1) Destroy() - density = 0 air_update_turf(1) - ..() + return ..() Move() var/turf/T = loc diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 143bf9fd2e3..7b0ea895654 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -65,7 +65,7 @@ processing_objects.Remove(src) // attached.attached = null attached = null - ..() + return ..() attack_ai() diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index a40cc5674d7..5b131c93fb7 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -16,7 +16,7 @@ T.pinned_target = null T.density = 1 break - ..() // delete target + return ..() // delete target Move() ..() diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 2b901819b0b..4dec738bb56 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -47,7 +47,7 @@ Destroy() if(part) part.implants.Remove(src) - ..() + return ..() /obj/item/weapon/implant/tracking name = "tracking" diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 3b23f7df034..b2172cce699 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -84,4 +84,4 @@ /obj/structure/lattice/singularity_pull(S, current_size) if(current_size >= STAGE_FOUR) - Destroy() \ No newline at end of file + qdel(src) \ No newline at end of file diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 51b0cfb5ea6..fcf1424b209 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -24,7 +24,7 @@ Destroy() air_update_turf(1) - ..() + return ..() Move() var/turf/T = loc diff --git a/code/game/objects/structures/segway.dm b/code/game/objects/structures/segway.dm index a9821c99238..834f7d1c81e 100644 --- a/code/game/objects/structures/segway.dm +++ b/code/game/objects/structures/segway.dm @@ -112,7 +112,7 @@ if(health <= 0) if(buckled_mob) buckled_mob << "The [src.name] was destroyed!" - Destroy() + qdel(src) /obj/item/sec_seg_key name = "security segway key" diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 6aefe7468db..15743f9eade 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -87,18 +87,16 @@ var/list/mechtoys = list( name = "\improper Airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps." - New() //set the turf below the flaps to block air - var/turf/T = get_turf(loc) - if(T) - T.blocks_air = 1 + New() + air_update_turf(1) ..() - Destroy() //lazy hack to set the turf to allow air to pass if it's a simulated floor - var/turf/T = get_turf(loc) - if(T) - if(istype(T, /turf/simulated/floor)) - T.blocks_air = 0 - ..() + Destroy() + air_update_turf(1) + return ..() + + CanAtmosPass(turf/T) + return 0 /obj/machinery/computer/supplycomp name = "Supply Shuttle Console" diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 5cb9211ac07..71cdc55269e 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -70,8 +70,8 @@ else if(A.a_right == src) A.a_right = null src.holder = null - ..() - + return ..() + pulsed(var/radio = 0) if(holder && (wires & WIRE_RECEIVE)) activate() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 19fe8d84219..be2516b923d 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -29,7 +29,7 @@ a_left.holder = null if(a_right) a_right.holder = null - ..() + return ..() attach(var/obj/item/device/D, var/obj/item/device/D2, var/mob/user) if((!D)||(!D2)) return 0 diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index 84e92b2efa9..7dedb49e812 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -20,7 +20,7 @@ if(stat!=DEAD) //If not dead. death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA ghostize() //Ghostize checks for key so nothing else is necessary. - ..() + return ..() say_understands(var/other)//Goddamn is this hackish, but this say code is so odd if (istype(other, /mob/living/silicon/ai)) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index e66fa1754c7..a09f843b118 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -216,8 +216,8 @@ held_item = null robogibs(src.loc, viruses) - src.Destroy() - return + qdel(src) + //Cannibalized from the parrot mob. ~Zuhayr /mob/living/simple_animal/spiderbot/verb/drop_held_item() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index f6fa448bb3e..e5951e82c79 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -201,7 +201,7 @@ /obj/structure/cable/singularity_pull(S, current_size) if(current_size >= STAGE_FIVE) - Destroy() + qdel(src) // the cable coil object, used for laying cable diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 73ae2c07d27..25a83332d9a 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -135,7 +135,7 @@ obj/item/weapon/gun/energy/laser/retro Destroy() processing_objects.Remove(src) - ..() + return ..() process() @@ -172,7 +172,7 @@ obj/item/weapon/gun/energy/laser/retro Destroy() processing_objects.Remove(src) - ..() + return ..() process() diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 31add5f22c9..5f49ec3f86f 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -54,7 +54,7 @@ Destroy() processing_objects.Remove(src) - ..() + return ..() process() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c34048c6970..3da05e86f8b 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -109,7 +109,7 @@ Destroy() processing_objects.Remove(src) - ..() + return ..() process() charge_tick++ diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm index 012f0f7dc3e..3ddce50ceac 100644 --- a/code/modules/projectiles/guns/projectile/crossbow.dm +++ b/code/modules/projectiles/guns/projectile/crossbow.dm @@ -45,7 +45,7 @@ user << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow." var/obj/item/weapon/shard/shrapnel/S = new() S.loc = get_turf(src) - src.Destroy() + qdel(src) /obj/item/weapon/arrow/baguette name = "baguette" diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index b96939ac697..2acbe837400 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -637,7 +637,7 @@ atom/proc/create_reagents(var/max_vol) /datum/reagents/Destroy() for(var/datum/reagent/reagent in reagent_list) - reagent.Destroy() + qdel(reagent) if(my_atom) my_atom = null diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index ef6d0f4437e..9ce3ac077ba 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -166,7 +166,7 @@ datum if(src.data["virus"]) var/datum/disease/D = src.data["virus"] D.cure(0) - ..() + return ..() */ /* diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 49316a33e92..f79dc8ded09 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -190,16 +190,16 @@ if(istype(target, /obj/item/weapon/reagent_containers/food/snacks)) if(!reagents.total_volume) user << "You tear open [src], but there's nothing in it." - Destroy() + qdel(src) return if(target.reagents.total_volume >= target.reagents.maximum_volume) user << "You tear open [src], but [target] is stacked so high that it just drips off!" //Not sure if food can ever be full, but better safe than sorry. - Destroy() + qdel(src) return else user << "You tear open [src] above [target] and the condiments drip onto it." src.reagents.trans_to(target, amount_per_transfer_from_this) - Destroy() + qdel(src) /obj/item/weapon/reagent_containers/food/condiment/pack/on_reagent_change() if(reagents.reagent_list.len > 0) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 1aef00f1965..8da0bd3d403 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -481,7 +481,7 @@ singularity_pull(S, current_size) if(current_size >= STAGE_FIVE) - Destroy() + qdel(src) // virtual disposal object // travels through pipes in lieu of actual items @@ -685,11 +685,11 @@ // otherwise, do normal expel from turf if(H) expel(H, T, 0) - ..() + return ..() singularity_pull(S, current_size) if(current_size >= STAGE_FIVE) - Destroy() + qdel(src) // returns the direction of the next pipe object, given the entrance dir // by default, returns the bitmask of remaining directions