From 9afe0500259027c2ed262ba00ce8df661fe7dc4e Mon Sep 17 00:00:00 2001
From: Menshin <>
Date: Sat, 5 Mar 2016 01:58:56 +0100
Subject: [PATCH] Replaced last occurences of gc_destroyed by qdeleted().
---
code/__HELPERS/unsorted.dm | 2 +-
code/game/gamemodes/malfunction/Malf_Modules.dm | 2 +-
code/game/gamemodes/miniantags/revenant/revenant.dm | 2 +-
code/game/machinery/cloning.dm | 2 +-
.../game/machinery/embedded_controller/access_controller.dm | 4 ++--
code/game/machinery/vending.dm | 2 +-
code/game/objects/items.dm | 2 +-
code/game/objects/items/weapons/grenades/clusterbuster.dm | 2 +-
code/game/objects/objs.dm | 4 ++--
code/modules/atmospherics/machinery/atmosmachinery.dm | 2 +-
code/modules/atmospherics/machinery/pipes/pipes.dm | 2 +-
code/modules/events/brand_intelligence.dm | 4 ++--
code/modules/events/spacevine.dm | 2 +-
code/modules/hydroponics/grown/tomato.dm | 2 +-
code/modules/library/lib_items.dm | 2 +-
code/modules/mining/equipment_locker.dm | 2 +-
code/modules/mob/living/carbon/brain/posibrain.dm | 2 +-
.../living/simple_animal/friendly/drone/drones_as_items.dm | 2 +-
code/modules/paperwork/photocopier.dm | 6 +++---
code/modules/power/apc.dm | 2 +-
code/modules/power/cable.dm | 2 +-
code/modules/power/cell.dm | 2 +-
code/modules/power/lighting.dm | 2 +-
code/modules/power/solar.dm | 4 ++--
code/modules/recycling/disposal-structures.dm | 2 +-
code/modules/recycling/disposal-unit.dm | 2 +-
code/modules/spells/spell.dm | 2 +-
code/modules/spells/spell_types/genetic.dm | 2 +-
code/modules/spells/spell_types/summonitem.dm | 2 +-
29 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 2190d491728..c8177b9618b 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -964,7 +964,7 @@ var/list/WALLITEMS_INVERSE = list(
/proc/IsValidSrc(A)
if(istype(A, /datum))
var/datum/B = A
- return !B.gc_destroyed
+ return !qdeleted(B)
if(istype(A, /client))
return 1
return 0
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index c7f4546fe41..7497c280ecc 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -360,7 +360,7 @@
audible_message("You hear a loud electrical buzzing sound!")
src << "Reprogramming machine behaviour..."
spawn(50)
- if(M && !M.gc_destroyed)
+ if(M && !qdeleted(M))
new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, src, 1)
else src << "Out of uses."
else src << "That's not a machine."
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index e33dff2cf5a..3e42c4de71c 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -340,7 +340,7 @@
user << "It is shifting and distorted. It would be wise to destroy this."
/obj/item/weapon/ectoplasm/revenant/proc/reform()
- if(gc_destroyed || !src || inert)
+ if(!src || qdeleted(src) || inert)
return
var/key_of_revenant
message_admins("Revenant ectoplasm was left undestroyed for 1 minute and is reforming into a new revenant.")
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 68d6ca50ff0..ab1c078c395 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -341,7 +341,7 @@
/obj/machinery/clonepod/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
go_out()
/*
diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm
index be48ec8b0bb..867291018b7 100644
--- a/code/game/machinery/embedded_controller/access_controller.dm
+++ b/code/game/machinery/embedded_controller/access_controller.dm
@@ -161,7 +161,7 @@
A.unbolt()
spawn()
if(A && A.close())
- if(stat & NOPOWER || lostPower || !A || A.gc_destroyed)
+ if(stat & NOPOWER || lostPower || !A || qdeleted(A))
goIdle(1)
return
A.bolt()
@@ -207,7 +207,7 @@
A.unbolt()
spawn()
if(A && A.open())
- if(stat | (NOPOWER) && !lostPower && A && !A.gc_destroyed)
+ if(stat | (NOPOWER) && !lostPower && A && !qdeleted(A))
A.bolt()
goIdle(1)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index a335e986b7c..4ad70d8a672 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -107,7 +107,7 @@
/obj/machinery/vending/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
if(prob(25))
malfunction()
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 7d9eddc24a4..d6bce4278bf 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -147,7 +147,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
/obj/item/ex_act(severity, target)
if(severity == 1 || target == src)
qdel(src)
- if(!gc_destroyed)
+ if(!qdeleted(src))
contents_explosion(severity, target)
//user: The mob that is suiciding
diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm
index 7c2825c89ba..d75fc7b7db1 100644
--- a/code/game/objects/items/weapons/grenades/clusterbuster.dm
+++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm
@@ -66,7 +66,7 @@
walk_away(P,loc,rand(1,4))
spawn(rand(15,60))
- if(P && !P.gc_destroyed)
+ if(P && !qdeleted(P))
P.prime()
qdel(src)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 0f038cc0e7c..7e20a4acb68 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -136,7 +136,7 @@
else if(severity == 2)
if(prob(50))
qdel(src)
- if(!gc_destroyed)
+ if(!qdeleted(src))
..()
//If a mob logouts/logins in side of an object you can use this proc
@@ -148,7 +148,7 @@
/obj/singularity_act()
ex_act(1)
- if(src && isnull(gc_destroyed))
+ if(src && !qdeleted(src))
qdel(src)
return 2
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 4d43940f8fe..1167a045224 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -139,7 +139,7 @@ Pipelines + Other Objects -> Pipe network
user << "As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?"
unsafe_wrenching = TRUE //Oh dear oh dear
- if (do_after(user, 20/W.toolspeed, target = src) && !gc_destroyed)
+ if (do_after(user, 20/W.toolspeed, target = src) && !qdeleted(src))
user.visible_message( \
"[user] unfastens \the [src].", \
"You unfasten \the [src].", \
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 6a6845b80f6..f04fa7f82cf 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -91,7 +91,7 @@
qdel(meter)
. = ..()
- if(parent && !parent.gc_destroyed)
+ if(parent && !qdeleted(parent))
qdel(parent)
parent = null
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index 1ebb7ed4c08..7edf5a9f482 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -38,7 +38,7 @@
/datum/round_event/brand_intelligence/tick()
- if(!originMachine || originMachine.gc_destroyed || originMachine.shut_up || originMachine.wires.is_all_cut()) //if the original vending machine is missing or has it's voice switch flipped
+ if(!originMachine || qdeleted(originMachine) || originMachine.shut_up || originMachine.wires.is_all_cut()) //if the original vending machine is missing or has it's voice switch flipped
for(var/obj/machinery/vending/saved in infectedMachines)
saved.shoot_inventory = 0
if(originMachine)
@@ -49,7 +49,7 @@
vendingMachines = removeNullsFromList(vendingMachines)
if(!vendingMachines.len) //if every machine is infected
for(var/obj/machinery/vending/upriser in infectedMachines)
- if(prob(70) && !upriser.gc_destroyed)
+ if(prob(70) && !qdeleted(upriser))
var/mob/living/simple_animal/hostile/mimic/copy/M = new(upriser.loc, upriser, null, 1) // it will delete upriser on creation and override any machine checks
M.faction = list("profit")
M.speak = rampant_speeches.Copy()
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 3cf08af5aa8..23e1a69478b 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -506,7 +506,7 @@
var/list/obj/effect/spacevine/queue_end = list()
for( var/obj/effect/spacevine/SV in growth_queue )
- if(SV.gc_destroyed)
+ if(qdeleted(SV))
continue
i++
queue_end += SV
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 3fb52d7d969..03debaf15a9 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -153,7 +153,7 @@
awakening = 1
spawn(30)
- if(!gc_destroyed)
+ if(!qdeleted(src))
var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(get_turf(src.loc))
K.maxHealth += round(endurance / 3)
K.melee_damage_lower += round(potency / 10)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index b13e992671b..fc376776adc 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -111,7 +111,7 @@
/obj/structure/bookcase/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
for(var/obj/item/weapon/book/b in contents)
b.loc = (get_turf(src))
if(prob(50))
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 58d7bc80aa7..584013301ce 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -408,7 +408,7 @@
/obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer)
var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Kinetic Accelerator", "Resonator", "Mining Drone", "Advanced Scanner")
- if(!selection || !Adjacent(redeemer) || voucher.gc_destroyed || voucher.loc != redeemer)
+ if(!selection || !Adjacent(redeemer) || qdeleted(voucher) || voucher.loc != redeemer)
return
switch(selection)
if("Kinetic Accelerator")
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 3dbb25fd26f..417689fc3a3 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -56,7 +56,7 @@ var/global/posibrain_notif_cooldown = 0
return
var/posi_ask = alert("Become a positronic brain? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No")
- if(posi_ask == "No" || gc_destroyed)
+ if(posi_ask == "No" || qdeleted(src))
return
transfer_personality(user)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
index f42d394094f..8b729657470 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm
@@ -35,7 +35,7 @@
user << "Can't become a drone before the game has started."
return
var/be_drone = alert("Become a drone? (Warning, You can no longer be cloned!)",,"Yes","No")
- if(be_drone == "No" || gc_destroyed)
+ if(be_drone == "No" || qdeleted(src))
return
var/mob/living/simple_animal/drone/D = new drone_type(get_turf(loc))
D.key = user.key
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index b343dd4cfff..6e550d9ddaf 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -263,7 +263,7 @@
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "You start [anchored ? "unwrenching" : "wrenching"] [src]..."
if(do_after(user, 20/O.toolspeed, target = src))
- if(gc_destroyed)
+ if(qdeleted(src))
return
user << "You [anchored ? "unwrench" : "wrench"] [src]."
anchored = !anchored
@@ -305,7 +305,7 @@
user.visible_message("[user] starts putting [target] onto the photocopier!", "You start putting [target] onto the photocopier...")
if(do_after(user, 20, target = src))
- if(!target || target.gc_destroyed || gc_destroyed || !Adjacent(target)) //check if the photocopier/target still exists.
+ if(!target || qdeleted(target) || qdeleted(src) || !Adjacent(target)) //check if the photocopier/target still exists.
return
if(target == user)
@@ -343,7 +343,7 @@
return 1
/obj/machinery/photocopier/proc/copier_blocked()
- if(gc_destroyed)
+ if(qdeleted(src))
return
if(loc.density)
return 1
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 98faa83bf9b..d64ca0125d1 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1075,7 +1075,7 @@
/obj/machinery/power/apc/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
switch(severity)
if(2)
if(prob(50))
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 86986001a05..c96952e9024 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -171,7 +171,7 @@ By design, d1 is the smallest direction and d2 is the highest
//explosion handling
/obj/structure/cable/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
switch(severity)
if(2)
if(prob(50))
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index c746754e5bd..956232811f1 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -126,7 +126,7 @@
/obj/item/weapon/stock_parts/cell/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
switch(severity)
if(2)
if(prob(50))
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 0de92685532..bb6b4f5fd45 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -517,7 +517,7 @@
/obj/machinery/light/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
switch(severity)
if(2)
if(prob(50))
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index d7562287e11..836cfc8853a 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -137,7 +137,7 @@
/obj/machinery/power/solar/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
switch(severity)
if(2)
if(prob(50))
@@ -486,7 +486,7 @@
/obj/machinery/power/solar_control/ex_act(severity, target)
..()
- if(!gc_destroyed)
+ if(!qdeleted(src))
switch(severity)
if(2)
if(prob(50))
diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm
index c644c7b17a7..834c0bedf0b 100644
--- a/code/modules/recycling/disposal-structures.dm
+++ b/code/modules/recycling/disposal-structures.dm
@@ -144,7 +144,7 @@
/obj/structure/disposalpipe/New(loc,var/obj/structure/disposalconstruct/make_from)
..()
- if(make_from && !make_from.gc_destroyed)
+ if(make_from && !qdeleted(make_from))
base_icon_state = make_from.base_state
dir = make_from.dir
dpdir = make_from.dpdir
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index ff9539c7e94..83cc7e4df9c 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -211,7 +211,7 @@
playsound(src, 'sound/machines/disposalflush.ogg', 50, 0, 0)
last_sound = world.time
sleep(5)
- if(gc_destroyed)
+ if(qdeleted(src))
return
var/obj/structure/disposalholder/H = new()
newHolderDestination(H)
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index ecbcb21e743..79916907994 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -176,7 +176,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
/obj/effect/proc_holder/spell/proc/start_recharge()
if(action)
action.UpdateButtonIcon()
- while(charge_counter < charge_max && isnull(gc_destroyed))
+ while(charge_counter < charge_max && !qdeleted(src))
sleep(1)
charge_counter++
if(action)
diff --git a/code/modules/spells/spell_types/genetic.dm b/code/modules/spells/spell_types/genetic.dm
index 575ab6767ae..4ad71e12f6a 100644
--- a/code/modules/spells/spell_types/genetic.dm
+++ b/code/modules/spells/spell_types/genetic.dm
@@ -24,7 +24,7 @@
target.dna.add_mutation(A)
target.disabilities |= disabilities
spawn(duration)
- if(target && !target.gc_destroyed)
+ if(target && !qdeleted(target))
for(var/A in mutations)
target.dna.remove_mutation(A)
target.disabilities &= ~disabilities
diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm
index 9de9508525a..985a6448297 100644
--- a/code/modules/spells/spell_types/summonitem.dm
+++ b/code/modules/spells/spell_types/summonitem.dm
@@ -44,7 +44,7 @@
name = "Instant Summons"
marked_item = null
- else if(marked_item && marked_item.gc_destroyed) //the item was destroyed at some point
+ else if(marked_item && qdeleted(marked_item)) //the item was destroyed at some point
message = "You sense your marked item has been destroyed!"
name = "Instant Summons"
marked_item = null