diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
index 19d9d097936..3d45a89d791 100644
--- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
@@ -92,10 +92,10 @@
else
if(node1)
node1.disconnect(src)
- del(network1)
+ qdel(network1)
if(node2)
node2.disconnect(src)
- del(network2)
+ qdel(network2)
node1 = null
node2 = null
diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index b71a55644e5..c13d0f5580c 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -308,4 +308,4 @@
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
+ qdel(src)
diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index da9f1aba444..78fcd687b8f 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -172,4 +172,4 @@
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 0e6c8ffa345..e191bb85b9a 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -204,4 +204,4 @@ Thus, the two variables affect pump operation are set in New():
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index e26396b08fe..6ea82979dcd 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -191,4 +191,4 @@ Thus, the two variables affect pump operation are set in New():
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
index a95186dc7b3..6f4d880a67d 100644
--- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
@@ -90,7 +90,7 @@
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
+ qdel(src)
/obj/machinery/atmospherics/omni/attack_hand(user as mob)
if(..())
@@ -283,7 +283,7 @@
/obj/machinery/atmospherics/omni/disconnect(obj/machinery/atmospherics/reference)
for(var/datum/omni_port/P in ports)
if(reference == P.node)
- del(P.network)
+ qdel(P.network)
P.node = null
P.update = 1
break
diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm
index 1ce9130dc71..64c0cdec852 100644
--- a/code/ATMOSPHERICS/components/portables_connector.dm
+++ b/code/ATMOSPHERICS/components/portables_connector.dm
@@ -125,7 +125,7 @@
/obj/machinery/atmospherics/portables_connector/disconnect(obj/machinery/atmospherics/reference)
if(reference==node)
- del(network)
+ qdel(network)
node = null
update_underlays()
@@ -155,4 +155,4 @@
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
+ qdel(src)
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 9a66d184612..5e1fabcebd3 100755
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -173,7 +173,7 @@ Filter types:
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
+ qdel(src)
/obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index bc3440e4589..796ec44afb9 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -131,7 +131,7 @@
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
+ qdel(src)
/obj/machinery/atmospherics/trinary/mixer/attack_hand(user as mob)
if(..())
diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm
index 5b64a2c83bb..ce4dcf1fb48 100644
--- a/code/ATMOSPHERICS/components/tvalve.dm
+++ b/code/ATMOSPHERICS/components/tvalve.dm
@@ -128,9 +128,9 @@
update_icon()
if(network_node1)
- del(network_node1)
+ qdel(network_node1)
if(network_node3)
- del(network_node3)
+ qdel(network_node3)
build_network()
if(network_node1&&network_node2)
@@ -153,9 +153,9 @@
update_icon()
if(network_node1)
- del(network_node1)
+ qdel(network_node1)
if(network_node2)
- del(network_node2)
+ qdel(network_node2)
build_network()
if(network_node1&&network_node3)
@@ -271,15 +271,15 @@
/obj/machinery/atmospherics/tvalve/disconnect(obj/machinery/atmospherics/reference)
if(reference==node1)
- del(network_node1)
+ qdel(network_node1)
node1 = null
else if(reference==node2)
- del(network_node2)
+ qdel(network_node2)
node2 = null
else if(reference==node3)
- del(network_node3)
+ qdel(network_node3)
node2 = null
update_underlays()
@@ -375,7 +375,7 @@
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
+ qdel(src)
/obj/machinery/atmospherics/tvalve/mirrored
icon_state = "map_tvalvem0"
diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm
index 1fddc3b4c39..3706560e15c 100644
--- a/code/ATMOSPHERICS/components/valve.dm
+++ b/code/ATMOSPHERICS/components/valve.dm
@@ -115,9 +115,9 @@
update_icon()
if(network_node1)
- del(network_node1)
+ qdel(network_node1)
if(network_node2)
- del(network_node2)
+ qdel(network_node2)
build_network()
@@ -222,11 +222,11 @@
/obj/machinery/atmospherics/valve/disconnect(obj/machinery/atmospherics/reference)
if(reference==node1)
- del(network_node1)
+ qdel(network_node1)
node1 = null
else if(reference==node2)
- del(network_node2)
+ qdel(network_node2)
node2 = null
update_underlays()
@@ -330,7 +330,7 @@
"You have unfastened \the [src].", \
"You hear a ratchet.")
new /obj/item/pipe(loc, make_from=src)
- del(src)
+ qdel(src)
/obj/machinery/atmospherics/valve/digital/multitool_menu(var/mob/user,var/obj/item/device/multitool/P)
return {"
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 17a35c9ba7d..29838e443ba 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -756,7 +756,7 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
animation.master = target
flick(flick_anim, animation)
sleep(max(sleeptime, 15))
- del(animation)
+ qdel(animation)
//Will return the contents of an atom recursivly to a depth of 'searchDepth'
/atom/proc/GetAllContents(searchDepth = 5)
@@ -1017,7 +1017,7 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
X.icon = 'icons/turf/shuttle.dmi'
X.icon_state = replacetext(O.icon_state, "_f", "_s") // revert the turf to the old icon_state
X.name = "wall"
- del(O) // prevents multiple shuttle corners from stacking
+ qdel(O) // prevents multiple shuttle corners from stacking
continue
if(!istype(O,/obj)) continue
O.loc.Exited(O)
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index c00a79e1e6b..6f31c627f96 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -351,7 +351,7 @@
s.set_up(5, 1, src)
s.start()
if(L.damage <= 0)
- del(L)
+ qdel(L)
if(L)
playsound(get_turf(src), 'sound/effects/eleczap.ogg', 75, 1)
L.tang = L.adjustAngle(get_angle(U,T))
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 46662142fba..9b4dd88e67e 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -80,14 +80,14 @@ var/const/tk_maxrange = 15
if(focus.Adjacent(loc))
focus.loc = loc
- del(src)
+ qdel(src)
return
//stops TK grabs being equipped anywhere but into hands
equipped(var/mob/user, var/slot)
if( (slot == slot_l_hand) || (slot== slot_r_hand) ) return
- del(src)
+ qdel(src)
return
@@ -99,10 +99,10 @@ var/const/tk_maxrange = 15
if(!target || !user) return
if(last_throw+3 > world.time) return
if(!host || host != user)
- del(src)
+ qdel(src)
return
if(!(TK in host.mutations))
- del(src)
+ qdel(src)
return
if(isobj(target) && !isturf(target.loc))
return
@@ -143,7 +143,7 @@ var/const/tk_maxrange = 15
proc/focus_object(var/obj/target, var/mob/living/user)
if(!istype(target,/obj)) return//Cant throw non objects atm might let it do mobs later
if(target.anchored || !isturf(target.loc))
- del src
+ qdel(src)
return
focus = target
update_icon()
diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm
index 6fc3faab894..6f47d5c8542 100644
--- a/code/controllers/communications.dm
+++ b/code/controllers/communications.dm
@@ -226,7 +226,7 @@ var/global/datum/controller/radio/radio_controller
frequency.remove_listener(device)
if(frequency.devices.len == 0)
- del(frequency)
+ qdel(frequency)
frequencies -= f_text
return 1
@@ -251,7 +251,7 @@ var/global/datum/controller/radio/radio_controller
if(range)
start_point = get_turf(source)
if(!start_point)
- del(signal)
+ qdel(signal)
return 0
if (filter)
send_to_filter(source, signal, filter, start_point, range)
@@ -300,7 +300,7 @@ var/global/datum/controller/radio/radio_controller
devices_line -= null
if (devices_line.len==0)
devices -= devices_filter
- del(devices_line)
+ qdel(devices_line)
/datum/signal
var/obj/source
diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm
index 94ab1f5be40..4194567ae10 100644
--- a/code/controllers/emergency_shuttle_controller.dm
+++ b/code/controllers/emergency_shuttle_controller.dm
@@ -215,7 +215,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
if (online())
if (is_stranded())
return "ETA-ERR"
-
+
if (waiting_to_leave())
if (shuttle.moving_status == SHUTTLE_WARMUP)
return "Departing..."
@@ -256,7 +256,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
sleep(speed)
step(src, direction)
for(var/obj/effect/starender/E in loc)
- del(src)
+ qdel(src)
/obj/effect/starender
diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
index e1fc26d1709..02c4304cf30 100644
--- a/code/datums/ai_laws.dm
+++ b/code/datums/ai_laws.dm
@@ -165,7 +165,7 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
src.ion += law
/datum/ai_laws/proc/clear_inherent_laws()
- del(src.inherent)
+ qdel(src.inherent)
src.inherent = list()
/datum/ai_laws/proc/add_supplied_law(var/number, var/law)
@@ -179,7 +179,7 @@ datum/ai_laws/tyrant //This probably shouldn't be a default lawset.
/datum/ai_laws/proc/clear_ion_laws()
src.ion = list()
-
+
/datum/ai_laws/proc/clear_zeroth_law(var/law_borg = null)
src.zeroth = null
if(law_borg)
diff --git a/code/datums/cargoprofile.dm b/code/datums/cargoprofile.dm
index 90b7930937b..282d402a74d 100644
--- a/code/datums/cargoprofile.dm
+++ b/code/datums/cargoprofile.dm
@@ -384,13 +384,13 @@
if(istype(W,/obj/item/stack))
var/obj/item/stack/I = W
if(!I.amount) // todo: am I making a bad assumption here?
- del I
+ qdel(I)
return
for(var/obj/item/stack/O in master.contents)
if(O.type == I.type && O.amount < O.max_amount)
if(I.amount + O.amount <= O.max_amount)
O.amount += I.amount
- del I
+ qdel(I)
return O.w_class
var/leftover = I.amount + O.amount - O.max_amount
O.amount = O.max_amount
@@ -403,13 +403,13 @@
if(istype(W,/obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/I = W
if(!I.amount) // todo: am I making a bad assumption here?
- del I
+ qdel(I)
return
for(var/obj/item/stack/cable_coil/O in master.contents)
if(O.type == I.type && O.amount < MAXCOIL)
if(I.amount + O.amount <= MAXCOIL)
O.amount += I.amount
- del I
+ qdel(I)
return O.w_class
var/leftover = I.amount + O.amount - MAXCOIL
O.amount = MAXCOIL
@@ -473,7 +473,7 @@
if(O.type == I.type && O.amount < O.max_amount)
if(I.amount + O.amount <= O.max_amount)
O.amount += I.amount
- del I
+ qdel(I)
return
var/leftover = I.amount + O.amount - O.max_amount
O.amount = O.max_amount
@@ -489,7 +489,7 @@
if(I.amount + O.amount <= MAXCOIL) // Why did they make it a #define.
O.amount += I.amount
O.update_icon()
- del I
+ qdel(I)
return
var/leftover = I.amount + O.amount - MAXCOIL // That wasn't a question
O.amount = MAXCOIL // It was a complaint
@@ -572,13 +572,13 @@
outlet_reaction(var/atom/W,var/turf/D)
if(istype(W,/obj/item/weapon/paper/crumpled))
- del W
+ qdel(W)
return
if(istype(W,/obj/item/weapon/clipboard) || istype(W,/obj/item/weapon/folder))
// destroy folder, various effects on contents
for(var/obj/item/I in W.contents)
if(prob(25))//JUNK IT
- del I
+ qdel(I)
else if(prob(50)) //We've been over this. I can't just take it apart with a crowbar.
var/obj/item/weapon/paper/crumpled/P = new(master.loc)
if(I.name)
@@ -589,11 +589,11 @@
if(istype(I,/obj/item/weapon/paper))
var/obj/item/weapon/paper/O = I
P.info = garble_keeptags(O.info)
- del I
+ qdel(I)
..(P,D)
else
..(I,D) // Eject
- del W //destroy container
+ qdel(W) //destroy container
return
if(prob(50)) //JUNK IT NOW!
var/obj/item/weapon/paper/crumpled/P = new(master.loc)
@@ -612,10 +612,10 @@
P.info = garble_keeptags(B.dat)
if(B.carved && B.store)
..(B.store,D)
- del W
+ qdel(W)
..(P,D)
else //I want it junked
- del W
+ qdel(W)
return
/datum/cargoprofile/unary/gibber
diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm
index 0eb4d73dfde..3266887dafa 100644
--- a/code/datums/helper_datums/construction_datum.dm
+++ b/code/datums/helper_datums/construction_datum.dm
@@ -13,7 +13,7 @@
holder = atom
if(!holder) //don't want this without a holder
spawn
- del src
+ qdel(src)
set_desc(steps.len)
return
@@ -97,7 +97,7 @@
new result(get_turf(holder))
spawn()
- del holder
+ qdel(holder)
return
proc/set_desc(index as num)
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 2111c200148..d4ea02baea9 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -172,7 +172,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
spell.anchored = 1
spell.density = 0
spawn(overlay_lifespan)
- del(spell)
+ qdel(spell)
/obj/effect/proc_holder/spell/wizard/proc/after_cast(list/targets)
for(var/atom/target in targets)
diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm
index cabde8c7181..2a1663f503b 100644
--- a/code/datums/spells/charge.dm
+++ b/code/datums/spells/charge.dm
@@ -35,7 +35,7 @@
var/obj/item/weapon/spellbook/oneuse/I = item
if(prob(80))
user.visible_message("[I] catches fire!")
- del(I)
+ qdel(I)
else
I.used = 0
charged_item = I
diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index be246ac21b3..182597240b8 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -46,7 +46,7 @@
if(summon_lifespan)
spawn(summon_lifespan)
if(summoned_object)
- del(summoned_object)
+ qdel(summoned_object)
else
switch(charge_type)
if("recharge")
diff --git a/code/datums/spells/dumbfire.dm b/code/datums/spells/dumbfire.dm
index 902e35eb257..6265b757c5f 100644
--- a/code/datums/spells/dumbfire.dm
+++ b/code/datums/spells/dumbfire.dm
@@ -76,11 +76,11 @@
trail.icon_state = proj_trail_icon_state
trail.density = 0
spawn(proj_trail_lifespan)
- del(trail)
+ qdel(trail)
current_loc = projectile.loc
sleep(proj_step_delay)
if(projectile)
- del(projectile)
\ No newline at end of file
+ qdel(projectile)
\ No newline at end of file
diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm
index 035a3ab7416..990418077af 100644
--- a/code/datums/spells/horsemask.dm
+++ b/code/datums/spells/horsemask.dm
@@ -41,7 +41,7 @@
target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \
"Your face burns up, and shortly after the fire you realise you have the face of a horse!")
if(!target.unEquip(target.wear_mask))
- del target.wear_mask
+ qdel(target.wear_mask)
target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
flick("e_flash", target.flash)
diff --git a/code/datums/spells/projectile.dm b/code/datums/spells/projectile.dm
index d5392c465ae..0db35126322 100644
--- a/code/datums/spells/projectile.dm
+++ b/code/datums/spells/projectile.dm
@@ -61,7 +61,7 @@
break
if(!proj_lingering && projectile.loc == current_loc) //if it didn't move since last time
- del(projectile)
+ qdel(projectile)
break
if(proj_trail && projectile)
@@ -72,7 +72,7 @@
trail.icon_state = proj_trail_icon_state
trail.density = 0
spawn(proj_trail_lifespan)
- del(trail)
+ qdel(trail)
if(projectile.loc in range(target.loc,proj_trigger_range))
projectile.perform(list(target))
@@ -83,4 +83,4 @@
sleep(proj_step_delay)
if(projectile)
- del(projectile)
\ No newline at end of file
+ qdel(projectile)
\ No newline at end of file
diff --git a/code/defines/procs/records.dm b/code/defines/procs/records.dm
index 4e9fbcc9afc..256ae51dbf2 100644
--- a/code/defines/procs/records.dm
+++ b/code/defines/procs/records.dm
@@ -22,7 +22,7 @@
G.fields["photo_side"] = side
data_core.general += G
- del(dummy)
+ qdel(dummy)
return G
/proc/CreateSecurityRecord(var/name as text, var/id as text)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index c2b5c8e9844..eadaf5704ff 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -160,7 +160,7 @@ its easier to just keep the beam vertical.
for(var/obj/effect/overlay/beam/O in orange(10,src)) //This section erases the previously drawn beam because I found it was easier to
if(O.BeamSource==src) //just draw another instance of the beam instead of trying to manipulate all the
- del O //pieces to a new orientation.
+ qdel(O) //pieces to a new orientation.
var/Angle=round(Get_Angle(src,BeamTarget))
var/icon/I=new(icon,icon_state)
I.Turn(Angle)
@@ -201,7 +201,7 @@ its easier to just keep the beam vertical.
X.pixel_y=Pixel_y
var/turf/TT = get_turf(X.loc)
if(TT.density)
- del(X)
+ qdel(X)
break
for(var/obj/O in TT)
if(!O.CanPass(light))
@@ -211,11 +211,11 @@ its easier to just keep the beam vertical.
broken = 1
break
if(broken)
- del(X)
+ qdel(X)
break
sleep(3) //Changing this to a lower value will cause the beam to follow more smoothly with movement, but it will also be more laggy.
//I've found that 3 ticks provided a nice balance for my use.
- for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) del O
+ for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) qdel(O)
//All atoms
@@ -402,7 +402,7 @@ its easier to just keep the beam vertical.
/atom/proc/clean_blood()
src.germ_level = 0
if(istype(blood_DNA, /list))
- del(blood_DNA)
+ qdel(blood_DNA)
return 1
/atom/proc/add_vomit_floor(mob/living/carbon/M as mob, var/toxvomit = 0)
diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm
index 7410abd2445..5fc65bc9fc9 100644
--- a/code/game/dna/genes/vg_powers.dm
+++ b/code/game/dna/genes/vg_powers.dm
@@ -161,7 +161,7 @@ Obviously, requires DNA2.
for(var/x in all_hairs)
var/datum/sprite_accessory/hair/H = new x // create new hair datum based on type x
hairs.Add(H.name) // add hair name to hairs
- del(H) // delete the hair after it's all done
+ qdel(H) // delete the hair after it's all done
var/new_style = input("Please select hair style", "Character Generation",M.h_style) as null|anything in hairs
@@ -176,7 +176,7 @@ Obviously, requires DNA2.
for(var/x in all_fhairs)
var/datum/sprite_accessory/facial_hair/H = new x
fhairs.Add(H.name)
- del(H)
+ qdel(H)
new_style = input("Please select facial style", "Character Generation",M.f_style) as null|anything in fhairs
diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm
index fc96912fadf..f56a5951fd5 100644
--- a/code/game/gamemodes/blob/blobs/core.dm
+++ b/code/game/gamemodes/blob/blobs/core.dm
@@ -65,7 +65,7 @@
overmind_get_delay = world.time + 300 // 30 seconds
if(overmind)
- del(overmind)
+ qdel(overmind)
var/client/C = null
var/list/candidates = list()
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index b6656b349db..5e17610c16d 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -167,7 +167,7 @@
return
proc/Delete()
- del(src)
+ qdel(src)
/obj/effect/blob/normal
icon_state = "blob"
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index dc85a82d195..ae9bce1e1bc 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -22,12 +22,12 @@
/obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target)
if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh
- del(user.l_hand)
+ qdel(user.l_hand)
user.visible_message("With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!")
- del(H.wear_suit)
- del(H.head)
+ qdel(H.wear_suit)
+ qdel(H.head)
H.update_inv_wear_suit()
H.update_inv_head()
H.update_hair()
@@ -140,7 +140,7 @@
/obj/item/weapon/melee/arm_blade/dropped(mob/user)
user.visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!")
/obj/item/weapon/shield/changeling/dropped()
- del(src)
+ qdel(src)
/obj/item/weapon/shield/changeling/IsShield()
if(remaining_uses < 1)
@@ -224,7 +224,7 @@
var/mob/living/carbon/human/H = loc
H.visible_message("With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!")
/obj/item/clothing/suit/armor/changeling/dropped()
- del(src)
+ qdel(src)
/obj/item/clothing/head/helmet/changeling
name = "chitinous mass"
@@ -332,4 +332,4 @@
flags_inv = HIDEEARS
/obj/item/clothing/head/helmet/changeling/dropped()
- del(src)
+ qdel(src)
diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm
index 501aecae5d3..3fc888f8cac 100644
--- a/code/game/gamemodes/changeling/powers/revive.dm
+++ b/code/game/gamemodes/changeling/powers/revive.dm
@@ -44,7 +44,7 @@
if(istype(s))
O.implants -= s
H.contents -= s
- del(s)
+ qdel(s)
O.brute_dam = 0
O.burn_dam = 0
O.damage_state = "00"
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index e2a7798c8c7..392441428d1 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -200,7 +200,7 @@
// remove the cult viewpoint object
var/obj/viewpoint = getCultViewpoint(cult_mind.current)
- del(viewpoint)
+ qdel(viewpoint)
update_cult_icons_removed(cult_mind)
if(show_message)
@@ -243,13 +243,13 @@
/datum/game_mode/proc/remove_cult_icon(client/target_client,mob/target_mob)
for(var/image/I in target_client.images)
if(I.icon_state == "cult" && I.loc == target_mob)
- del(I)
+ qdel(I)
/datum/game_mode/proc/remove_all_cult_icons_from_client(client/target)
for(var/image/I in target.images)
if(I.icon_state == "cult")
- del(I)
+ qdel(I)
/datum/game_mode/proc/remove_all_cult_icons(target)
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 5bb92c6c748..98451fe2ee7 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -95,11 +95,11 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
/obj/effect/rune/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/tome) && iscultist(user))
user << "You retrace your steps, carefully undoing the lines of the rune."
- del(src)
+ qdel(src)
return
else if(istype(I, /obj/item/weapon/nullrod))
user << "\blue You disrupt the vile magic with the deadening field of the null rod!"
- del(src)
+ qdel(src)
return
return
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index a8ebc32995d..d6343e88142 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -22,7 +22,7 @@ var/list/sacrificed = list()
user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric"
if (istype(user, /mob/living))
user.take_overall_damage(5, 0)
- del(src)
+ qdel(src)
if(allrunesloc && index != 0)
if(istype(src,/obj/effect/rune))
user.say("Sas[pick("'","`")]so c'arta forbici!")//Only you can stop auto-muting
@@ -60,7 +60,7 @@ var/list/sacrificed = list()
user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric"
if (istype(user, /mob/living))
user.take_overall_damage(5, 0)
- del(src)
+ qdel(src)
for(var/mob/living/carbon/C in orange(1,src))
if(iscultist(C) && !C.stat)
culcount++
@@ -93,7 +93,7 @@ var/list/sacrificed = list()
new /obj/item/weapon/tome(src.loc)
else
new /obj/item/weapon/tome(usr.loc)
- del(src)
+ qdel(src)
return
@@ -158,7 +158,7 @@ var/list/sacrificed = list()
T.hotspot_expose(700,125)
var/rune = src // detaching the proc - in theory
empulse(U, (range_red - 2), range_red)
- del(rune)
+ qdel(rune)
return
/////////////////////////////////////////SIXTH RUNE
@@ -320,7 +320,7 @@ var/list/sacrificed = list()
usr.say("Kla[pick("'","`")]atu barada nikt'o!")
for (var/mob/V in viewers(src))
V.show_message("\red The rune turns into gray dust, veiling the surrounding runes.", 3)
- del(src)
+ qdel(src)
else
usr.whisper("Kla[pick("'","`")]atu barada nikt'o!")
usr << "\red Your talisman turns into gray dust, veiling the surrounding runes."
@@ -495,8 +495,8 @@ var/list/sacrificed = list()
for (var/mob/V in viewers(src))
V.show_message("\red The runes turn into dust, which then forms into an arcane image on the paper.", 3)
usr.say("H'drak v[pick("'","`")]loso, mir'kanas verbot!")
- del(imbued_from)
- del(newtalisman)
+ qdel(imbued_from)
+ qdel(newtalisman)
else
return fizzle()
@@ -565,7 +565,7 @@ var/list/sacrificed = list()
for(var/mob/spirit/spirit in spirits)
spirit << "[displayName]: [input]"
- del(src)
+ qdel(src)
return 1
/////////////////////////////////////////FIFTEENTH RUNE
@@ -711,7 +711,7 @@ var/list/sacrificed = list()
usr.say("Nikt[pick("'","`")]o barada kla'atu!")
for (var/mob/V in viewers(src))
V.show_message("\red The rune turns into red dust, reveaing the surrounding runes.", 3)
- del(src)
+ qdel(src)
return
if(istype(W,/obj/item/weapon/paper/talisman))
usr.whisper("Nikt[pick("'","`")]o barada kla'atu!")
@@ -787,7 +787,7 @@ var/list/sacrificed = list()
for(var/mob/living/carbon/C in users)
user.take_overall_damage(15, 0)
C.say("Khari[pick("'","`")]d! Gual'te nikka!")
- del(src)
+ qdel(src)
return fizzle()
/////////////////////////////////////////NINETEENTH RUNE
@@ -821,7 +821,7 @@ var/list/sacrificed = list()
user.visible_message("\red Rune disappears with a flash of red light, and in its place now a body lies.", \
"\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \
"\red You hear a pop and smell ozone.")
- del(src)
+ qdel(src)
return fizzle()
/////////////////////////////////////////TWENTIETH RUNES
@@ -843,7 +843,7 @@ var/list/sacrificed = list()
if(affected)
usr.say("Sti[pick("'","`")] kaliedir!")
usr << "\red The world becomes quiet as the deafening rune dissipates into fine dust."
- del(src)
+ qdel(src)
else
return fizzle()
else
@@ -886,7 +886,7 @@ var/list/sacrificed = list()
if(affected)
usr.say("Sti[pick("'","`")] kaliesin!")
usr << "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust."
- del(src)
+ qdel(src)
else
return fizzle()
else
@@ -940,7 +940,7 @@ var/list/sacrificed = list()
if(iscultist(C) && !C.stat)
C.say("Dedo ol[pick("'","`")]btoh!")
C.take_overall_damage(15, 0)
- del(src)
+ qdel(src)
else
return fizzle()
return
@@ -970,8 +970,8 @@ var/list/sacrificed = list()
M << "\red Blood suddenly ignites, burning you!"
var/turf/T = get_turf(B)
T.hotspot_expose(700,125)
- del(B)
- del(src)
+ qdel(B)
+ qdel(src)
////////// Rune 24 (counting burningblood, which kinda doesnt work yet.)
@@ -993,7 +993,7 @@ var/list/sacrificed = list()
var/mob/living/silicon/S = L
S.Weaken(5)
S.show_message("\red BZZZT... The rune has exploded in a bright flash.", 3)
- del(src)
+ qdel(src)
else ///When invoked as talisman, stun and mute the target mob.
usr.say("Dream sign ''Evil sealing talisman'[pick("'","`")]!")
var/obj/item/weapon/nullrod/N = locate() in T
@@ -1035,5 +1035,5 @@ var/list/sacrificed = list()
//the below calls update_icons() at the end, which will update overlay icons by using the (now updated) cache
user.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) //put in hands or on floor
- del(src)
+ qdel(src)
return
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index 2276eccbfac..bb5378cfac3 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -41,7 +41,7 @@
user.take_organ_damage(5, 0)
if(src && src.imbue!="supply" && src.imbue!="runestun")
if(delete)
- del(src)
+ qdel(src)
return
else
user << "You see strange symbols on the paper. Are they supposed to mean something?"
@@ -53,7 +53,7 @@
if(imbue == "runestun")
user.take_organ_damage(5, 0)
call(/obj/effect/rune/proc/runestun)(T)
- del(src)
+ qdel(src)
else
..() ///If its some other talisman, use the generic attack code, is this supposed to work this way?
else
@@ -62,7 +62,7 @@
proc/supply(var/key)
if (!src.uses)
- del(src)
+ qdel(src)
return
var/dat = "There are [src.uses] bloody runes on the parchment.
"
diff --git a/code/game/gamemodes/events/biomass.dm b/code/game/gamemodes/events/biomass.dm
index c338c34815e..9bc0bbe330d 100644
--- a/code/game/gamemodes/events/biomass.dm
+++ b/code/game/gamemodes/events/biomass.dm
@@ -23,24 +23,24 @@
/obj/effect/biomass/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (!W || !user || !W.type) return
switch(W.type)
- if(/obj/item/weapon/circular_saw) del src
- if(/obj/item/weapon/kitchen/utensil/knife) del src
- if(/obj/item/weapon/scalpel) del src
- if(/obj/item/weapon/twohanded/fireaxe) del src
- if(/obj/item/weapon/hatchet) del src
- if(/obj/item/weapon/melee/energy) del src
+ if(/obj/item/weapon/circular_saw) qdel(src)
+ if(/obj/item/weapon/kitchen/utensil/knife) qdel(src)
+ if(/obj/item/weapon/scalpel) qdel(src)
+ if(/obj/item/weapon/twohanded/fireaxe) qdel(src)
+ if(/obj/item/weapon/hatchet) qdel(src)
+ if(/obj/item/weapon/melee/energy) qdel(src)
//less effective weapons
if(/obj/item/weapon/wirecutters)
- if(prob(25)) del src
+ if(prob(25)) qdel(src)
if(/obj/item/weapon/shard)
- if(prob(25)) del src
+ if(prob(25)) qdel(src)
else //weapons with subtypes
- if(istype(W, /obj/item/weapon/melee/energy/sword)) del src
+ if(istype(W, /obj/item/weapon/melee/energy/sword)) qdel(src)
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
- if(WT.remove_fuel(0, user)) del src
+ if(WT.remove_fuel(0, user)) qdel(src)
else
return
..()
@@ -55,7 +55,7 @@
New()
if(!istype(src.loc,/turf/simulated/floor))
- del(src)
+ qdel(src)
spawn_biomass_piece(src.loc)
processing_objects.Add(src)
@@ -72,10 +72,10 @@
process()
if(!vines)
- del(src) //space vines exterminated. Remove the controller
+ qdel(src) //space vines exterminated. Remove the controller
return
if(!growth_queue)
- del(src) //Sanity check
+ qdel(src) //Sanity check
return
if(vines.len >= 250 && !reached_collapse_size)
reached_collapse_size = 1
@@ -155,7 +155,7 @@
return
/obj/effect/biomass/fire_act(null, temp, volume) //hotspots kill biomass
- del src
+ qdel(src)
/datum/event/biomass/start()
biomass_infestation()
diff --git a/code/game/gamemodes/events/black_hole.dm b/code/game/gamemodes/events/black_hole.dm
index 6ff7babbeba..582e0d08234 100644
--- a/code/game/gamemodes/events/black_hole.dm
+++ b/code/game/gamemodes/events/black_hole.dm
@@ -16,14 +16,14 @@
while(src)
if(!isturf(loc))
- del(src)
+ qdel(src)
return
//DESTROYING STUFF AT THE EPICENTER
for(var/mob/living/M in orange(1,src))
- del(M)
+ qdel(M)
for(var/obj/O in orange(1,src))
- del(O)
+ qdel(O)
for(var/turf/simulated/ST in orange(1,src))
ST.ChangeTurf(/turf/space)
@@ -57,7 +57,7 @@
/obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
if(!isturf(loc)) //blackhole cannot be contained inside anything. Weird stuff might happen
- del(src)
+ qdel(src)
return
for(var/t = -r, t < r, t++)
affect_coord(x+t, y-r, ex_act_force, pull_chance, turf_removal_chance)
diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm
index 560e86ec8bb..3f2117d6a8b 100644
--- a/code/game/gamemodes/events/clang.dm
+++ b/code/game/gamemodes/events/clang.dm
@@ -36,7 +36,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if(clong.density || prob(10))
clong.ex_act(2)
else
- del(src)
+ qdel(src)
if(clong && prob(25))
src.loc = clong.loc
@@ -81,7 +81,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if ((immrod.z in config.station_levels))
immrod.z = 1
if(immrod.loc == end)
- del(immrod)
+ qdel(immrod)
sleep(10)
for(var/obj/effect/immovablerod/imm in world)
return
diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm
index 83eb7ad882d..bf14237639b 100644
--- a/code/game/gamemodes/events/wormholes.dm
+++ b/code/game/gamemodes/events/wormholes.dm
@@ -62,4 +62,4 @@
P.icon_state = "anom"
P.name = "wormhole"
spawn(rand(300,600))
- del(P)
\ No newline at end of file
+ qdel(P)
\ No newline at end of file
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index a56351e2e94..26c88144d78 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -340,8 +340,8 @@ var/global/datum/controller/gameticker/ticker
//If its actually the end of the round, wait for it to end.
//Otherwise if its a verb it will continue on afterwards.
spawn(300)
- if(cinematic) del(cinematic) //end the cinematic
- if(temp_buckle) del(temp_buckle) //release everybody
+ if(cinematic) qdel(cinematic) //end the cinematic
+ if(temp_buckle) qdel(temp_buckle) //release everybody
return
diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 16a452ac651..965b81c2c5e 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -287,6 +287,6 @@ datum/game_mode/proc/auto_declare_completion_heist()
var/area/skipjack = locate(/area/shuttle/vox/station)
for (var/mob/living/M in skipjack.contents)
//maybe send the player a message that they've gone home/been kidnapped? Someone responsible for vox lore should write that.
- del(M)
+ qdel(M)
for (var/obj/O in skipjack.contents)
- del(O) //no hiding in lockers or anything
\ No newline at end of file
+ qdel(O) //no hiding in lockers or anything
\ No newline at end of file
diff --git a/code/game/gamemodes/mutiny/auth_key.dm b/code/game/gamemodes/mutiny/auth_key.dm
index 1f7ea3c888b..90f7b2c23e2 100644
--- a/code/game/gamemodes/mutiny/auth_key.dm
+++ b/code/game/gamemodes/mutiny/auth_key.dm
@@ -26,7 +26,7 @@
else if (in_space && time_entered_space + (10 SECONDS) < world.time)
// Time is up
radio.autosay("This device has left the station's perimeter. Triggering emergency activation failsafe.", name)
- del(src)
+ qdel(src)
return
spawn(10 SECONDS)
diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm
index 2068f4ac09d..6e63263c75b 100644
--- a/code/game/gamemodes/mutiny/mutiny.dm
+++ b/code/game/gamemodes/mutiny/mutiny.dm
@@ -135,11 +135,11 @@ datum/game_mode/mutiny
var/slots = get_equipment_slots()
switch(faction)
if("loyalist")
- if(captains_key) del(captains_key)
+ if(captains_key) qdel(captains_key)
captains_key = new(H)
H.equip_in_one_of_slots(captains_key, slots)
if("mutineer")
- if(secondary_key) del(secondary_key)
+ if(secondary_key) qdel(secondary_key)
secondary_key = new(H)
H.equip_in_one_of_slots(secondary_key, slots)
@@ -190,7 +190,7 @@ datum/game_mode/mutiny
proc/replace_nuke_with_ead()
for(var/obj/machinery/nuclearbomb/N in world)
ead = new(N.loc, src)
- del(N)
+ qdel(N)
proc/unbolt_vault_door()
var/obj/machinery/door/airlock/vault = locate(/obj/machinery/door/airlock/vault)
@@ -247,11 +247,11 @@ datum/game_mode/mutiny
for(var/image/I in head_loyalist.current.client.images)
if(I.loc == M.current && (I.icon_state == "loyalist" || I.icon_state == "mutineer"))
- del(I)
+ qdel(I)
for(var/image/I in head_mutineer.current.client.images)
if(I.loc == M.current && (I.icon_state == "loyalist" || I.icon_state == "mutineer"))
- del(I)
+ qdel(I)
if(M in loyalists)
var/I = image('icons/mob/mob.dmi', loc=M.current, icon_state = "loyalist")
diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm
index afaab542d73..52df698a96f 100644
--- a/code/game/gamemodes/nations/nations.dm
+++ b/code/game/gamemodes/nations/nations.dm
@@ -40,7 +40,7 @@ datum/game_mode/nations
/datum/game_mode/nations/proc/remove_flags()
for(var/obj/item/flag/F in world)
- del(F)
+ qdel(F)
/datum/game_mode/nations/proc/spawn_flags()
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index c49f75a4737..096b3d72bcb 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -73,7 +73,7 @@ proc/issyndicate(mob/living/M as mob)
if(synd_mind.current.client)
for(var/image/I in synd_mind.current.client.images)
if(I.icon_state == "synd")
- del(I)
+ qdel(I)
for(var/datum/mind/synd_mind in syndicates)
if(synd_mind.current)
@@ -97,13 +97,13 @@ proc/issyndicate(mob/living/M as mob)
if(synd.current.client)
for(var/image/I in synd.current.client.images)
if(I.icon_state == "synd" && I.loc == synd_mind.current)
- del(I)
+ qdel(I)
if(synd_mind.current)
if(synd_mind.current.client)
for(var/image/I in synd_mind.current.client.images)
if(I.icon_state == "synd")
- del(I)
+ qdel(I)
////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 833f161f541..bc29494d6ea 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -159,7 +159,7 @@
var/n="[tmp_object]"
item_names+=n
item_paths[n]=typepath
- del(tmp_object)
+ qdel(tmp_object)
var/targetitem = input("Select item to search for.", "Item Mode Select","") as null|anything in potential_theft_objectives
if(!targetitem)
return
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index e49914896ad..ad9b8390253 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -598,7 +598,7 @@ datum/objective/steal
if (!O.typepath) return
var/tmp_obj = new O.typepath
var/custom_name = tmp_obj:name
- del(tmp_obj)
+ qdel(tmp_obj)
O.name = sanitize(copytext(input("Enter target name:", "Objective target", custom_name) as text|null,1,MAX_NAME_LEN))
if (!O.name) return
steal_target = O
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index a3a434b6926..591d5f8f5ba 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -277,14 +277,14 @@
if(head_rev_mind.current.client)
for(var/image/I in head_rev_mind.current.client.images)
if(I.icon_state == "rev" || I.icon_state == "rev_head")
- del(I)
+ qdel(I)
for(var/datum/mind/rev_mind in revolutionaries)
if(rev_mind.current)
if(rev_mind.current.client)
for(var/image/I in rev_mind.current.client.images)
if(I.icon_state == "rev" || I.icon_state == "rev_head")
- del(I)
+ qdel(I)
for(var/datum/mind/head_rev in head_revolutionaries)
if(head_rev.current)
@@ -346,20 +346,20 @@
if(head_rev_mind.current.client)
for(var/image/I in head_rev_mind.current.client.images)
if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current)
- del(I)
+ qdel(I)
for(var/datum/mind/rev_mind_1 in revolutionaries)
if(rev_mind_1.current)
if(rev_mind_1.current.client)
for(var/image/I in rev_mind_1.current.client.images)
if((I.icon_state == "rev" || I.icon_state == "rev_head") && I.loc == rev_mind.current)
- del(I)
+ qdel(I)
if(rev_mind.current)
if(rev_mind.current.client)
for(var/image/I in rev_mind.current.client.images)
if(I.icon_state == "rev" || I.icon_state == "rev_head")
- del(I)
+ qdel(I)
//////////////////////////
//Checks for rev victory//
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index cfbc8491fc5..da997300aa1 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -141,7 +141,7 @@
for(var/x in typesof(/datum/faction))
var/datum/faction/F = new x
if(!F.name)
- del(F)
+ qdel(F)
continue
else
ticker.factions.Add(F)
diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm
index 42a4a4ee3e5..c1acd926c97 100644
--- a/code/game/gamemodes/shadowling/shadowling.dm
+++ b/code/game/gamemodes/shadowling/shadowling.dm
@@ -279,17 +279,17 @@ Made by Xhuis
if(shadowling.current.client)
for(var/image/I in shadowling.current.client.images)
if((I.icon_state == "thrall" || I.icon_state == "shadowling") && I.loc == shadow_mind.current)
- del(I)
+ qdel(I)
for(var/datum/mind/thrall in thralls)
if(thrall.current)
if(thrall.current.client)
for(var/image/I in thrall.current.client.images)
if((I.icon_state == "thrall" || I.icon_state == "shadowling") && I.loc == shadow_mind.current)
- del(I)
+ qdel(I)
if(shadow_mind.current)
if(shadow_mind.current.client)
for(var/image/I in shadow_mind.current.client.images)
if(I.icon_state == "thrall" || I.icon_state == "shadowling")
- del(I)
+ qdel(I)
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 81550b232d6..ae4e41babed 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -375,7 +375,7 @@
for(var/image/I in t_mind.current.client.images)
if((I.icon_state == "greytide" || I.icon_state == "greytide_head") && I.loc == traitor_mind.current)
//world.log << "deleting [traitor_mind] overlay"
- del(I)
+ qdel(I)
if(head)
//world.log << "found [head.name]"
if(head.current)
@@ -383,12 +383,12 @@
for(var/image/I in head.current.client.images)
if((I.icon_state == "greytide" || I.icon_state == "greytide_head") && I.loc == traitor_mind.current)
//world.log << "deleting [traitor_mind] overlay"
- del(I)
+ qdel(I)
if(traitor_mind.current)
if(traitor_mind.current.client)
for(var/image/I in traitor_mind.current.client.images)
if(I.icon_state == "greytide" || I.icon_state == "greytide_head")
- del(I)
+ qdel(I)
/datum/game_mode/proc/remove_traitor_mind(datum/mind/traitor_mind, datum/mind/head)
//var/list/removal
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 87d862e1aa4..e9757a4a83b 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -417,7 +417,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
for(var/image/I in t_mind.current.client.images)
if((I.icon_state == "vampthrall" || I.icon_state == "vampire") && I.loc == vampire_mind.current)
//world.log << "deleting [vampire_mind] overlay"
- del(I)
+ qdel(I)
if(head)
//world.log << "found [head.name]"
if(head.current)
@@ -425,12 +425,12 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
for(var/image/I in head.current.client.images)
if((I.icon_state == "vampthrall" || I.icon_state == "vampire") && I.loc == vampire_mind.current)
//world.log << "deleting [vampire_mind] overlay"
- del(I)
+ qdel(I)
if(vampire_mind.current)
if(vampire_mind.current.client)
for(var/image/I in vampire_mind.current.client.images)
if(I.icon_state == "vampthrall" || I.icon_state == "vampire")
- del(I)
+ qdel(I)
/datum/game_mode/proc/remove_vampire_mind(datum/mind/vampire_mind, datum/mind/head)
//var/list/removal
diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm
index 8b0797a8d7a..009126c5731 100644
--- a/code/game/gamemodes/vampire/vampire_powers.dm
+++ b/code/game/gamemodes/vampire/vampire_powers.dm
@@ -412,8 +412,8 @@
break
M.current.canmove = 1
M.current.client.eye = M.current
- del(animation)
- del(holder)
+ qdel(animation)
+ qdel(holder)
M.current.remove_vampire_blood(30)
M.current.verbs -= /client/vampire/proc/vampire_jaunt
spawn(600) M.current.verbs += /client/vampire/proc/vampire_jaunt
@@ -473,7 +473,7 @@
//animation.master = src
usr.loc = picked
spawn(10)
- del(animation)
+ qdel(animation)
M.current.remove_vampire_blood(30)
M.current.verbs -= /client/vampire/proc/vampire_shadowstep
spawn(20)
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 80b7aa10e81..786d3f1f08e 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -133,7 +133,7 @@
/obj/effect/rend/New()
spawn(50)
new /obj/singularity/narsie/wizard(get_turf(src))
- del(src)
+ qdel(src)
return
return
@@ -172,13 +172,13 @@
new /mob/living/simple_animal/cow(loc)
cowsleft--
if(cowsleft <= 0)
- del src
+ qdel(src)
/obj/effect/rend/cow/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/nullrod))
visible_message("\red [I] strikes a blow against \the [src], banishing it!")
spawn(1)
- del src
+ qdel(src)
return
..()
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 0a1f21dd430..66f412bdfa8 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -124,7 +124,7 @@
animation.icon = 'icons/mob/mob.dmi'
animation.master = T
flick("dust-h", animation)
- del(animation)
+ qdel(animation)
var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade( T.loc )
S.loc = C //put shade in stone
S.status_flags |= GODMODE //So they won't die inside the stone somehow
@@ -141,7 +141,7 @@
U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone."
U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls."
C.imprinted = "[S.name]"
- del T
+ qdel(T)
if("SHADE")
var/mob/living/simple_animal/shade/T = target
var/obj/item/device/soulstone/C = src
@@ -179,11 +179,11 @@
else
ticker.mode.cult+=Z.mind
ticker.mode.update_cult_icons_added(Z.mind)
- del(T)
+ qdel(T)
Z << "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
Z.cancel_camera()
- del(C)
+ qdel(C)
if("Wraith")
var/mob/living/simple_animal/construct/wraith/Z = new /mob/living/simple_animal/construct/wraith (get_turf(T.loc))
@@ -195,11 +195,11 @@
else
ticker.mode.cult+=Z.mind
ticker.mode.update_cult_icons_added(Z.mind)
- del(T)
+ qdel(T)
Z << "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
Z.cancel_camera()
- del(C)
+ qdel(C)
if("Artificer")
var/mob/living/simple_animal/construct/builder/Z = new /mob/living/simple_animal/construct/builder (get_turf(T.loc))
@@ -211,11 +211,11 @@
else
ticker.mode.cult+=Z.mind
ticker.mode.update_cult_icons_added(Z.mind)
- del(T)
+ qdel(T)
Z << "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone)."
Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs."
Z.cancel_camera()
- del(C)
+ qdel(C)
else
U << "\red Creation failed!: \black The soul stone is empty! Go kill someone!"
return
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index d126c6c164e..7d2e889c10e 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -77,7 +77,7 @@
if(initial(S.name) == initial(aspell.name))
spell_levels = aspell.spell_level
user.mind.spell_list.Remove(aspell)
- del(S)
+ qdel(S)
return cost * (spell_levels+1)
return -1
@@ -373,7 +373,7 @@
entries |= E
categories |= E.category
else
- del(E)
+ qdel(E)
tab = categories[1]
/obj/item/weapon/spellbook/attackby(obj/item/O as obj, mob/user as mob, params)
@@ -677,9 +677,9 @@
magichead.flags_inv = null //so you can still see their face
magichead.voicechange = 1 //NEEEEIIGHH
if(!user.unEquip(user.wear_mask))
- del user.wear_mask
+ qdel(user.wear_mask)
user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1)
- del src
+ qdel(src)
else
user <<"I say thee neigh"
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index cf6f6717765..2455637e61b 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -155,12 +155,12 @@
return
//So zards properly get their items when they are admin-made.
- del(wizard_mob.wear_suit)
- del(wizard_mob.head)
- del(wizard_mob.shoes)
- del(wizard_mob.r_hand)
- del(wizard_mob.r_store)
- del(wizard_mob.l_store)
+ qdel(wizard_mob.wear_suit)
+ qdel(wizard_mob.head)
+ qdel(wizard_mob.shoes)
+ qdel(wizard_mob.r_hand)
+ qdel(wizard_mob.r_store)
+ qdel(wizard_mob.l_store)
wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_l_ear)
wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform)
@@ -276,7 +276,7 @@
/mob/proc/spellremove(var/mob/M as mob, var/removeallspells=1)
for(var/obj/effect/proc_holder/spell/wizard/spell_to_remove in src.spell_list)
if (spell_to_remove.name == "Artificer" && !removeallspells) continue
- del(spell_to_remove)
+ qdel(spell_to_remove)
/*Checks if the wizard can cast spells.
Made a proc so this is not repeated 14 (or more) times.*/
diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm
index 6369ed99eee..a5881156f80 100644
--- a/code/game/machinery/OpTable.dm
+++ b/code/game/machinery/OpTable.dm
@@ -40,14 +40,14 @@
/obj/machinery/optable/blob_act()
if(prob(75))
- del(src)
+ qdel(src)
/obj/machinery/optable/attack_hand(mob/user as mob)
if (HULK in usr.mutations)
usr << text("\blue You destroy the table.")
visible_message("\red [usr] destroys the operating table!")
src.density = 0
- del(src)
+ qdel(src)
return
/obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
@@ -121,7 +121,7 @@
if (istype(W, /obj/item/weapon/grab))
if(iscarbon(W:affecting))
take_victim(W:affecting,usr)
- del(W)
+ qdel(W)
return
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 13482b9b525..9943e446f8c 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -285,7 +285,7 @@
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
A.blob_act()
- del(src)
+ qdel(src)
return
@@ -360,7 +360,7 @@
M << "\blue You feel cool air surround you. You go numb as your senses turn inward."
src.add_fingerprint(user)
- del(G)
+ qdel(G)
return
return
@@ -601,7 +601,7 @@
src.icon_state = "sleeper"
for(var/obj/O in src)
- del(O)
+ qdel(O)
src.add_fingerprint(usr)
return
return
\ No newline at end of file
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index e0c10366f77..f3090cdfb67 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -82,7 +82,7 @@
src.icon_state = "body_scanner_1"
src.add_fingerprint(user)
//G = null
- del(G)
+ qdel(G)
return
/obj/machinery/bodyscanner/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
@@ -178,7 +178,7 @@
src.icon_state = "bodyscanner"
for(var/obj/O in src)
//O = null
- del(O)
+ qdel(O)
//Foreach goto(124)
src.add_fingerprint(usr)
return
@@ -229,7 +229,7 @@
if(prob(50))
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
- del(src)
+ qdel(src)
/obj/machinery/body_scanconsole
var/obj/machinery/bodyscanner/connected
@@ -286,7 +286,7 @@
/obj/machinery/body_scanconsole/blob_act()
if(prob(50))
- del(src)
+ qdel(src)
/obj/machinery/body_scanconsole/proc/findscanner()
spawn( 5 )
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index ccc40f29e84..5965a7c8182 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -989,7 +989,7 @@
user << "You wire \the [src]!"
coil.amount -= 5
if(!coil.amount)
- del(coil)
+ qdel(coil)
buildstage = 2
update_icon()
@@ -1009,7 +1009,7 @@
if(0)
if(istype(W, /obj/item/weapon/airalarm_electronics))
user << "You insert the circuit!"
- del(W)
+ qdel(W)
buildstage = 1
update_icon()
return
@@ -1154,7 +1154,7 @@ FIRE ALARM
coil.amount -= 5
if(!coil.amount)
- del(coil)
+ qdel(coil)
buildstage = 2
user << "You wire \the [src]!"
@@ -1171,7 +1171,7 @@ FIRE ALARM
if(0)
if(istype(W, /obj/item/weapon/firealarm_electronics))
user << "You insert the circuit!"
- del(W)
+ qdel(W)
buildstage = 1
update_icon()
@@ -1179,7 +1179,7 @@ FIRE ALARM
user << "You remove the fire alarm assembly from the wall!"
new /obj/item/mounted/frame/firealarm(get_turf(user))
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
- del(src)
+ qdel(src)
return
src.alarm()
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 941e520a3d5..b9005987fc3 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -80,7 +80,7 @@ obj/machinery/air_sensor
if(do_after(user, 40))
user.visible_message("[user] unfastens \the [src].", "\blue You have unfastened \the [src].", "You hear ratchet.")
new /obj/item/pipe_gsensor(src.loc)
- del(src)
+ qdel(src)
return 1
if(..())
return 1
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 8ab3b3e626a..c79bce5a9b9 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -340,7 +340,7 @@ update_flag
user << "\blue You salvage whats left of \the [src]"
var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(src.loc)
M.amount = 3
- del src
+ qdel(src)
return
if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda))
diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm
index 0c6deb622a9..f4e38aea3e9 100644
--- a/code/game/machinery/atmoalter/meter.dm
+++ b/code/game/machinery/atmoalter/meter.dm
@@ -130,7 +130,7 @@
"\blue You have unfastened \the [src].", \
"You hear ratchet.")
new /obj/item/pipe_meter(src.loc)
- del(src)
+ qdel(src)
// TURF METER - REPORTS A TILE'S AIR CONTENTS
diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm
index e8c9014a3ba..0a008eb819e 100644
--- a/code/game/machinery/bees_items.dm
+++ b/code/game/machinery/bees_items.dm
@@ -20,7 +20,7 @@
for(var/mob/living/simple_animal/bee/B in T)
if(B.feral < 0)
caught_bees += B.strength
- del(B)
+ qdel(B)
user.visible_message("\blue [user] nets some bees.","\blue You net up some of the becalmed bees.")
else
user.visible_message("\red [user] swings at some bees, they don't seem to like it.","\red You swing at some bees, they don't seem to like it.")
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 08e60558d38..ff6eccaa2a6 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -372,7 +372,7 @@
user << "\blue \The [src] processes \the [W]."
biomass += 50
user.drop_item()
- del(W)
+ qdel(W)
return
else if (istype(W, /obj/item/weapon/wrench))
if(src.locked && (src.anchored || src.occupant))
@@ -458,7 +458,7 @@
src.icon_state = "pod_g"
src.occupant.ghostize()
spawn(5)
- del(src.occupant)
+ qdel(src.occupant)
return
/obj/machinery/clonepod/relaymove(mob/user as mob)
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index b6381ea5eb0..a0111fabfbf 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -240,7 +240,7 @@
if(!silent)
var/obj/oldobj = obj
visible_message("The [oldobj.name] fades away!")
- del(obj)
+ qdel(obj)
/obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A)
for(var/turf/T in A)
@@ -293,10 +293,10 @@
derez(item)
for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
- del(B)
+ qdel(B)
for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck)
- del(C)
+ qdel(C)
holographic_items = A.copy_contents_to(linkedholodeck , 1)
@@ -402,7 +402,7 @@
G.affecting.loc = src.loc
G.affecting.Weaken(5)
visible_message("\red [G.assailant] puts [G.affecting] on the table.")
- del(W)
+ qdel(W)
return
if (istype(W, /obj/item/weapon/wrench))
@@ -522,7 +522,7 @@
G.affecting.loc = src.loc
G.affecting.Weaken(5)
visible_message("\red [G.assailant] dunks [G.affecting] into the [src]!", 3)
- del(W)
+ qdel(W)
return
else if (istype(W, /obj/item) && get_dist(src,user)<2)
user.drop_item(src)
@@ -577,7 +577,7 @@
currentarea = get_area(src.loc)
if(!currentarea)
- del(src)
+ qdel(src)
if(eventstarted)
usr << "The event has already begun!"
@@ -608,7 +608,7 @@
eventstarted = 1
for(var/obj/structure/holowindow/W in currentarea)
- del(W)
+ qdel(W)
for(var/mob/M in currentarea)
M << "FIGHT!"
\ No newline at end of file
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 92a47bad1a4..8aa64e18b6b 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -29,7 +29,7 @@
if(!src || !WT.remove_fuel(0, user)) return
user << "\blue You deconstruct the frame."
new /obj/item/stack/sheet/plasteel( loc, 4)
- del(src)
+ qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -67,7 +67,7 @@
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20))
P:amount -= 5
- if(!P:amount) del(P)
+ if(!P:amount) qdel(P)
user << "\blue You add cables to the frame."
state = 3
icon_state = "3"
@@ -89,7 +89,7 @@
if(do_after(user, 20))
if (P)
P:amount -= 2
- if(!P:amount) del(P)
+ if(!P:amount) qdel(P)
user << "\blue You put in the glass panel."
state = 4
icon_state = "4"
@@ -166,7 +166,7 @@
if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created
A.rename_self("ai", 1)
feedback_inc("cyborg_ais_created",1)
- del(src)
+ qdel(src)
/obj/structure/AIcore/deactivated
name = "Inactive AI"
@@ -301,7 +301,7 @@ That prevents a few funky behaviors.
A.cancel_camera()
A << "You have been uploaded to a stationary terminal. Remote device connection restored."
U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed succesfully. Local copy has been removed."
- del(T)
+ qdel(T)
/*if("NINJASUIT")
var/obj/item/clothing/suit/space/space_ninja/C = src
var/mob/living/silicon/ai/A = C.AI
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 7a732bac213..55e5d8bc4db 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -59,7 +59,7 @@
..()
var/choice = pick(typesof(/obj/machinery/computer/arcade) - /obj/machinery/computer/arcade)
new choice(loc)
- del(src)
+ qdel(src)
/obj/machinery/computer/arcade/proc/prizevend()
if(!contents.len)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 8864fa8bba2..620ad17e21d 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -301,7 +301,7 @@
if(!src || !WT.isOn()) return
user << "\blue You deconstruct the frame."
new /obj/item/stack/sheet/metal( src.loc, 5 )
- del(src)
+ qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -344,7 +344,7 @@
if(do_after(user, 20))
if(P)
P:amount -= 5
- if(!P:amount) del(P)
+ if(!P:amount) qdel(P)
user << "\blue You add cables to the frame."
src.state = 3
src.icon_state = "3"
@@ -385,7 +385,7 @@
var/obj/machinery/computer/supplycomp/SC = B
var/obj/item/weapon/circuitboard/supplycomp/C = circuit
SC.can_order_contraband = C.contraband_enabled
- del(src)
+ qdel(src)
@@ -412,7 +412,7 @@
if(!src || !WT.isOn()) return
user << "\blue You deconstruct the frame."
new /obj/item/stack/sheet/mineral/clown( src.loc, 5 )
- del(src)
+ qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -455,7 +455,7 @@
if(do_after(user, 20))
if(P)
P:amount -= 5
- if(!P:amount) del(P)
+ if(!P:amount) qdel(P)
user << "\blue You add cables to the frame."
src.state = 3
src.icon_state = "3"
@@ -492,4 +492,4 @@
if(circuit.id) B:id = circuit.id
if(circuit.records) B:records = circuit.records
if(circuit.frequency) B:frequency = circuit.frequency
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 9bdaec41633..bb0cfb2d1bc 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -194,7 +194,7 @@
src.active_record = locate(href_list["view_rec"])
if(istype(src.active_record,/datum/dna2/record))
if ((isnull(src.active_record.ckey)))
- del(src.active_record)
+ qdel(src.active_record)
src.temp = "Error: Record corrupt."
else
src.menu = 3
@@ -215,7 +215,7 @@
if (istype(C)||istype(C, /obj/item/device/pda))
if(src.check_access(C))
src.records.Remove(src.active_record)
- del(src.active_record)
+ qdel(src.active_record)
src.temp = "Record deleted."
src.menu = 2
else
@@ -286,7 +286,7 @@
else if(pod1.growclone(C))
temp = "Initiating cloning cycle..."
records.Remove(C)
- del(C)
+ qdel(C)
menu = 1
else
var/mob/selected = find_dead_player("[C.ckey]")
@@ -295,7 +295,7 @@
if(answer != "No" && pod1.growclone(C))
temp = "Initiating cloning cycle..."
records.Remove(C)
- del(C)
+ qdel(C)
menu = 1
else
temp = "Initiating cloning cycle...
Error: Post-initialisation failed. Cloning cycle aborted."
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index bb377cca260..16c5faf54f8 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -127,7 +127,7 @@
user << "\blue You disconnect the monitor."
A.state = 4
A.icon_state = "4"
- del(src)
+ qdel(src)
else
src.attack_hand(user)
return
diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm
index 4b799535f23..c21e3cf8b4f 100644
--- a/code/game/machinery/computer/hologram.dm
+++ b/code/game/machinery/computer/hologram.dm
@@ -65,7 +65,7 @@
if (src.projector.hologram)
src.projector.icon_state = "hologram0"
//src.projector.hologram = null
- del(src.projector.hologram)
+ qdel(src.projector.hologram)
else
src.projector.hologram = new(src.projector.loc)
src.projector.hologram.icon = 'icons/mob/human.dmi'
diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm
index aba29ec0802..abf8880b125 100644
--- a/code/game/machinery/computer/honkputer.dm
+++ b/code/game/machinery/computer/honkputer.dm
@@ -112,7 +112,7 @@
user << "\blue You disconnect the monitor."
A.state = 4
A.icon_state = "4"
- del(src)
+ qdel(src)
else
src.attack_hand(user)
return
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 4c61d7d705f..f63748d81e2 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -385,7 +385,7 @@
if (href_list["del_r2"])
if (src.active2)
//src.active2 = null
- del(src.active2)
+ qdel(src.active2)
if (href_list["d_rec"])
var/datum/data/record/R = locate(href_list["d_rec"])
@@ -510,7 +510,7 @@
continue
else if(prob(1))
- del(R)
+ qdel(R)
continue
..(severity)
diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
index 9eff8165eb5..50ce7f6f98c 100644
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -54,7 +54,7 @@
A.state = 3
A.icon_state = "3"
A.anchored = 1
- del(src)
+ qdel(src)
else
user << "\blue You disconnect the monitor."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
@@ -65,7 +65,7 @@
A.state = 4
A.icon_state = "4"
A.anchored = 1
- del(src)
+ qdel(src)
else
src.attack_hand(user)
return
diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm
index 8d9c206e97f..0857b599d78 100644
--- a/code/game/machinery/computer/prisonshuttle.dm
+++ b/code/game/machinery/computer/prisonshuttle.dm
@@ -54,7 +54,7 @@ var/prison_shuttle_timeleft = 0
A.state = 4
A.icon_state = "4"
- del(src)
+ qdel(src)
else if(istype(I,/obj/item/weapon/card/emag) && (!hacked))
hacked = 1
user << "\blue You disable the lock."
@@ -203,7 +203,7 @@ var/prison_shuttle_timeleft = 0
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
start_location.move_contents_to(end_location)
if(1)
@@ -233,7 +233,7 @@ var/prison_shuttle_timeleft = 0
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
bug.gib()
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index a9599578d0f..7a757556122 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -343,7 +343,7 @@ What a mess.*/
if ("Purge All Records")
for(var/datum/data/record/R in data_core.security)
- del(R)
+ qdel(R)
temp = "All Security records deleted."
if ("Add Entry")
@@ -527,17 +527,17 @@ What a mess.*/
if ("Delete Record (Security) Execute")
if (active2)
- del(active2)
+ qdel(active2)
if ("Delete Record (ALL) Execute")
if (active1)
for(var/datum/data/record/R in data_core.medical)
if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
- del(R)
+ qdel(R)
else
- del(active1)
+ qdel(active1)
if (active2)
- del(active2)
+ qdel(active2)
else
temp = "This function does not appear to be working at the moment. Our apologies."
@@ -568,7 +568,7 @@ What a mess.*/
continue
else if(prob(1))
- del(R)
+ qdel(R)
continue
..(severity)
diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm
index 96949ac7fa0..d9f3dcd996e 100644
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -46,7 +46,7 @@
world << "\blue Alert: Shuttle launch time shortened to 10 seconds!"
emergency_shuttle.set_launch_countdown(10)
//src.authorized = null
- del(src.authorized)
+ qdel(src.authorized)
src.authorized = list( )
if("Repeal")
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index b5c49c4b165..50c2adca3f4 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -276,7 +276,7 @@ What a mess.*/
if(PDA_Manifest.len)
PDA_Manifest.Cut()
for(var/datum/data/record/R in data_core.security)
- del(R)
+ qdel(R)
temp = "All Employment records deleted."
if ("Delete Record (ALL)")
@@ -373,9 +373,9 @@ What a mess.*/
PDA_Manifest.Cut()
for(var/datum/data/record/R in data_core.medical)
if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
- del(R)
+ qdel(R)
else
- del(active1)
+ qdel(active1)
else
temp = "This function does not appear to be working at the moment. Our apologies."
@@ -406,7 +406,7 @@ What a mess.*/
continue
else if(prob(1))
- del(R)
+ qdel(R)
continue
..(severity)
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index 9b455111d6d..6bd58e74e4f 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -77,7 +77,7 @@ var/specops_shuttle_timeleft = 0
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
bug.gib()
@@ -96,7 +96,7 @@ var/specops_shuttle_timeleft = 0
for(var/obj/machinery/computer/specops_shuttle/S in world)
S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY
- del(announcer)
+ qdel(announcer)
/proc/specops_process()
var/area/centcom/specops/special_ops = locate()//Where is the specops area located?
@@ -226,7 +226,7 @@ var/specops_shuttle_timeleft = 0
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
start_location.move_contents_to(end_location)
@@ -237,7 +237,7 @@ var/specops_shuttle_timeleft = 0
for(var/obj/machinery/computer/specops_shuttle/S in world)
S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY
- del(announcer)
+ qdel(announcer)
/proc/specops_can_move()
if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom)
diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm
index ba547692036..a0bcff2139a 100644
--- a/code/game/machinery/computer/syndicate_specops_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm
@@ -160,7 +160,7 @@ var/syndicate_elite_shuttle_timeleft = 0
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
bug.gib()
diff --git a/code/game/machinery/computer/xenos_shuttle.dm b/code/game/machinery/computer/xenos_shuttle.dm
index fd58beadaf4..4f63578e51b 100644
--- a/code/game/machinery/computer/xenos_shuttle.dm
+++ b/code/game/machinery/computer/xenos_shuttle.dm
@@ -72,7 +72,7 @@
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
for(var/mob/living/carbon/bug in dest_location) // If someone somehow is still in the shuttle's docking area...
bug.gib()
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index a2042720a7f..59a784233c1 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -80,7 +80,7 @@
user << "\blue You add the glass to the frame."
playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)
new /obj/structure/displaycase_frame(src.loc)
- del(src)
+ qdel(src)
return
if(istype(P, /obj/item/weapon/wrench))
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 982f0e415ff..5d2e551f64f 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -303,7 +303,7 @@
return
var/mob/M = G:affecting
if(put_mob(M))
- del(G)
+ qdel(G)
return
/obj/machinery/atmospherics/unary/cryo_cell/update_icon()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 14a461474e1..c5d51c46527 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -289,12 +289,12 @@
if(!istype(R)) return ..()
R.contents -= R.mmi
- del(R.mmi)
+ qdel(R.mmi)
for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc
for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags
O.loc = R
- del(I)
- del(R.module)
+ qdel(I)
+ qdel(R.module)
return ..()
@@ -333,7 +333,7 @@
break
if(!preserve)
- del(W)
+ qdel(W)
else
if(control_computer && control_computer.allow_items)
control_computer.frozen_items += W
@@ -346,7 +346,7 @@
// We don't want revs to get objectives that aren't for heads of staff. Letting
// them win or lose based on cryo is silly so we remove the objective.
if(istype(O,/datum/objective/mutiny) && O.target == occupant.mind)
- del(O)
+ qdel(O)
else if(O.target && istype(O.target,/datum/mind))
if(O.target == occupant.mind)
if(O.owner && O.owner.current)
@@ -358,7 +358,7 @@
if(!(O.target))
all_objectives -= O
O.owner.objectives -= O
- del(O)
+ qdel(O)
//Handle job slot/tater cleanup.
var/job = occupant.mind.assigned_role
@@ -366,7 +366,7 @@
job_master.FreeRole(job)
if(occupant.mind.objectives.len)
- del(occupant.mind.objectives)
+ qdel(occupant.mind.objectives)
occupant.mind.special_role = null
else
if(ticker.mode.name == "AutoTraitor")
@@ -379,13 +379,13 @@
PDA_Manifest.Cut()
for(var/datum/data/record/R in data_core.medical)
if ((R.fields["name"] == occupant.real_name))
- del(R)
+ qdel(R)
for(var/datum/data/record/T in data_core.security)
if ((T.fields["name"] == occupant.real_name))
- del(T)
+ qdel(T)
for(var/datum/data/record/G in data_core.general)
if ((G.fields["name"] == occupant.real_name))
- del(G)
+ qdel(G)
if(orient_right)
icon_state = "[base_icon_state]-r"
@@ -412,7 +412,7 @@
visible_message("\The [src] hums and hisses as it moves [occupant.real_name] into storage.", 3)
// Delete the mob.
- del(occupant)
+ qdel(occupant)
occupant = null
name = initial(name)
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 48b1ce8418a..47333ed7ec4 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -89,7 +89,7 @@ for reference:
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
- del(src)
+ qdel(src)
..()
ex_act(severity)
@@ -112,7 +112,7 @@ for reference:
src.health -= 25
if (src.health <= 0)
visible_message("\red The blob eats through the barricade!")
- del(src)
+ qdel(src)
return
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff.
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index e469e358d2e..215cc8c1968 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -151,7 +151,7 @@
if(do_after(user, 30))
user << "You detach \the [src] from the wall."
new/obj/item/mounted/frame/driver_button(get_turf(src))
- del(src)
+ qdel(src)
return 1
return src.attack_hand(user)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index ac589278c09..72946cc4ef2 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -250,7 +250,7 @@
/obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature)
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500)
new/obj/structure/door_assembly( src.loc )
- del (src)
+ qdel(src)
/obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~
return 0
@@ -827,7 +827,7 @@ About the new airlock wires panel:
ae.icon_state = "door_electronics_smoked"
operating = 0
- del(src)
+ qdel(src)
return
else if(arePowerSystemsOn())
user << "\blue The airlock's motors resist your efforts to force it."
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index c62976ec171..680f9317bfd 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -166,7 +166,7 @@
/obj/machinery/door/blob_act()
if(prob(40))
- del(src)
+ qdel(src)
return
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index da899d48626..cc65584c2e3 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -25,7 +25,7 @@
for(var/obj/machinery/door/firedoor/F in loc)
if(F != src)
spawn(1)
- del src
+ qdel(src)
return .
var/area/A = get_area(src)
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index 535e4cbd826..b0e0a52d948 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -69,7 +69,7 @@
//use_power(radio_power_use) //neat idea, but causes way too much lag.
return radio_connection.post_signal(src, signal, filter)
else
- del(signal)
+ qdel(signal)
/obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
diff --git a/code/game/machinery/embedded_controller/embedded_program_base.dm b/code/game/machinery/embedded_controller/embedded_program_base.dm
index 611fcfc52e5..06507d9d5f9 100644
--- a/code/game/machinery/embedded_controller/embedded_program_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_program_base.dm
@@ -24,4 +24,4 @@
if(master)
master.post_signal(signal, comm_line)
else
- del(signal)
+ qdel(signal)
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index ecce6d98767..f45a80e19c8 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -115,7 +115,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
/obj/machinery/hologram/holopad/proc/clear_holo()
// hologram.set_light(0)//Clear lighting. //handled by the lighting controller when its ower is deleted
- del(hologram)//Get rid of hologram.
+ qdel(hologram)//Get rid of hologram.
if(master.holo == src)
master.holo = null
master = null//Null the master, since no-one is using it now.
@@ -193,7 +193,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
return
/obj/machinery/hologram/blob_act()
- del(src)
+ qdel(src)
return
/obj/machinery/hologram/Destroy()
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 33000bbfc21..df6727ce3f8 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -204,7 +204,7 @@
move_into_gibber(user,G.affecting)
- del(G)
+ qdel(G)
/obj/machinery/gibber/MouseDrop_T(mob/target, mob/user)
if(usr.stat || (!ishuman(user)) || user.restrained() || user.weakened || user.stunned || user.paralysis || user.resting)
@@ -395,7 +395,7 @@
src.occupant.death(1)
src.occupant.ghostize()
- del(src.occupant)
+ qdel(src.occupant)
spawn(src.gibtime)
diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm
index 2df46989506..14fb3b12f62 100644
--- a/code/game/machinery/kitchen/juicer.dm
+++ b/code/game/machinery/kitchen/juicer.dm
@@ -161,7 +161,7 @@
for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents)
var/r_id = get_juice_id(O)
beaker.reagents.add_reagent(r_id,get_juice_amount(O))
- del(O)
+ qdel(O)
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index dc4e21f9296..258757adaee 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -37,7 +37,7 @@
if(recipe.result) // Ignore recipe subtypes that lack a result
available_recipes += recipe
else
- del(recipe)
+ qdel(recipe)
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/microwave/recipe in available_recipes)
@@ -399,7 +399,7 @@
var/id = O.reagents.get_master_reagent_id()
if (id)
amount+=O.reagents.get_reagent_amount(id)
- del(O)
+ qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm
index 25f12722c97..73d79fc6f65 100644
--- a/code/game/machinery/kitchen/monkeyrecycler.dm
+++ b/code/game/machinery/kitchen/monkeyrecycler.dm
@@ -25,7 +25,7 @@
user << "\red The monkey is struggling far too much to put it in the recycler."
else
user.drop_item()
- del(target)
+ qdel(target)
user << "\blue You stuff the monkey in the machine."
playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
var/offset = prob(50) ? -2 : 2
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index cc9f64dcc3d..835855df1e0 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -24,7 +24,7 @@
if (src.output && loc)
new src.output(loc)
if (what)
- del(what)
+ qdel(what)
/////////////////////////
/////OBJECT RECIPIES/////
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 1ed3173e74f..85a8557b2d3 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -174,7 +174,7 @@ Class Procs:
/obj/machinery/blob_act()
if(prob(50))
- del(src)
+ qdel(src)
/obj/machinery/proc/auto_use_power()
if(!powered(power_channel))
@@ -462,7 +462,7 @@ Class Procs:
if(I.reliability != 100 && crit_fail)
I.crit_fail = 1
I.loc = loc
- del(src)
+ qdel(src)
return 1
/obj/machinery/proc/on_assess_perp(mob/living/carbon/human/perp)
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index 8569ede3fd7..d4d25346c60 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -364,7 +364,7 @@
// N, S, E, W are directional
// C is center
// R is random (in magnetic field's bounds)
- del(signal)
+ qdel(signal)
break // break the loop if the character located is invalid
signal.data["command"] = nextmove
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 10107259fa8..205b9a08243 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -29,7 +29,7 @@
F.anchored = 1
F.build = 4
F.update_icon()
- del(src)
+ qdel(src)
return 1
return ..()
@@ -111,7 +111,7 @@
if(do_after(user, 30) && (build == 0))
user << "You detach the plasteel sheets from each others."
new /obj/item/stack/sheet/plasteel(get_turf(src),3)
- del(src)
+ qdel(src)
return 1
if(istype(W, /obj/item/weapon/wrench))
user << "You begin to anchor \the [src] on the floor."
@@ -199,7 +199,7 @@
playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
var/obj/machinery/mass_driver/M = new(get_turf(src))
M.dir = src.dir
- del(src)
+ qdel(src)
return 1
..()
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 169641a452c..9d70a9def90 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -1152,7 +1152,7 @@ Buildable meters
if(machineReference)
transfer_fingerprints_to(machineReference)
machineReference.add_fingerprint(user)
- del(src) // remove the pipe item
+ qdel(src) // remove the pipe item
return
//TODO: DEFERRED
@@ -1180,7 +1180,7 @@ Buildable meters
new/obj/machinery/meter( src.loc )
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You have fastened the meter to the pipe"
- del(src)
+ qdel(src)
/obj/item/pipe_gsensor
name = "gas sensor"
@@ -1197,7 +1197,7 @@ Buildable meters
new/obj/machinery/air_sensor( src.loc )
playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1)
user << "\blue You have fastened the gas sensor"
- del(src)
+ qdel(src)
//not sure why these are necessary
#undef PIPE_SIMPLE_STRAIGHT
#undef PIPE_SIMPLE_BENT
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 43050cab6ae..49bdac91c98 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -101,7 +101,7 @@
if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter))
usr << "\blue You put [W] back to [src]."
user.drop_item()
- del(W)
+ qdel(W)
return
else if (istype(W, /obj/item/weapon/wrench))
if (unwrenched==0)
@@ -160,7 +160,7 @@ Nah
if (pipe.anchored)
return
- del(pipe)
+ qdel(pipe)
/obj/machinery/pipedispenser/disposal/attack_hand(user as mob)
if(..())
diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm
index c6da942645a..963dc0c803a 100644
--- a/code/game/machinery/portable_tag_turret.dm
+++ b/code/game/machinery/portable_tag_turret.dm
@@ -82,13 +82,13 @@
if(lasercolor == "b" && disabled == 0)
if(istype(Proj, /obj/item/weapon/gun/energy/laser/redtag))
disabled = 1
- del(Proj) // qdel
+ qdel(Proj) // qdel
sleep(100)
disabled = 0
if(lasercolor == "r" && disabled == 0)
if(istype(Proj, /obj/item/weapon/gun/energy/laser/bluetag))
disabled = 1
- del(Proj) // qdel
+ qdel(Proj) // qdel
sleep(100)
disabled = 0
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 0a71b73e8ef..c1f9d960d14 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -416,7 +416,7 @@
spark_system.start() //creates some sparks because they look cool
density = 1
update_icon()
- del(cover) //deletes the cover - no need on keeping it there! - del
+ qdel(cover) //deletes the cover - no need on keeping it there! - del
/obj/machinery/porta_turret/proc/create_cover()
if(cover == null && anchored)
diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm
index 2af4c5e0fbf..1076467f187 100644
--- a/code/game/machinery/programmable_unloader.dm
+++ b/code/game/machinery/programmable_unloader.dm
@@ -100,9 +100,9 @@
for(var/datum/cargoprofile/p in emag_overrides + overrides + profiles)
p.master = src
- del C
+ qdel(C)
else
- del O
+ qdel(O)
/obj/machinery/programmable/attack_hand(mob/user as mob)
if(stat) // moved, or something else
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 3cc7919424b..03ac7ba2460 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -40,7 +40,7 @@ var/const/SAFETY_COOLDOWN = 100
..()
return
add_fingerprint(user)
-
+
/obj/machinery/recycler/emag_act(user as mob)
if(!emagged)
emagged = 1
@@ -93,7 +93,7 @@ var/const/SAFETY_COOLDOWN = 100
/obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1)
I.loc = src.loc
if(!istype(I, /obj/item/weapon/disk/nuclear) && !istype(I,/obj/item/flag/nation))
- del(I)
+ qdel(I)
if(prob(15))
new /obj/item/stack/sheet/metal(loc)
if(prob(10))
diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index 4465fdccf81..86e6dd5e700 100644
--- a/code/game/machinery/robot_fabricator.dm
+++ b/code/game/machinery/robot_fabricator.dm
@@ -26,7 +26,7 @@
count++
if (O:amount < 1)
- del(O)
+ qdel(O)
user << "You insert [count] metal sheet\s into the fabricator."
src.overlays -= "fab-load-metal"
diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index 6934ee0ac6c..913464b8295 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -31,7 +31,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
else
user << "[O] doesn't seem to have any usable seeds inside it."
- del(O)
+ qdel(O)
//Grass.
else if(istype(O, /obj/item/stack/tile/grass))
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index cb0c9707b32..4cce116c3bc 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -47,7 +47,7 @@
if (src.health <= 0)
visible_message("\blue The [src] dissipates")
- del(src)
+ qdel(src)
return
opacity = 1
@@ -60,7 +60,7 @@
..()
if(health <=0)
visible_message("\blue The [src] dissipates")
- del(src)
+ qdel(src)
return
opacity = 1
spawn(20) if(src) opacity = 0
@@ -81,13 +81,13 @@
/obj/machinery/shield/emp_act(severity)
switch(severity)
if(1)
- del(src)
+ qdel(src)
if(2)
if(prob(50))
- del(src)
+ qdel(src)
/obj/machinery/shield/blob_act()
- del(src)
+ qdel(src)
/obj/machinery/shield/hitby(AM as mob|obj)
@@ -107,7 +107,7 @@
//Handle the destruction of the shield
if (src.health <= 0)
visible_message("\blue The [src] dissipates")
- del(src)
+ qdel(src)
return
//The shield becomes dense to absorb the blow.. purely asthetic.
@@ -162,12 +162,12 @@
update_icon()
for(var/obj/machinery/shield/shield_tile in deployed_shields)
- del(shield_tile)
+ qdel(shield_tile)
/obj/machinery/shieldgen/process()
if(malfunction && active)
if(deployed_shields.len && prob(5))
- del(pick(deployed_shields))
+ qdel(pick(deployed_shields))
return
@@ -175,7 +175,7 @@
if(health <= 30)
src.malfunction = 1
if(health <= 0)
- del(src)
+ qdel(src)
update_icon()
return
@@ -491,7 +491,7 @@
T2 = T
if(locate(/obj/machinery/shieldwall) in T)
F = (locate(/obj/machinery/shieldwall) in T)
- del(F)
+ qdel(F)
if(locate(/obj/machinery/shieldwallgen) in T)
G = (locate(/obj/machinery/shieldwallgen) in T)
@@ -544,11 +544,11 @@
/obj/machinery/shieldwall/process()
if(needs_power)
if(isnull(gen_primary)||isnull(gen_secondary))
- del(src)
+ qdel(src)
return
if(!(gen_primary.active)||!(gen_secondary.active))
- del(src)
+ qdel(src)
return
//
if(prob(50))
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index a4a785baa00..efbef9c5670 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -508,7 +508,7 @@
//for(var/obj/O in src)
// O.loc = src.loc
src.add_fingerprint(user)
- del(G)
+ qdel(G)
src.updateUsrDialog()
src.update_icon()
return
@@ -663,7 +663,7 @@
src.occupant = M
src.add_fingerprint(user)
- del(G)
+ qdel(G)
src.updateUsrDialog()
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 1cb98f35541..05173045a96 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -222,7 +222,7 @@
holder.loc.visible_message("\icon[holder] Alert: Bomb has detonated. Your score is now [defusals] for [attempts]. Resetting wires...")
reset()
else
- del(src)
+ qdel(src)
/obj/item/weapon/bombcore/training/defuse()
var/obj/machinery/syndicatebomb/holder = src.loc
@@ -241,8 +241,8 @@
/obj/item/weapon/bombcore/badmin/defuse() //because we wouldn't want them being harvested by players
var/obj/machinery/syndicatebomb/B = src.loc
- del(B)
- del(src)
+ qdel(B)
+ qdel(src)
/obj/item/weapon/bombcore/badmin/summon/
var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie
@@ -256,8 +256,8 @@
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(X, pick(NORTH,SOUTH,EAST,WEST))
- del(B)
- del(src)
+ qdel(B)
+ qdel(src)
/obj/item/weapon/bombcore/badmin/summon/clown
summon_path = /mob/living/simple_animal/hostile/retaliate/clown
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index 04a8d95e4cd..dc721495245 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -194,7 +194,7 @@
temp = "- DELETED ENTRY: [D.name] -"
SelectedServer.log_entries.Remove(D)
- del(D)
+ qdel(D)
else
temp = "- FAILED: NO SELECTED MACHINE -"
@@ -232,7 +232,7 @@
A.state = 3
A.icon_state = "3"
A.anchored = 1
- del(src)
+ qdel(src)
else
user << "\blue You disconnect the monitor."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
@@ -243,7 +243,7 @@
A.state = 4
A.icon_state = "4"
A.anchored = 1
- del(src)
+ qdel(src)
src.updateUsrDialog()
return
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 1fbfdb1c1fe..fd6f2fe97eb 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -67,7 +67,7 @@
A.amount -= 5
if(A.amount <= 0)
user.drop_item()
- del(A)
+ qdel(A)
construct_op --
stat &= ~BROKEN // the machine's not borked anymore!
if(istype(P, /obj/item/weapon/crowbar))
@@ -103,7 +103,7 @@
// Create a machine frame and delete the current machine
var/obj/machinery/constructable_frame/machine_frame/F = new
F.loc = src.loc
- del(src)
+ qdel(src)
/obj/machinery/telecomms/proc/formatInput(var/label,var/varname, var/input)
var/value = vars[varname]
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 79be894bf42..3657410b400 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -103,7 +103,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
copy.data["original"] = signal.data["original"]
else
- del(copy)
+ qdel(copy)
send_count++
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index 91b258abd23..cdade74f121 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -141,7 +141,7 @@
A.state = 3
A.icon_state = "3"
A.anchored = 1
- del(src)
+ qdel(src)
else
user << "\blue You disconnect the monitor."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
@@ -152,7 +152,7 @@
A.state = 4
A.icon_state = "4"
A.anchored = 1
- del(src)
+ qdel(src)
src.updateUsrDialog()
return
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index b46cefa9e80..be8b0b5c57f 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -220,7 +220,7 @@
A.state = 3
A.icon_state = "3"
A.anchored = 1
- del(src)
+ qdel(src)
else
user << "\blue You disconnect the monitor."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
@@ -231,7 +231,7 @@
A.state = 4
A.icon_state = "4"
A.anchored = 1
- del(src)
+ qdel(src)
src.updateUsrDialog()
return
diff --git a/code/game/machinery/turntable.dm b/code/game/machinery/turntable.dm
index 2fe0c313a6a..12e946a8110 100644
--- a/code/game/machinery/turntable.dm
+++ b/code/game/machinery/turntable.dm
@@ -188,7 +188,7 @@
var/area/AA = get_area(F)
var/turf/T = get_turf(F)
if(T.density == 1 || AA.name != A.name)
- del(F)
+ qdel(F)
return
cycle++
if(cycle > 3)
@@ -203,7 +203,7 @@
var/area/AA = get_area(F)
var/turf/T = get_turf(F)
if(T.density == 1 || AA.name != A.name)
- del(F)
+ qdel(F)
return
cycle++
if(cycle > 3)
@@ -218,7 +218,7 @@
var/area/AA = get_area(F)
var/turf/T = get_turf(F)
if(T.density == 1 || AA.name != A.name)
- del(F)
+ qdel(F)
return
cycle++
if(cycle > 3)
@@ -235,7 +235,7 @@
var/area/AA = get_area(F)
var/turf/T = get_turf(F)
if(T.density == 1 || AA.name != A.name)
- del(F)
+ qdel(F)
return
cycle++
if(cycle > 3)
@@ -250,7 +250,7 @@
var/area/AA = get_area(F)
var/turf/T = get_turf(F)
if(T.density == 1 || AA.name != A.name)
- del(F)
+ qdel(F)
return
cycle++
if(cycle > 3)
@@ -265,7 +265,7 @@
var/area/AA = get_area(F)
var/turf/T = get_turf(F)
if(T.density == 1 || AA.name != A.name)
- del(F)
+ qdel(F)
return
cycle++
if(cycle > 3)
@@ -277,4 +277,4 @@
/obj/machinery/party/lasermachine/proc/turnoff()
var/area/A = src.loc.loc
for(var/obj/effects/laser/F in A)
- del(F)
+ qdel(F)
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 18f41d604a7..c644c4c5a85 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -284,7 +284,7 @@
src.health -= Proj.damage
..()
if(prob(45) && Proj.damage > 0) src.spark_system.start()
- del(Proj)
+ qdel(Proj)
if (src.health <= 0)
src.die()
return
@@ -317,7 +317,7 @@
src.stat |= BROKEN
src.icon_state = "destroyed_target_prism"
if (cover!=null)
- del(cover)
+ qdel(cover)
sleep(3)
flick("explosion", src)
spawn(13)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index cefb8a194b4..98ef44fdfc6 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -22,7 +22,7 @@
if(!name)
var/atom/tmp = new path
src.product_name = initial(tmp.name)
- del(tmp)
+ qdel(tmp)
else
src.product_name = name
@@ -176,7 +176,7 @@
if(prob(75))
malfunction()
else
- del(src)
+ qdel(src)
/obj/machinery/vending/proc/refill_inventory(obj/item/weapon/vending_refill/refill, datum/data/vending_product/machine, mob/user)
var/total = 0
@@ -306,7 +306,7 @@
visible_message("[usr] inserts a credit chip into [src].")
var/left = cashmoney.worth - currently_vending.price
usr.unEquip(cashmoney)
- del(cashmoney)
+ qdel(cashmoney)
if(left)
dispense_cash(left, src.loc, user)
@@ -560,10 +560,10 @@
user << "\blue You successfully pull the coin out before the [src] could swallow it."
else
user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all."
- del(coin)
+ qdel(coin)
categories &= ~CAT_COIN
else
- del(coin)
+ qdel(coin)
categories &= ~CAT_COIN
R.amount--
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 02597fed7d7..724643ed751 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -48,7 +48,7 @@
for(var/obj/item/stack/sheet/hairlesshide/HH in contents)
var/obj/item/stack/sheet/wetleather/WL = new(src)
WL.amount = HH.amount
- del(HH)
+ qdel(HH)
if(crayon)
@@ -81,10 +81,10 @@
new_jumpsuit_icon_state = J.icon_state
new_jumpsuit_item_state = J.item_state
new_jumpsuit_name = J.name
- del(J)
+ qdel(J)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
- del(J)
+ qdel(J)
for(var/T in typesof(/obj/item/clothing/gloves/color))
var/obj/item/clothing/gloves/color/G = new T
//world << "DEBUG: [color] == [J.color]"
@@ -92,40 +92,40 @@
new_glove_icon_state = G.icon_state
new_glove_item_state = G.item_state
new_glove_name = G.name
- del(G)
+ qdel(G)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
- del(G)
+ qdel(G)
for(var/T in typesof(/obj/item/clothing/shoes))
var/obj/item/clothing/shoes/S = new T
//world << "DEBUG: [color] == [J.color]"
if(_color == S._color)
new_shoe_icon_state = S.icon_state
new_shoe_name = S.name
- del(S)
+ qdel(S)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
- del(S)
+ qdel(S)
for(var/T in typesof(/obj/item/weapon/bedsheet))
var/obj/item/weapon/bedsheet/B = new T
//world << "DEBUG: [color] == [J.color]"
if(_color == B._color)
new_sheet_icon_state = B.icon_state
new_sheet_name = B.name
- del(B)
+ qdel(B)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
- del(B)
+ qdel(B)
for(var/T in typesof(/obj/item/clothing/head/soft))
var/obj/item/clothing/head/soft/H = new T
//world << "DEBUG: [color] == [J.color]"
if(_color == H._color)
new_softcap_icon_state = H.icon_state
new_softcap_name = H.name
- del(H)
+ qdel(H)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
- del(H)
+ qdel(H)
if(new_jumpsuit_icon_state && new_jumpsuit_item_state && new_jumpsuit_name)
for(var/obj/item/clothing/under/J in contents)
//world << "DEBUG: YUP! FOUND IT!"
@@ -168,7 +168,7 @@
H._color = _color
H.name = new_softcap_name
H.desc = new_desc
- del(crayon)
+ qdel(crayon)
crayon = null
@@ -211,7 +211,7 @@
var/obj/item/weapon/grab/G = W
if(ishuman(G.assailant) && iscorgi(G.affecting))
G.affecting.loc = src
- del(G)
+ qdel(G)
state = 3
else
..()
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index 8ae16a4e054..d5820f7d661 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -79,7 +79,7 @@
if(equipment.len)//Now to remove it and equip anew.
for(ME in equipment)
equipment -= ME
- del(ME)
+ qdel(ME)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src)
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src)
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 4ca4d89acfb..15f0b7e8aa9 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -58,7 +58,7 @@
else
chassis.occupant << sound('sound/mecha/critdestr.ogg',volume=50)
spawn
- del src
+ qdel(src)
return
/obj/item/mecha_parts/mecha_equipment/proc/critfail()
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index dd13db06290..4e35a0b1e72 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -323,7 +323,7 @@
if(do_after_cooldown(target))
if(disabled) return
chassis.spark_system.start()
- del(target)
+ qdel(target)
playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
chassis.use_power(energy_drain)
if(1)
@@ -446,7 +446,7 @@
do_after_cooldown()
src = null
spawn(rand(150,300))
- del(P)
+ qdel(P)
return
/obj/item/mecha_parts/mecha_equipment/gravcatapult
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index a9ef99f5676..f76c7ee63db 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -100,7 +100,7 @@
M.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [M]/[M.ckey] with a [src]"
log_attack("UNKNOWN shot [M] ([M.ckey]) with a [src]")
if(life <= 0)
- del(src)
+ qdel(src)
return
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index f40127bf46b..27fe49e746d 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -883,7 +883,7 @@
src.reset_icon()
user.drop_item()
- del(P)
+ qdel(P)
else
call((proc_res["dynattackby"]||src), "dynattackby")(W,user)
@@ -1840,7 +1840,7 @@
if(t_air)
t_air.merge(removed)
else //just delete the cabin gas, we're in space or some shit
- del(removed)
+ qdel(removed)
else
return stop()
return
@@ -1883,7 +1883,7 @@
if(mecha.loc && hascall(mecha.loc,"assume_air"))
mecha.loc.assume_air(leaked_gas)
else
- del(leaked_gas)
+ qdel(leaked_gas)
if(mecha.hasInternalDamage(MECHA_INT_SHORT_CIRCUIT))
if(mecha.get_charge())
mecha.spark_system.start()
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 223f6d4aa24..b201b83993d 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -91,7 +91,7 @@
const_holder.icon_state = "ripley0"
const_holder.density = 1
const_holder.overlays.len = 0
- del(src)
+ qdel(src)
return
@@ -300,7 +300,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "gygax0"
const_holder.density = 1
- del(src)
+ qdel(src)
return
@@ -579,7 +579,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "fireripley0"
const_holder.density = 1
- del(src)
+ qdel(src)
return
@@ -801,7 +801,7 @@
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/mecha/honker(const_holder)
const_holder.density = 1
- del(src)
+ qdel(src)
return
@@ -879,7 +879,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "durand0"
const_holder.density = 1
- del src
+ qdel(src)
return
/datum/construction/reversible/mecha/durand
@@ -1161,7 +1161,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "phazon0"
const_holder.density = 1
- del src
+ qdel(src)
return
/datum/construction/reversible/mecha/phazon
@@ -1477,7 +1477,7 @@
const_holder.icon = 'icons/mecha/mech_construction.dmi'
const_holder.icon_state = "odysseus0"
const_holder.density = 1
- del src
+ qdel(src)
return
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 1b37a6ce3d1..036872780b2 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -108,7 +108,7 @@
var/obj/mecha/M = in_mecha()
if(M)
M.emp_act(2)
- del(src)
+ qdel(src)
proc/get_mecha_log()
if(!src.in_mecha())
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index dd9a4480e3d..a50b3e5d225 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -101,7 +101,7 @@
var/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp/HC = new /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp
HC.attach(src)
for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents)//Deletes the beacon so it can't be found easily
- del (B)
+ qdel(B)
/obj/mecha/working/ripley/Exit(atom/movable/O)
if(O in cargo)
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index 5cc3ebd3fe0..aad9f5ab4bf 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -14,7 +14,7 @@ obj/effect/decal/cleanable/liquid_fuel
if(other != src)
other.amount += src.amount
spawn other.Spread()
- del src
+ qdel(src)
Spread()
. = ..()
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index c2945ca8b9b..859834960ff 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -32,7 +32,7 @@ var/global/list/image/splatter_cache=list()
if(B != src)
if (B.blood_DNA)
blood_DNA |= B.blood_DNA.Copy()
- del(B)
+ qdel(B)
spawn(DRYING_TIME * (amount+1))
dry()
diff --git a/code/game/objects/effects/decals/warning_stripes.dm b/code/game/objects/effects/decals/warning_stripes.dm
index 3270e9882a9..dbec481e944 100644
--- a/code/game/objects/effects/decals/warning_stripes.dm
+++ b/code/game/objects/effects/decals/warning_stripes.dm
@@ -53,7 +53,7 @@
/obj/effect/decal/warning_stripes/New()
. = ..()
loc.overlays += src
- del src
+ qdel(src)
// Credit to Neinhaus for making these into individual decals.
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 0af6865e0f8..7790be53bed 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -681,7 +681,7 @@ steam.start() -- spawns the effect
/obj/effect/effect/mustard_gas/New()
..()
spawn (100)
- del(src)
+ qdel(src)
return
/obj/effect/effect/mustard_gas/Move()
@@ -748,7 +748,7 @@ steam.start() -- spawns the effect
sleep(10)
step(smoke,direction)
spawn(100)
- del(smoke)
+ qdel(smoke)
src.total_smoke--
@@ -1234,7 +1234,7 @@ steam.start() -- spawns the effect
if (istype(T, /turf))
T.hotspot_expose(3000,100)
spawn (100)
- del(src)
+ qdel(src)
return
/obj/effects/sparkels/Destroy()
@@ -1290,5 +1290,5 @@ steam.start() -- spawns the effect
sleep(5)
step(sparks,direction)
spawn(20)
- del(sparks)
+ qdel(sparks)
src.total_sparks--
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 2fdad42d3c7..ea03fea46bc 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -163,4 +163,4 @@
/obj/effect/glowshroom/proc/CheckEndurance()
if(endurance <= 0)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/effects/manifest.dm b/code/game/objects/effects/manifest.dm
index bee6174f123..ec45c7a0894 100644
--- a/code/game/objects/effects/manifest.dm
+++ b/code/game/objects/effects/manifest.dm
@@ -17,5 +17,5 @@
P.info = dat
P.name = "paper- 'Crew Manifest'"
//SN src = null
- del(src)
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index dbb891ca337..b5ea74ec8e9 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -33,7 +33,7 @@
randmutb(obj)
domutcheck(obj,null)
spawn(0)
- del(src)
+ qdel(src)
/obj/effect/mine/proc/triggerstun(obj)
if(ismob(obj))
@@ -43,30 +43,30 @@
s.set_up(3, 1, src)
s.start()
spawn(0)
- del(src)
+ qdel(src)
/obj/effect/mine/proc/triggern2o(obj)
atmos_spawn_air(SPAWN_N2O, 360)
spawn(0)
- del(src)
+ qdel(src)
/obj/effect/mine/proc/triggerplasma(obj)
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 360)
spawn(0)
- del(src)
+ qdel(src)
/obj/effect/mine/proc/triggerkick(obj)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- del(obj:client)
+ qdel(obj:client)
spawn(0)
- del(src)
+ qdel(src)
/obj/effect/mine/proc/explode(obj)
explosion(loc, 0, 1, 2, 3)
spawn(0)
- del(src)
+ qdel(src)
/obj/effect/mine/dnascramble
name = "Radiation Mine"
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 9440163b460..7dcfbe425cc 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -44,7 +44,7 @@
if (icon_state == "portal1")
return
if (!( target ))
- del(src)
+ qdel(src)
return
if (istype(M, /atom/movable))
if(prob(failchance)) //oh dear a problem, put em in deep space
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index c8056e3d9d5..4f52fe3dd86 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -77,7 +77,7 @@
return
/obj/item/blob_act()
- del(src)
+ qdel(src)
//user: The mob that is suiciding
//damagetype: The type of damage the item will inflict on the user
diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm
index bf554463a42..d064bee3e4f 100644
--- a/code/game/objects/items/ashtray.dm
+++ b/code/game/objects/items/ashtray.dm
@@ -31,7 +31,7 @@
processing_objects.Remove(cig)
var/obj/item/butt = new cig.type_butt(src)
cig.transfer_fingerprints_to(butt)
- del(cig)
+ qdel(cig)
else if (cig.lit == 0)
user << "You place [cig] in [src] without even smoking it. Why would you do that?"
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 8eaf699205d..749a4475af1 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -79,7 +79,7 @@
visible_message("[usr] folds up the [src.name]")
new item_path(get_turf(src))
spawn(0)
- del(src)
+ qdel(src)
return
/obj/structure/closet/bodybag/update_icon()
@@ -98,7 +98,7 @@
attack_self(mob/user)
var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
R.add_fingerprint(user)
- del(src)
+ qdel(src)
@@ -119,7 +119,7 @@
O.icon = src.icon
O.icon_state = "bodybag_used"
O.desc = "Pretty useless now.."
- del(src)
+ qdel(src)
MouseDrop(over_object, src_location, over_location)
if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index c1be809fe5f..9a46a843a56 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -63,7 +63,7 @@
if(istype(src.loc, /mob))
var/mob/M = src.loc
M.unEquip(src, 1) //src is being deleted anyway
- del(src)
+ qdel(src)
update_icon()
if(istype(loc, /turf)) //start a fire if possible
var/turf/T = loc
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 667c37c882f..ac5afb75b07 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1072,7 +1072,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if ( !(C:blood_DNA) )
user << "\blue No blood found on [C]"
if(C:blood_DNA)
- del(C:blood_DNA)
+ qdel(C:blood_DNA)
else
user << "\blue Blood found on [C]. Analysing..."
spawn(15)
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index b2107561a60..ff16cf9e43c 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -132,7 +132,7 @@
/obj/item/device/aicard/ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
if(2.0)
if(prob(50)) qdel(src)
if(3.0)
diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm
index d0e9ba8fcdf..6f815fee0c9 100644
--- a/code/game/objects/items/devices/autopsy.dm
+++ b/code/game/objects/items/devices/autopsy.dm
@@ -68,7 +68,7 @@
else
D.organ_names += ", [O.name]"
- del D.organs_scanned[O.name]
+ qdel(D.organs_scanned[O.name])
D.organs_scanned[O.name] = W.copy()
for(var/V in O.trace_chemicals)
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index bb94f55b571..087f1fa209b 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -82,7 +82,7 @@
G.amount = remaining
if(!G.amount)
user.drop_item()
- del(G)
+ qdel(G)
AddUses(increment)
user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining."
return
@@ -94,7 +94,7 @@
AddUses(1)
user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining."
user.drop_item()
- del(L)
+ qdel(L)
return
else
user << "You need a working light."
@@ -167,7 +167,7 @@
target.brightness_color = L2.brightness_color
target.on = target.has_power()
target.update()
- del(L2)
+ qdel(L2)
if(target.on && target.rigged)
target.explode()
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 61c83fdc462..a0359e62362 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -24,7 +24,7 @@
if(!parts)
user << "This kit has no parts for this modification left."
user.unEquip(src)
- del(src)
+ qdel(src)
return
var/allowed = 0
@@ -60,7 +60,7 @@
if(!parts)
user.unEquip(src)
- del(src)
+ qdel(src)
/obj/item/device/modkit/examine()
..()
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 146be0a57ed..f370cf3dd01 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -38,7 +38,7 @@
/obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy.
proc/digest_delay()
spawn(600)
- del(src)
+ qdel(src)
// SINGULO BEACON SPAWNER
@@ -54,7 +54,7 @@
user << "\blue Locked In"
new /obj/machinery/power/singularity_beacon/syndicate( user.loc )
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
- del(src)
+ qdel(src)
return
/obj/item/device/radio/beacon/syndicate/bomb
@@ -67,7 +67,7 @@
user << "\blue Locked In"
new /obj/machinery/syndicatebomb( user.loc )
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
- del(src)
+ qdel(src)
return
@@ -84,5 +84,5 @@
user << "\blue Locked In"
new /obj/machinery/telepad_cargo(user.loc)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
- del(src)
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index ec45cb5e814..7aafc777268 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -191,7 +191,7 @@
0, "*garbled automated announcement*", src,
message, from, "Automated Announcement", from, "synthesized voice",
4, 0, zlevel, connection.frequency, follow_target=follow_target)
- del(A)
+ qdel(A)
return
// Interprets the message mode when talking into a radio, possibly returning a connection datum
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index 5ee645ff75b..d3d58525acd 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -22,17 +22,17 @@
if(istype(src.loc,/turf))
new /obj/effect/decal/cleanable/ash(src.loc)
new /obj/item/stack/rods(src.loc)
- del(src)
+ qdel(src)
return
if(istype(src.loc,/mob/living/carbon))
var/mob/living/carbon/C = src.loc
var/turf/location = get_turf(C)
new /obj/effect/decal/cleanable/ash(location)
new /obj/item/stack/rods(location)
- del(src)
+ qdel(src)
return
else
- del(src)
+ qdel(src)
return
/obj/item/flag/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm
index 95430e24238..3420dd3acbd 100644
--- a/code/game/objects/items/policetape.dm
+++ b/code/game/objects/items/policetape.dm
@@ -198,10 +198,10 @@ var/list/tape_roll_applications = list()
for (var/obj/item/tape/P in cur)
if(P.icon_state == icon_dir)
N = 0
- del(P)
+ qdel(P)
cur = get_step(cur,dir[i])
- del(src)
+ qdel(src)
return
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index 1d63ff3e972..5ad2f715f65 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -9,7 +9,7 @@
var/T = pick(types)
new T(loc)
spawn(1)
- del src
+ qdel(src)
// -------------------------------------
// Random cleanables, clearly this makes sense
@@ -23,7 +23,7 @@
var/T = pick(list)
new T(loc)
spawn(0)
- del src
+ qdel(src)
/obj/item/stack/sheet/animalhide/random
@@ -34,7 +34,7 @@
var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey)
var/obj/item/stack/S = new htype(loc)
S.amount = amount
- del src
+ qdel(src)
// -------------------------------------
// Not yet identified chemical.
@@ -115,7 +115,7 @@
pixel_x = rand(-5,5)
pixel_y = rand(-5,5)
spawn(0)
- del src
+ qdel(src)
/obj/item/weapon/storage/pill_bottle/random_meds
name = "unlabelled pillbottle"
@@ -311,9 +311,9 @@
Cat2.desc = "It's was alive the whole time!"
sleep(2)
if(prob(50))
- del Cat1
+ qdel(Cat1)
else
- del Cat2
+ qdel(Cat2)
..()
// --------------------------------------
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index aec027bc1b8..fd8963f9b02 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -131,7 +131,7 @@
if (user.get_inactive_hand()==src)
user.unEquip(src)
user.put_in_inactive_hand(B)
- del(src)
+ qdel(src)
if(istype(W, /obj/item/robot_parts/l_leg))
if(src.l_leg) return
user.drop_item()
@@ -254,7 +254,7 @@
callHook("borgify", list(O))
O.Namepick()
- del(src)
+ qdel(src)
else
user << "\blue The MMI must go in after everything else!"
@@ -314,8 +314,8 @@
user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!"
new /mob/living/simple_animal/spiderbot(get_turf(loc))
user.drop_item()
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
return
return
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 41520fabb93..f871087dd6f 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -30,7 +30,7 @@
R.uneq_all()
R.hands.icon_state = "nomod"
R.icon_state = "robot"
- del(R.module)
+ qdel(R.module)
R.module = null
R.camera.network.Remove(list("Engineering","Medical","Mining Outpost"))
R.updatename("Default")
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index 5b131c93fb7..7bc0e7c052c 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -97,7 +97,7 @@
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
O << "\red [src] breaks into tiny pieces and collapses!"
- del(src)
+ qdel(src)
// Create a temporary object to represent the damage
var/obj/bmark = new
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 937ef75df2f..b6bc04227a7 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -63,7 +63,7 @@
if(O.reagents.has_reagent("facid", 1))
user << "The acid chews through the balloon!"
O.reagents.reaction(user)
- del(src)
+ qdel(src)
else
src.desc = "A translucent balloon with some form of liquid sloshing around in it."
user << "\blue You fill the balloon with the contents of [O]."
@@ -80,7 +80,7 @@
src.icon_state = "burst"
spawn(5)
if(src)
- del(src)
+ qdel(src)
return
/obj/item/toy/balloon/update_icon()
@@ -223,7 +223,7 @@
if(istype(I, /obj/item/toy/ammo/crossbow))
if(bullets <= 4)
user.drop_item()
- del(I)
+ qdel(I)
bullets++
user << "\blue You load the foam dart into the crossbow."
else
@@ -254,21 +254,21 @@
if(M == user) continue
D.visible_message("[M] was hit by the foam dart!")
new /obj/item/toy/ammo/crossbow(M.loc)
- del(D)
+ qdel(D)
return
for(var/atom/A in D.loc)
if(A == user) continue
if(A.density)
new /obj/item/toy/ammo/crossbow(A.loc)
- del(D)
+ qdel(D)
sleep(1)
spawn(10)
if(D)
new /obj/item/toy/ammo/crossbow(D.loc)
- del(D)
+ qdel(D)
return
else if (bullets == 0)
@@ -332,7 +332,7 @@
if(istype(I, /obj/item/toy/ammo/crossbow))
if(bullets <= 19)
user.drop_item()
- del(I)
+ qdel(I)
bullets++
user << "You load the foam dart into the tommy gun."
else
@@ -389,8 +389,8 @@
new /obj/item/weapon/twohanded/dualsaber/toy(user.loc)
user.unEquip(W)
user.unEquip(src)
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
/*
* Subtype of Double-Bladed Energy Swords
@@ -457,7 +457,7 @@
playsound(src, 'sound/effects/snap.ogg', 50, 1)
- del(src)
+ qdel(src)
@@ -481,7 +481,7 @@
new /obj/effect/decal/cleanable/ash(src.loc)
src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
- del(src)
+ qdel(src)
/obj/item/toy/snappop/Crossed(H as mob|obj)
if((ishuman(H))) //i guess carp and shit shouldn't set them off
@@ -495,7 +495,7 @@
new /obj/effect/decal/cleanable/ash(src.loc)
src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
- del(src)
+ qdel(src)
@@ -691,7 +691,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
return
src.cards += C.cardname
user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.")
- del(C)
+ qdel(C)
else
user << "You can't mix cards from other decks."
if(cards.len > 26)
@@ -711,7 +711,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
return
src.cards += C.currenthand
user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.")
- del(C)
+ qdel(C)
else
user << "You can't mix cards from other decks."
if(cards.len > 26)
@@ -803,7 +803,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
cardUser.put_in_any_hand_if_possible(N)
cardUser << "You also take [currenthand[1]] and hold it."
cardUser << browse(null, "window=cardhand")
- del(src)
+ qdel(src)
return
obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
@@ -819,7 +819,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
src.icon_state = "[deckstyle]_hand4"
else if(currenthand.len > 2)
src.icon_state = "[deckstyle]_hand3"
- del(C)
+ qdel(C)
else
user << "You can't mix cards from other decks."
@@ -890,8 +890,8 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
H.pickup(user)
user.put_in_active_hand(H)
user << "You combine the [C.cardname] and the [src.cardname] into a hand."
- del(C)
- del(src)
+ qdel(C)
+ qdel(src)
else
user << "You can't mix cards from other decks."
@@ -908,7 +908,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
H.icon_state = "[deckstyle]_hand4"
else if(H.currenthand.len > 2)
H.icon_state = "[deckstyle]_hand3"
- del(src)
+ qdel(src)
else
user << "You can't mix cards from other decks."
@@ -1068,7 +1068,7 @@ obj/item/toy/cards/deck/syndicate/black
for(var/mob/M in range(10, src))
if(!M.stat && !istype(M, /mob/living/silicon/ai))\
shake_camera(M, 3, 1)
- del(src)
+ qdel(src)
/*
* Carp plushie
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 1d83bf272c6..5180ae09658 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -369,7 +369,7 @@ AI MODULES
if(!laws.len) //Failsafe if something goes wrong with silicon_laws.txt.
warning("ERROR: empty custom board created, empty custom board deleted. Please check silicon_laws.txt.")
- del(src)
+ qdel(src)
/****************** T.Y.R.A.N.T. *****************/
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index f6c7e99a05c..24788c42a0e 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -46,7 +46,7 @@ RCD
return
matter += R.ammoamt
user.drop_item()
- del(W)
+ qdel(W)
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
user << "The RCD now holds [matter]/[max_matter] matter-units."
desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 055b28ede27..1d43d93fae9 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -25,7 +25,7 @@ RSF
if ((matter + 10) > 30)
user << "The RSF cant hold any more matter."
return
- del(W)
+ qdel(W)
matter += 10
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
user << "The RSF now holds [matter]/30 fabrication-units."
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index b3cbbcd7421..02f1e5d9cee 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -18,7 +18,7 @@
/obj/item/weapon/chrono_eraser/dropped()
if(PA)
- del(PA)
+ qdel(PA)
/obj/item/weapon/chrono_eraser/Destroy()
dropped()
@@ -28,7 +28,7 @@
var/mob/living/carbon/user = src.loc
if(iscarbon(user) && (user.back == src))
if(PA)
- del(PA)
+ qdel(PA)
else
PA = new(src)
user.put_in_hands(PA)
@@ -58,10 +58,10 @@
TED = T
else //admin must have spawned it
TED = new(src.loc)
- del(src)
+ qdel(src)
/obj/item/weapon/gun/energy/chrono_gun/dropped()
- del(src)
+ qdel(src)
/obj/item/weapon/gun/energy/chrono_gun/update_icon()
return
@@ -193,7 +193,7 @@
if(tickstokill > initial(tickstokill))
for(var/atom/movable/AM in contents)
AM.loc = loc
- del(src)
+ qdel(src)
else if(tickstokill <= 0)
captured << "As the last essence of your being is erased from time, you begin to re-experience your most enjoyable memory. You feel happy..."
var/mob/dead/observer/ghost = captured.ghostize(1)
@@ -202,8 +202,8 @@
ghost.mind = null
if(gun)
gun.pass_mind(captured.mind)
- del(captured)
- del(src)
+ qdel(captured)
+ qdel(src)
else
captured.Paralyse(4)
if(captured.reagents)
@@ -222,7 +222,7 @@
else
tickstokill++
else
- del(src)
+ qdel(src)
/obj/effect/chrono_field/bullet_act(var/obj/item/projectile/P)
if(istype(P, /obj/item/projectile/energy/chrono_beam))
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 8724d2663ee..df5a6af8cf3 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -102,7 +102,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(ismob(loc))
var/mob/M = loc
M.unEquip(src, 1)
- del(src)
+ qdel(src)
return
if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
var/datum/effect/effect/system/reagents_explosion/e = new()
@@ -111,7 +111,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(ismob(loc))
var/mob/M = loc
M.unEquip(src, 1)
- del(src)
+ qdel(src)
return
flags &= ~NOREACT // allowing reagents to react after being lit
reagents.handle_reactions()
@@ -174,7 +174,7 @@ LIGHTERS ARE IN LIGHTERS.DM
M << "Your [name] goes out."
M.unEquip(src, 1) //Force the un-equip so the overlays update
processing_objects.Remove(src)
- del(src)
+ qdel(src)
/obj/item/clothing/mask/cigarette/joint
@@ -383,7 +383,7 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user)
var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
user.put_in_inactive_hand(P)
user << "You take the last paper out of the pack, and throw the pack away."
- del(src)
+ qdel(src)
/obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object)
var/mob/M = usr
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 50fe4d8ad3d..413f93f02f9 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -63,13 +63,13 @@
user.visible_message("[user] begins to scrub \the [target.name] out with [src].")
if(do_after(user, src.cleanspeed) && target)
user << "You scrub \the [target.name] out."
- del(target)
+ qdel(target)
else
user.visible_message("[user] begins to clean \the [target.name] with [src].")
if(do_after(user, src.cleanspeed))
user << "You clean \the [target.name]."
var/obj/effect/decal/cleanable/C = locate() in target
- del(C)
+ qdel(C)
target.clean_blood()
return
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 7c92cdc2249..9fadc35d668 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -91,7 +91,7 @@
spawn(0)//this prevents the collapse of space-time continuum
if (user)
user.unEquip(src)
- del(src)
+ qdel(src)
return uses
/obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob)
diff --git a/code/game/objects/items/weapons/fireworks.dm b/code/game/objects/items/weapons/fireworks.dm
index 9a90c3ae205..dbd765b0fdd 100644
--- a/code/game/objects/items/weapons/fireworks.dm
+++ b/code/game/objects/items/weapons/fireworks.dm
@@ -18,7 +18,7 @@ obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params)
if(ismob(src.loc) || isobj(src.loc))
S.attach(src.loc)
S.start()
- del(src)
+ qdel(src)
obj/item/weapon/sparkler
name = "sparkler"
@@ -42,7 +42,7 @@ obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params)
S.attach(src.loc)
S.start()
sleep(10)
- del(src)
+ qdel(src)
/obj/crate/fireworks
name = "Fireworks!"
/obj/crate/fireworks/New()
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index c972821fcb0..db3d8a38092 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -31,7 +31,7 @@
src.gift.add_fingerprint(user)
else
user << "\blue The gift was empty!"
- del(src)
+ qdel(src)
return
/obj/item/weapon/a_gift/ex_act()
@@ -58,7 +58,7 @@
M.client.eye = M.client.mob
M.client.perspective = MOB_PERSPECTIVE
- del(src)
+ qdel(src)
/obj/item/weapon/a_gift/attack_self(mob/M as mob)
var/gift_type = pick(/obj/item/weapon/sord,
@@ -112,7 +112,7 @@
M.unEquip(src, 1)
M.put_in_hands(I)
I.add_fingerprint(M)
- del(src)
+ qdel(src)
return
/*
diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm
index dae50bb302a..b8badd98707 100644
--- a/code/game/objects/items/weapons/grenades.dm
+++ b/code/game/objects/items/weapons/grenades.dm
@@ -409,7 +409,7 @@
new /obj/item/weapon/grenade/clusterbuster/segment(src.loc,payload,name)//Creates a 'segment' that launches more payloads
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
spawn(0)
- del(src)
+ qdel(src)
return
/obj/item/weapon/grenade/clusterbuster/segment
@@ -440,7 +440,7 @@
new /obj/item/weapon/grenade/clusterbuster/node(src.loc,payload)
spawn(0)
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- del(src)
+ qdel(src)
return
/obj/item/weapon/grenade/clusterbuster/node/New(var/turf/newloc,var/T,var/N)
@@ -458,4 +458,4 @@
A:prime()
if(istype(A,/obj/singularity)) // I can't emphasize enough how much you should never use this grenade
A:energy = 200
- del src
+ qdel(src)
diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm
index c3fd3acf87f..cdaa19066f2 100644
--- a/code/game/objects/items/weapons/grenades/bananade.dm
+++ b/code/game/objects/items/weapons/grenades/bananade.dm
@@ -29,7 +29,7 @@ var/turf/T
- del(src)
+ qdel(src)
return
/obj/item/weapon/grenade/bananade/casing
@@ -44,7 +44,7 @@ var/turf/T
if(fillamt < 9)
usr << "You add another banana peel to the assembly."
fillamt += 1
- del(I)
+ qdel(I)
else
usr << "The bananade is full, screwdriver it shut to lock it down."
if(istype(I, /obj/item/weapon/screwdriver))
@@ -54,7 +54,7 @@ var/turf/T
user.put_in_hands(G)
G.deliveryamt = src.fillamt
user << "You lock the assembly shut, readying it for HONK."
- del(src)
+ qdel(src)
else
usr << "You need to add banana peels before you can ready the grenade!."
else
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 9adf9cf5d4b..28bea3240a3 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -266,7 +266,7 @@
update_mob()
invisibility = INVISIBILITY_MAXIMUM //kaboom
- del nadeassembly // do this now to stop infrared beams
+ qdel(nadeassembly) // do this now to stop infrared beams
var/end_temp = 0
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
G.reagents.trans_to(src, G.reagents.total_volume)
@@ -285,7 +285,7 @@
spawn(15) //Making sure all reagents can work
- del(src) //correctly before deleting the grenade.
+ qdel(src) //correctly before deleting the grenade.
/obj/item/weapon/grenade/chem_grenade/proc/CreateDefaultTrigger(var/typekey)
if(ispath(typekey,/obj/item/device/assembly))
@@ -364,7 +364,7 @@
invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?
spawn(50) //To make sure all reagents can work
- del(src) //correctly before deleting the grenade.
+ qdel(src) //correctly before deleting the grenade.
//I tried to just put it in the allowed_containers list but
diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm
index 9d0cc3fca2c..f2d438df310 100644
--- a/code/game/objects/items/weapons/grenades/clowngrenade.dm
+++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm
@@ -40,7 +40,7 @@
else
step(peel,direction)
new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
- del(src)
+ qdel(src)
return
/*
proc/banana(turf/T as turf)
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 8e66d4b70de..d4d90b3f094 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -8,6 +8,6 @@
prime()
..()
if(empulse(src, 4, 10))
- del(src)
+ qdel(src)
return
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 91479c961a7..fbe12bd5342 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -18,7 +18,7 @@
var/damage = round(30/(get_dist(B,get_turf(src))+1))
B.health -= damage
B.update_icon()
- del(src)
+ qdel(src)
/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M)
M.show_message("BANG", 2)
@@ -96,7 +96,7 @@
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- del(src)
+ qdel(src)
//////////////////////
@@ -126,7 +126,7 @@
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- del(src)
+ qdel(src)
////////////////////////////////
//Clusterbang spawned flashbang
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index bc07fb389b9..bdbfd1fd4ea 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -10,8 +10,8 @@
user.put_in_hands(W)
user << "You stuff the [I] in the [src], emptying the contents beforehand."
W.underlays += image(src.icon, icon_state = src.icon_state)
- del(I)
- del(src)
+ qdel(I)
+ qdel(src)
/obj/item/weapon/grenade/iedcasing
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index 95a5fbbd387..fc216a1e455 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -31,5 +31,5 @@
B.health -= damage
B.update_icon()
sleep(80)
- del(src)
+ qdel(src)
return
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index 7929896ddcd..224624549c7 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -30,7 +30,7 @@
// Spawn some hostile syndicate critters
- del(src)
+ qdel(src)
return
/obj/item/weapon/grenade/spawnergrenade/manhacks
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 4dec738bb56..e9a58e5307d 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -153,7 +153,7 @@ Implant Specifics:
"}
msg = sanitize_simple(msg, replacechars)
if(findtext(msg,phrase))
activate()
- del(src)
+ qdel(src)
activate()
if (malfunction == MALFUNCTION_PERMANENT)
@@ -177,11 +177,11 @@ Implant Specifics:
"}
istype(part,/obj/item/organ/external/head))
part.createwound(BRUISE, 60) //mangle them instead
explosion(get_turf(imp_in), -1, -1, 2, 3)
- del(src)
+ qdel(src)
else
explosion(get_turf(imp_in), -1, -1, 2, 3)
part.droplimb()
- del(src)
+ qdel(src)
if (elevel == "Destroy Body")
explosion(get_turf(T), -1, 0, 1, 6)
T.gib()
@@ -247,7 +247,7 @@ Implant Specifics:
"}
else
part.droplimb()
explosion(get_turf(imp_in), -1, -1, 2, 3)
- del(src)
+ qdel(src)
/obj/item/weapon/implant/chem
name = "chem"
@@ -294,7 +294,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
if(!src.reagents.total_volume)
R << "You hear a faint click from your chest."
spawn(0)
- del(src)
+ qdel(src)
return
emp_act(severity)
@@ -484,17 +484,17 @@ the implant may become unstable and either pre-maturely inject the subject or si
a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm")
else
a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
- del(a)
+ qdel(a)
processing_objects.Remove(src)
if ("emp")
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
var/name = prob(50) ? t.name : pick(teleportlocs)
a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
- del(a)
+ qdel(a)
else
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
- del(a)
+ qdel(a)
processing_objects.Remove(src)
emp_act(severity) //for some reason alarms stop going off in case they are emp'd, even without this
@@ -552,7 +552,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
imp_in.put_in_hands(scanned)
else
scanned.loc = t
- del src
+ qdel(src)
implanted(mob/source as mob)
src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index d03f499a26c..dc9f95ad322 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -84,7 +84,7 @@
return
var/mob/M = G:affecting
if(put_mob(M))
- del(G)
+ qdel(G)
src.updateUsrDialog()
return
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 5581eaf3bd5..acbe349fc8e 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -24,7 +24,7 @@
A.clean_blood()
for(var/obj/effect/O in A)
if(istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay) || istype(O,/obj/effect/rune))
- del(O)
+ qdel(O)
reagents.reaction(A, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
reagents.remove_any(1) //reaction() doesn't use up the reagents
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index b06ea04e671..4a57227afa0 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -40,12 +40,12 @@
if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
investigate_log("has become a singularity. Caused by [user.key]","singulo")
user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!"
- del(W)
+ qdel(W)
var/obj/singularity/singulo = new /obj/singularity (get_turf(src))
singulo.energy = 300 //should make it a bit bigger~
message_admins("[key_name_admin(user)] detonated a bag of holding")
log_game("[key_name(user)] detonated a bag of holding")
- del(src)
+ qdel(src)
return
..()
@@ -57,7 +57,7 @@
else
user << "\red The Bluespace generator malfunctions!"
for (var/obj/O in src.contents) //it broke, delete what was in it
- del(O)
+ qdel(O)
crit_fail = 1
icon_state = "brokenpack"
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index df4c53b6224..b760ae038ad 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -361,7 +361,7 @@
else
user << "\red The Bluespace generator malfunctions!"
for (var/obj/O in src.contents) //it broke, delete what was in it
- del(O)
+ qdel(O)
crit_fail = 1
return 0
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 40782759603..6aa5340245d 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -190,7 +190,7 @@
New(obj/item/sample as obj)
if(!istype(sample))
- del(src)
+ qdel(src)
sample_object = sample
number = 1
@@ -479,7 +479,7 @@
// Now make the cardboard
user << "You fold [src] flat."
new src.foldable(get_turf(src))
- del(src)
+ qdel(src)
//BubbleWrap END
//Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area).
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index a50dd50f6fb..0ec557bc163 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -18,7 +18,7 @@
..()
if (src.type == /obj/item/weapon/storage/toolbox)
world << "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]"
- del(src)
+ qdel(src)
/obj/item/weapon/storage/toolbox/emergency
name = "emergency toolbox"
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 639b6770f9b..d0619606d57 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -73,8 +73,8 @@
if(src.hacked) // That's right, we'll only check the "original" esword.
newSaber.hacked = 1
newSaber.blade_color = "rainbow"
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
else if(istype(W, /obj/item/device/multitool))
if(hacked == 0)
@@ -201,11 +201,11 @@
return
/obj/item/weapon/melee/energy/blade/dropped()
- del(src)
+ qdel(src)
return
/obj/item/weapon/melee/energy/blade/proc/toss()
- del(src)
+ qdel(src)
return
/*
diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm
index 560d5c2e754..22a31ae1dc8 100644
--- a/code/game/objects/items/weapons/table_rack_parts.dm
+++ b/code/game/objects/items/weapons/table_rack_parts.dm
@@ -52,20 +52,20 @@
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
//SN src = null
- del(src)
+ qdel(src)
if (istype(W, /obj/item/stack/rods))
if (W:amount >= 4)
new /obj/item/weapon/table_parts/reinforced( user.loc )
user << "\blue You reinforce the [name]."
W:use(4)
- del(src)
+ qdel(src)
else if (W:amount < 4)
user << "\red You need at least four rods to do this."
/obj/item/weapon/table_parts/attack_self(mob/user as mob)
new /obj/structure/table( user.loc )
user.drop_item()
- del(src)
+ qdel(src)
return
@@ -76,12 +76,12 @@
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
new /obj/item/stack/rods( user.loc )
- del(src)
+ qdel(src)
/obj/item/weapon/table_parts/reinforced/attack_self(mob/user as mob)
new /obj/structure/table/reinforced( user.loc )
user.drop_item()
- del(src)
+ qdel(src)
return
/*
@@ -90,12 +90,12 @@
/obj/item/weapon/table_parts/wood/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/wood( user.loc )
- del(src)
+ qdel(src)
/obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
new /obj/structure/table/woodentable( user.loc )
user.drop_item()
- del(src)
+ qdel(src)
return
/*
@@ -105,12 +105,12 @@
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
new /obj/item/stack/sheet/metal( user.loc )
- del(src)
+ qdel(src)
/obj/item/weapon/table_parts/glass/attack_self(mob/user as mob)
new /obj/structure/glasstable_frame( user.loc )
user.drop_item()
- del(src)
+ qdel(src)
return
/*
@@ -120,7 +120,7 @@
..()
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
- del(src)
+ qdel(src)
return
return
@@ -128,5 +128,5 @@
var/obj/structure/rack/R = new /obj/structure/rack( user.loc )
R.add_fingerprint(user)
user.drop_item()
- del(src)
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 54d03fabd4c..14edc242cc2 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -65,7 +65,7 @@
if(allgases >= 0.005)
return 1
- del(G)
+ qdel(G)
return
ui_action_click()
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index f493fa53726..5fb04ffbafb 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -71,12 +71,12 @@
if(prob(50))
var/turf/location = src.loc
if (!( istype(location, /turf) ))
- del(src)
+ qdel(src)
if(src.air_contents)
location.assume_air(air_contents)
- del(src)
+ qdel(src)
/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index b996695dc81..2582a42c214 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -115,10 +115,10 @@
flags = ABSTRACT
/obj/item/weapon/twohanded/offhand/unwield()
- del(src)
+ qdel(src)
/obj/item/weapon/twohanded/offhand/wield()
- del(src)
+ qdel(src)
/obj/item/weapon/twohanded/offhand/IsShield()//if the actual twohanded weapon is a shield, we count as a shield too!
var/mob/user = loc
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 91e8d1259be..56a31ed5284 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -175,8 +175,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
user.put_in_hands(S)
user << "You fasten the glass shard to the top of the rod with the cable."
- del(I)
- del(src)
+ qdel(I)
+ qdel(src)
else if(istype(I, /obj/item/weapon/wirecutters))
var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
@@ -186,8 +186,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
user.put_in_hands(P)
user << "You fasten the wirecutters to the top of the rod with the cable, prongs outward."
- del(I)
- del(src)
+ qdel(I)
+ qdel(src)
/obj/item/weapon/spear/kidan
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 7e330c7c0f2..7b54984399a 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -11,7 +11,7 @@
..()
if (!prob(spawn_nothing_percentage))
spawn_item()
- del src
+ qdel(src)
// this function should return a specific item to spawn
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 88649ff62fa..97b9b42019e 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -5,7 +5,7 @@
/obj/structure/blob_act()
if(prob(50))
- del(src)
+ qdel(src)
/obj/structure/ex_act(severity)
switch(severity)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index edc99071fb4..3bfd507483e 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -157,7 +157,7 @@
if(health <= 0)
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
- del(src)
+ qdel(src)
return
/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
@@ -166,14 +166,14 @@
visible_message("\red [user] destroys the [src]. ")
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
- del(src)
+ qdel(src)
// this should probably use dump_contents()
/obj/structure/closet/blob_act()
if(prob(75))
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
- del(src)
+ qdel(src)
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/rcs) && !src.opened)
@@ -254,7 +254,7 @@
new /obj/item/stack/sheet/metal(src.loc)
for(var/mob/M in viewers(src))
M.show_message("\The [src] has been cut apart by [user] with \the [WT].", 3, "You hear welding.", 2)
- del(src)
+ qdel(src)
return
if(isrobot(user))
return
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index e4249321488..6a5bf87680e 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -41,7 +41,7 @@
desc = "If it takes forever, I will wait for you..."
if(health == 0) //meaning if the statue didn't find a valid target
- del(src)
+ qdel(src)
return
processing_objects.Add(src)
@@ -57,7 +57,7 @@
if (timer <= 0)
dump_contents()
processing_objects.Remove(src)
- del(src)
+ qdel(src)
/obj/structure/closet/statue/dump_contents()
@@ -151,7 +151,7 @@
user.dust()
dump_contents()
visible_message("\red [src] shatters!. ")
- del(src)
+ qdel(src)
/obj/structure/statue
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 65581b09232..0fc9a950580 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -48,7 +48,7 @@
// teehee - Ah, tg coders...
if ("delete")
- del(src)
+ qdel(src)
//If you want to re-add fire, just add "fire" = 15 to the pick list.
/*if ("fire")
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 115f4a0b5d2..6549a0fc9f6 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -160,7 +160,7 @@
return
user << "You rig [src]."
user.drop_item()
- del(W)
+ qdel(W)
rigged = 1
return
else if(istype(W, /obj/item/device/radio/electropack))
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 4c1a4c8ab88..df4457c5c37 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -43,7 +43,7 @@
user.visible_message("[user] pries \the [src] open.", \
"You pry open \the [src].", \
"You hear splitting wood.")
- del(src)
+ qdel(src)
else
return attack_hand(user)
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index 53cc69d98ae..a7175857ef9 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -17,7 +17,7 @@
/obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
if(!P.nodamage)
visible_message("[P] tears [src] down!")
- del(src)
+ qdel(src)
else
..(P, def_zone)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index b33bb093469..0e34ed14e68 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -19,7 +19,7 @@
if(istype(W, /obj/item/weapon/crowbar))
new /obj/machinery/constructable_frame/machine_frame(T)
new /obj/item/stack/sheet/glass(T)
- del(src)
+ qdel(src)
playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
return
@@ -33,7 +33,7 @@
C.req_access = circuit.conf_access
C.req_one_access = null
playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
- del(src)
+ qdel(src)
return
if(istype(W, /obj/item/weapon/crowbar))
circuit.loc=T
@@ -123,8 +123,8 @@
if (prob(75))
PoolOrNew(/obj/item/weapon/shard, loc)
if(occupant) dump()
- del(src)
-
+ qdel(src)
+
/obj/structure/displaycase/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))
@@ -194,7 +194,7 @@
C.loc=T
circuit=null
new /obj/machinery/constructable_frame/machine_frame(T)
- del(src)
+ qdel(src)
if(user.a_intent == "harm")
src.health -= W.force
src.healthcheck()
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index eff4159c867..698592e9c5f 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -174,7 +174,7 @@ obj/structure/door_assembly
if(!src || !WT.isOn()) return
user << "\blue You dissasembled the airlock assembly!"
new /obj/item/stack/sheet/metal(src.loc, 4)
- del (src)
+ qdel(src)
else
user << "\blue You need more welding fuel."
return
@@ -290,7 +290,7 @@ obj/structure/door_assembly
else
door.name = "[istext(glass) ? "[glass] airlock" : base_name]"
src.electronics.loc = door
- del(src)
+ qdel(src)
else
..()
update_state()
diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
index fd0c12f00c0..03d0df1c669 100644
--- a/code/game/objects/structures/electricchair.dm
+++ b/code/game/objects/structures/electricchair.dm
@@ -29,7 +29,7 @@
part.loc = loc
part.master = null
part = null
- del(src)
+ qdel(src)
return
return
@@ -87,4 +87,3 @@
A.power_light = light
A.updateicon()
return
-
\ No newline at end of file
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 8057ce7e922..585b1991a91 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -15,14 +15,14 @@
if(!src) return
user << "\blue You dissasembled the girder!"
new /obj/item/stack/sheet/metal(get_turf(src))
- del(src)
+ qdel(src)
else if(!anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user << "\blue Now securing the girder"
if(get_turf(user, 40))
user << "\blue You secured the girder!"
new/obj/structure/girder( src.loc )
- del(src)
+ qdel(src)
else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
user << "\blue Now slicing apart the girder"
@@ -30,12 +30,12 @@
if(!src) return
user << "\blue You slice apart the girder!"
new /obj/item/stack/sheet/metal(get_turf(src))
- del(src)
+ qdel(src)
else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
user << "\blue You drill through the girder!"
new /obj/item/stack/sheet/metal(get_turf(src))
- del(src)
+ qdel(src)
else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -52,7 +52,7 @@
if(!src) return
user << "\blue You removed the support struts!"
new/obj/structure/girder( src.loc )
- del(src)
+ qdel(src)
else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored )
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
@@ -61,7 +61,7 @@
if(!src) return
user << "\blue You dislodged the girder!"
new/obj/structure/girder/displaced( src.loc )
- del(src)
+ qdel(src)
else if(istype(W, /obj/item/stack/sheet))
@@ -74,7 +74,7 @@
S.use(2)
user << "\blue You create a false wall! Push on it to open or close the passage."
new /obj/structure/falsewall (src.loc)
- del(src)
+ qdel(src)
else
if(S.amount < 2) return ..()
user << "\blue Now adding plating..."
@@ -86,7 +86,7 @@
Tsrc.ChangeTurf(/turf/simulated/wall)
for(var/turf/simulated/wall/X in Tsrc.loc)
if(X) X.add_hiddenprint(usr)
- del(src)
+ qdel(src)
return
if(/obj/item/stack/sheet/plasteel)
@@ -95,7 +95,7 @@
S.use(2)
user << "\blue You create a false wall! Push on it to open or close the passage."
new /obj/structure/falsewall/reinforced (src.loc)
- del(src)
+ qdel(src)
else
if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
if(S.amount < 1) return ..()
@@ -108,7 +108,7 @@
Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
if(X) X.add_hiddenprint(usr)
- del(src)
+ qdel(src)
return
else
if(S.amount < 1) return ..()
@@ -118,7 +118,7 @@
S.use(1)
user << "\blue Girders reinforced!"
new/obj/structure/girder/reinforced( src.loc )
- del(src)
+ qdel(src)
return
if(S.sheettype)
@@ -129,7 +129,7 @@
user << "\blue You create a false wall! Push on it to open or close the passage."
var/F = text2path("/obj/structure/falsewall/[M]")
new F (src.loc)
- del(src)
+ qdel(src)
else
if(S.amount < 2) return ..()
user << "\blue Now adding plating..."
@@ -141,7 +141,7 @@
Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
if(X) X.add_hiddenprint(usr)
- del(src)
+ qdel(src)
return
add_hiddenprint(usr)
@@ -157,7 +157,7 @@
/obj/structure/girder/blob_act()
if(prob(40))
- del(src)
+ qdel(src)
/obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam))
@@ -165,7 +165,7 @@
..()
if(health <= 0)
new /obj/item/stack/sheet/metal(get_turf(src))
- del(src)
+ qdel(src)
if(istype(Proj ,/obj/item/projectile/beam/pulse))
src.ex_act(2)
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index bbce5440dd8..14b51d03498 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -11,7 +11,7 @@
var/obj/structure/inflatable/R = new /obj/structure/inflatable(user.loc)
src.transfer_fingerprints_to(R)
R.add_fingerprint(user)
- del(src)
+ qdel(src)
/obj/structure/inflatable
name = "inflatable wall"
@@ -48,7 +48,7 @@
ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
deflate(1)
@@ -118,14 +118,14 @@
visible_message("[src] rapidly deflates!")
var/obj/item/inflatable/torn/R = new /obj/item/inflatable/torn(loc)
src.transfer_fingerprints_to(R)
- del(src)
+ qdel(src)
else
//user << "\blue You slowly deflate the inflatable wall."
visible_message("[src] slowly deflates.")
spawn(50)
var/obj/item/inflatable/R = new /obj/item/inflatable(loc)
src.transfer_fingerprints_to(R)
- del(src)
+ qdel(src)
verb/hand_deflate()
set name = "Deflate"
@@ -149,7 +149,7 @@
var/obj/structure/inflatable/door/R = new /obj/structure/inflatable/door(user.loc)
src.transfer_fingerprints_to(R)
R.add_fingerprint(user)
- del(src)
+ qdel(src)
/obj/structure/inflatable/door //Based on mineral door code
name = "inflatable door"
@@ -242,14 +242,14 @@
visible_message("[src] rapidly deflates!")
var/obj/item/inflatable/door/torn/R = new /obj/item/inflatable/door/torn(loc)
src.transfer_fingerprints_to(R)
- del(src)
+ qdel(src)
else
//user << "\blue You slowly deflate the inflatable wall."
visible_message("[src] slowly deflates.")
spawn(50)
var/obj/item/inflatable/door/R = new /obj/item/inflatable/door(loc)
src.transfer_fingerprints_to(R)
- del(src)
+ qdel(src)
/obj/item/inflatable/torn
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index de2fef2875e..e865805991b 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -20,8 +20,8 @@
else
if(spike(G.affecting))
visible_message("[user] has forced [G.affecting] onto the spike, killing them instantly!")
- del(G.affecting)
- del(G)
+ qdel(G.affecting)
+ qdel(G)
else
user << "They are too big for the spike, try something smaller!"
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index b2172cce699..b12907a150f 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -60,7 +60,7 @@
if(WT.remove_fuel(0, user))
user << "\blue Slicing lattice joints ..."
new /obj/item/stack/rods(src.loc)
- del(src)
+ qdel(src)
return
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 37c18f020b1..69508a41940 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -243,7 +243,7 @@
if(!devastated)
for(var/i = 1, i <= oreAmount, i++)
new/obj/item/stack/sheet/wood(get_turf(src))
- del(src)
+ qdel(src)
/obj/structure/mineral_door/resin
mineralType = "resin"
@@ -281,7 +281,7 @@
isSwitchingStates = 0
Dismantle(devastated = 0)
- del(src)
+ qdel(src)
CheckHardness()
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index ce743717f32..9b22f0e2dd5 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -81,7 +81,7 @@
A.loc = src
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null
- del(src.connected)
+ qdel(src.connected)
else
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
src.connected = new /obj/structure/m_tray( src.loc )
@@ -97,7 +97,7 @@
src.connected.dir = src.dir
else
//src.connected = null
- del(src.connected)
+ qdel(src.connected)
src.add_fingerprint(user)
update()
return
@@ -135,7 +135,7 @@
src.connected.icon_state = "morguet"
else
//src.connected = null
- del(src.connected)
+ qdel(src.connected)
return
@@ -164,7 +164,7 @@
src.connected.update()
add_fingerprint(user)
//SN src = null
- del(src)
+ qdel(src)
return
return
@@ -253,7 +253,7 @@
A.loc = src
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null
- del(src.connected)
+ qdel(src.connected)
else if (src.locked == 0)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
src.connected = new /obj/structure/c_tray( src.loc )
@@ -268,7 +268,7 @@
src.connected.icon_state = "cremat"
else
//src.connected = null
- del(src.connected)
+ qdel(src.connected)
src.add_fingerprint(user)
update()
@@ -303,7 +303,7 @@
src.connected.icon_state = "cremat"
else
//src.connected = null
- del(src.connected)
+ qdel(src.connected)
return
/obj/structure/crematorium/proc/cremate(atom/A, mob/user as mob)
@@ -341,10 +341,10 @@
//log_attack("\[[time_stamp()]\] [user]/[user.ckey] cremated [M]/[M.ckey]")
M.death(1)
M.ghostize()
- del(M)
+ qdel(M)
for(var/obj/O in contents) //obj instead of obj/item so that bodybags and ashes get destroyed. We dont want tons and tons of ash piling up
- del(O)
+ qdel(O)
new /obj/effect/decal/cleanable/ash(src)
sleep(30)
@@ -379,7 +379,7 @@
src.connected.update()
add_fingerprint(user)
//SN src = null
- del(src)
+ qdel(src)
return
return
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 6a325830a7a..8eb555152f2 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -33,7 +33,7 @@
//var/icon/I = icon('icons/obj/decals.dmi', icon_state)
//S.icon = I.Scale(24, 24)
S.sign_state = icon_state
- del(src)
+ qdel(src)
else ..()
/obj/item/sign
@@ -62,7 +62,7 @@
S.desc = desc
S.icon_state = sign_state
user << "You fasten \the [S] with your [tool]."
- del(src)
+ qdel(src)
else ..()
/obj/structure/sign/double/map
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 6551676fea1..b7745c60374 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -80,5 +80,5 @@
/obj/structure/stool/bed/nest/proc/healthcheck()
if(health <=0)
density = 0
- del(src)
+ qdel(src)
return
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 58723261562..559a63d0d1a 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -42,7 +42,7 @@
/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
if(M.environment_smash)
new /obj/item/stack/sheet/metal(src.loc)
- del(src)
+ qdel(src)
/obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
@@ -133,7 +133,7 @@
visible_message("[user] collapses \the [src.name].")
new/obj/item/roller(get_turf(src))
spawn(0)
- del(src)
+ qdel(src)
return
..()
@@ -147,7 +147,7 @@
/obj/item/roller/attack_self(mob/user)
var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
R.add_fingerprint(user)
- del(src)
+ qdel(src)
/obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -181,7 +181,7 @@
user << "\blue You deploy the roller bed."
var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
R.add_fingerprint(user)
- del(held)
+ qdel(held)
held = null
@@ -223,5 +223,5 @@
visible_message("[usr] collapses \the [src.name]")
new/obj/item/roller(get_turf(src))
spawn(0)
- del(src)
+ qdel(src)
return
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 85e47ec0c40..44ac7b6497b 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -30,7 +30,7 @@
E.part = SK
SK.loc = E
SK.master = E
- del(src)
+ qdel(src)
/obj/structure/stool/bed/chair/attack_tk(mob/user as mob)
if(buckled_mob)
@@ -89,7 +89,7 @@
if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
new /obj/item/stack/sheet/wood(src.loc)
- del(src)
+ qdel(src)
else
..()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 69397b22d2b..726964e7ef3 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -24,13 +24,13 @@
/obj/structure/stool/blob_act()
if(prob(75))
new /obj/item/stack/sheet/metal(src.loc)
- del(src)
+ qdel(src)
/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
new /obj/item/stack/sheet/metal(src.loc)
- del(src)
+ qdel(src)
return
/obj/structure/stool/MouseDrop(atom/over_object)
@@ -58,7 +58,7 @@
origin.loc = get_turf(src)
user.unEquip(src)
user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.")
- del src
+ qdel(src)
/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
if (prob(5) && istype(M,/mob/living))
@@ -66,7 +66,7 @@
user.unEquip(src)
var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
m.loc = get_turf(src)
- del src
+ qdel(src)
var/mob/living/T = M
T.Weaken(5)
return
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 6aba8357e12..0d44c405cb7 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -171,7 +171,7 @@
/obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up
overlays.Cut() //once it's been on for a while, in addition to handling the water overlay.
if(mymist)
- del(mymist)
+ qdel(mymist)
if(on)
overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
@@ -190,7 +190,7 @@
mymist = new /obj/effect/mist(loc)
spawn(250)
if(src && !on)
- del(mymist)
+ qdel(mymist)
ismist = 0
/obj/machinery/shower/Crossed(atom/movable/O)
@@ -300,7 +300,7 @@
loc.clean_blood()
for(var/obj/effect/E in tile)
if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
- del(E)
+ qdel(E)
/obj/machinery/shower/process()
if(!on || !mobpresent) return
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index ac2efbe2866..f04ce3ab802 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -171,7 +171,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
if(istype(G.affecting,/mob/living))
var/mob/living/M = G.affecting
var/state = G.state
- del(W) //gotta delete it here because if window breaks, it won't get deleted
+ qdel(W) //gotta delete it here because if window breaks, it won't get deleted
switch (state)
if(1)
M.visible_message("[user] slams [M] against \the [src]!")
@@ -241,7 +241,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
density = 0
air_update_turf(1)
update_nearby_icons()
- del(src)
+ qdel(src)
else
if(W.damtype == BRUTE || W.damtype == BURN)
user.changeNext_move(CLICK_CD_MELEE)
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 407c58f2ae6..12bb8f07092 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -164,7 +164,7 @@ var/list/mechtoys = list(
for(var/typepath in (typesof(/datum/supply_packs) - /datum/supply_packs))
var/datum/supply_packs/P = new typepath()
if(P.name == "HEADER")
- del(P)
+ qdel(P)
continue
supply_packs[P.name] = P
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 5a2fcbe719c..5d263e17005 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -344,7 +344,7 @@ var/list/wood_icons = list("wood","wood-broken")
FF.update_icon() //so siding get updated properly
if(!floor_tile) return
- del(floor_tile)
+ qdel(floor_tile)
icon_plating = "plating"
set_light(0)
floor_tile = null
@@ -465,7 +465,7 @@ var/list/wood_icons = list("wood","wood-broken")
var/obj/item/stack/tile/light/T = floor_tile
if(T.state)
user.drop_item(C)
- del(C)
+ qdel(C)
T.state = C //fixing it by bashing it with a light bulb, fun eh?
update_icon()
user << "\blue You replace the light bulb."
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 8771ce02bd4..5ee2a50cf87 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -39,7 +39,9 @@
qdel(E)
/turf/simulated/wall/ChangeTurf(var/newtype)
- for(var/obj/effect/E in src) if(E.name == "Wallrot") del E
+ for(var/obj/effect/E in src)
+ if(E.name == "Wallrot")
+ qdel(E)
var/dsr=0
if(del_suppress_resmoothing) dsr=1
..(newtype)
@@ -239,7 +241,7 @@
user << "The thermite starts melting through the wall."
spawn(100)
- if(O) del(O)
+ if(O) qdel(O)
// F.sd_LumReset() //TODO: ~Carn
return
@@ -300,7 +302,7 @@
user << "You burn away the fungi with \the [WT]."
playsound(src, 'sound/items/Welder.ogg', 10, 1)
for(var/obj/effect/E in src) if(E.name == "Wallrot")
- del E
+ qdel(E)
rotting = 0
return
else if(!is_sharp(W) && W.force >= 10 || W.force >= 20)
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 93a7f289eb4..6d7a6d9e5e9 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -50,7 +50,7 @@
user << "You burn away the fungi with \the [WT]."
playsound(src, 'sound/items/Welder.ogg', 10, 1)
for(var/obj/effect/E in src) if(E.name == "Wallrot")
- del E
+ qdel(E)
rotting = 0
return
else if(!is_sharp(W) && W.force >= 10 || W.force >= 20)
@@ -135,7 +135,7 @@
if (O.amount > 1)
O.amount--
else
- del(O)
+ qdel(O)
return
if(2)
@@ -281,7 +281,7 @@
if (MS.amount > 1)
MS.amount--
else
- del(MS)
+ qdel(MS)
//APC
else if(istype(W,/obj/item/mounted))
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index f69fc7d05a7..bef369ee672 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -65,7 +65,7 @@
user << "\blue You build a catwalk!"
R.use(2)
ChangeTurf(/turf/simulated/floor/plating/airless/catwalk)
- del(L)
+ qdel(L)
return
user << "\blue Constructing support lattice ..."
@@ -78,7 +78,7 @@
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
if(L)
var/obj/item/stack/tile/plasteel/S = C
- del(L)
+ qdel(L)
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
S.build(src)
S.use(1)
@@ -154,7 +154,7 @@
if(src.x <= 1)
if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
- del(A)
+ qdel(A)
return
var/list/cur_pos = src.get_global_map_pos()
@@ -179,7 +179,7 @@
A.loc.Entered(A)
else if (src.x >= world.maxx)
if(istype(A, /obj/effect/meteor))
- del(A)
+ qdel(A)
return
var/list/cur_pos = src.get_global_map_pos()
@@ -204,7 +204,7 @@
A.loc.Entered(A)
else if (src.y <= 1)
if(istype(A, /obj/effect/meteor))
- del(A)
+ qdel(A)
return
var/list/cur_pos = src.get_global_map_pos()
if(!cur_pos) return
@@ -229,7 +229,7 @@
else if (src.y >= world.maxy)
if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
- del(A)
+ qdel(A)
return
var/list/cur_pos = src.get_global_map_pos()
if(!cur_pos) return
diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm
index d5e46566fbb..077af478135 100644
--- a/code/game/vehicles/spacepods/spacepod.dm
+++ b/code/game/vehicles/spacepods/spacepod.dm
@@ -731,7 +731,7 @@ obj/spacepod/verb/toggleLights()
if(t_air)
t_air.merge(removed)
else //just delete the cabin gas, we're in space or some shit
- del(removed)
+ qdel(removed)
else
return stop()
return
diff --git a/code/game/verbs/atom_verbs.dm b/code/game/verbs/atom_verbs.dm
index aa55f33da0a..b758f11cea1 100644
--- a/code/game/verbs/atom_verbs.dm
+++ b/code/game/verbs/atom_verbs.dm
@@ -31,6 +31,6 @@
var/P = new /obj/effect/decal/point(tile)
usr.changeNext_move(CLICK_CD_POINT)
spawn (20)
- if(P) del(P)
+ if(P) qdel(P)
usr.visible_message("[usr] points to [this]")
diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm
index fa900c1634b..eaf5fdb8818 100644
--- a/code/modules/admin/buildmode.dm
+++ b/code/modules/admin/buildmode.dm
@@ -15,7 +15,7 @@
M.client.show_popup_menus = 1
for(var/obj/effect/bmode/buildholder/H)
if(H.cl == M.client)
- del(H)
+ qdel(H)
else
message_admins("[key_name(usr)] has entered build mode.")
log_admin("[key_name(usr)] has entered build mode.")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index fc6bfa4ed53..d2b3dada0e2 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1574,7 +1574,7 @@
S.victim = M
S.loc = M.loc
spawn(20)
- del(S)
+ qdel(S)
var/turf/simulated/floor/T = get_turf(M)
if(istype(T))
@@ -1706,7 +1706,7 @@
var/list/departmentoptions = alldepartments + "All Departments"
destination = input(usr, "To which department?", "Choose a department", "") as null|anything in departmentoptions
if(!destination)
- del(P)
+ qdel(P)
return
for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
@@ -1716,7 +1716,7 @@
var/input = input(src.owner, "Please enter a message to send a fax via secure connection. Use
for line breaks. Both pencode and HTML work.", "Outgoing message from Centcomm", "") as message|null
if(!input)
- del(P)
+ qdel(P)
return
input = P.parsepencode(input) // Encode everything from pencode to html
@@ -1753,7 +1753,7 @@
else if(stamptype == "none")
stamptype = ""
else
- del(P)
+ qdel(P)
return
sendername = input(src.owner, "What organization does the fax come from? This determines the prefix of the paper (i.e. Central Command- Title). This is optional.", "Organization") as text|null
@@ -2031,21 +2031,21 @@
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SC")
for(var/obj/item/clothing/under/O in world)
- del(O)
+ qdel(O)
ok = 1
if("sec_all_clothes")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SAC")
for(var/obj/item/clothing/O in world)
- del(O)
+ qdel(O)
ok = 1
if("sec_classic1")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","SC1")
for(var/obj/item/clothing/suit/fire/O in world)
- del(O)
+ qdel(O)
for(var/obj/structure/grille/O in world)
- del(O)
+ qdel(O)
/* for(var/obj/machinery/vehicle/pod/O in world)
for(var/mob/M in src)
M.loc = src.loc
diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm
index 58a59567944..d3256579191 100644
--- a/code/modules/admin/verbs/BrokenInhands.dm
+++ b/code/modules/admin/verbs/BrokenInhands.dm
@@ -29,7 +29,7 @@
// if(!istates.Find(O.item_state))
// text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.item_state]\" IN \"[O.icon]\"\n"
//text+="\n"
- del(O)
+ qdel(O)
if(text)
var/F = file("broken_hand_icons.txt")
fdel(F)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index c3f0bdb0b01..93dc0fba5b9 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -400,7 +400,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(hsbitem)
for(var/atom/O in world)
if(istype(O, hsbitem))
- del(O)
+ qdel(O)
log_admin("[key_name(src)] has deleted all instances of [hsbitem].")
message_admins("[key_name_admin(src)] has deleted all instances of [hsbitem].", 0)
feedback_add_details("admin_verb","DELA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -461,7 +461,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/mob/adminmob = src.mob
M.ckey = src.ckey
if( isobserver(adminmob) )
- del(adminmob)
+ qdel(adminmob)
feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -615,7 +615,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
continue
if(istype(I, /obj/item/organ))
continue
- del(I)
+ qdel(I)
switch(dresscode)
if ("strip")
//do nothing
@@ -1111,7 +1111,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(G.anchored)
var/obj/singularity/S = new /obj/singularity(get_turf(G), 50)
spawn(0)
- del(G)
+ qdel(G)
S.energy = 1750
S.current_size = 7
S.icon = 'icons/effects/224x224.dmi'
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 30a00193f26..a31e9b38242 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -292,7 +292,7 @@ client/proc/one_click_antag()
if(synd_mind.current.client)
for(var/image/I in synd_mind.current.client.images)
if(I.icon_state == "synd")
- del(I)
+ qdel(I)
for(var/datum/mind/synd_mind in ticker.mode.syndicates)
if(synd_mind.current)
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index 8f8ba84d670..8064542ede8 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -32,7 +32,7 @@
continue
if(istype(I, /obj/item/organ))
continue
- del(I)
+ qdel(I)
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm
index ea37f9da5cf..2d53fef466b 100644
--- a/code/modules/admin/verbs/onlyoneteam.dm
+++ b/code/modules/admin/verbs/onlyoneteam.dm
@@ -17,7 +17,7 @@
continue
if(istype (I, /obj/item/organ))
continue
- del(I)
+ qdel(I)
H << "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs."
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index be2516b923d..59531610b27 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -173,7 +173,7 @@
a_right:holder = null
a_right.loc = T
spawn(0)
- del(src)
+ qdel(src)
return
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 885b163e47a..70a822cd8fb 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -25,7 +25,7 @@
part2.master = null
part1 = null
part2 = null
- del(src)
+ qdel(src)
return
if(istype(W, /obj/item/weapon/screwdriver))
status = !status
diff --git a/code/modules/awaymissions/trigger.dm b/code/modules/awaymissions/trigger.dm
index 7080179b9a6..c31b37fbd8b 100644
--- a/code/modules/awaymissions/trigger.dm
+++ b/code/modules/awaymissions/trigger.dm
@@ -6,7 +6,7 @@
if(M.client)
M << "[message]"
if(once)
- del(src)
+ qdel(src)
/obj/effect/step_trigger/teleport_fancy
var/locationx
@@ -41,4 +41,4 @@
uses--
if(uses == 0)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 21124c4bda3..965c8699e0e 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -87,7 +87,7 @@
O = (H.l_ear == src ? H.r_ear : H.l_ear)
user.unEquip(O)
if(!istype(src,/obj/item/clothing/ears/offear))
- del(O)
+ qdel(O)
O = src
else
O = src
@@ -99,7 +99,7 @@
O.add_fingerprint(user)
if(istype(src,/obj/item/clothing/ears/offear))
- del(src)
+ qdel(src)
/obj/item/clothing/ears/offear
name = "Other ear"
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index e5db1e0280f..eac5aa33530 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -105,7 +105,7 @@
if ((istype(H, /obj/item/weapon/restraints/handcuffs) && !( src.chained )))
//H = null
if (src.icon_state != "orange") return
- del(H)
+ qdel(H)
src.chained = 1
src.slowdown = 15
src.icon_state = "orange1"
diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm
index 0c83d8e7464..f232676a0d7 100644
--- a/code/modules/clothing/spacesuits/breaches.dm
+++ b/code/modules/clothing/spacesuits/breaches.dm
@@ -152,7 +152,7 @@ var/global/list/breach_burn_descriptors = list(
for(var/datum/breach/B in breaches)
if(!B.class)
src.breaches -= B
- del(B)
+ qdel(B)
else
damage += B.class
if(B.damtype == BRUTE)
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index c0b47824979..88428822184 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -36,7 +36,7 @@
/obj/item/clothing/suit/space/chronos/proc/new_camera(var/mob/user)
if(camera)
- del(camera)
+ qdel(camera)
camera = new /obj/effect/chronos_cam(get_turf(user))
camera.holder = user
user.remote_control = camera
@@ -104,11 +104,11 @@
user.client.eye = camera
else
user.client.eye = user
- del(holder)
+ qdel(holder)
else if(user)
user.loc = from_turf
if(phaseanim)
- del(phaseanim)
+ qdel(phaseanim)
teleporting = 0
if(user && !user.loc) //ubersanity
user.loc = locate(0,0,1)
@@ -163,7 +163,7 @@
user << "\nroot@ChronosuitMK4# chronowalk4 --stop\n"
if(camera)
user << "\[ ok \] Sending TERM signal to chronowalk4-view" //yes I know they aren't a different color when shutting down, but they were too similar at a glance
- del(camera)
+ qdel(camera)
if(helmet)
user << "\[ ok \] Stopping ui display driver"
user << "\[ ok \] Stopping brainwave scanner"
@@ -201,7 +201,7 @@
else
src.loc = step
else
- del(src)
+ qdel(src)
/obj/effect/chronos_cam/Destroy()
if(holder)
diff --git a/code/modules/computer3/buildandrepair.dm b/code/modules/computer3/buildandrepair.dm
index 277d0f538c8..7a75e590f92 100644
--- a/code/modules/computer3/buildandrepair.dm
+++ b/code/modules/computer3/buildandrepair.dm
@@ -95,7 +95,7 @@
if(!src || !WT.isOn()) return
user << "\blue You deconstruct the frame."
new /obj/item/stack/sheet/metal( src.loc, 5 )
- del(src)
+ qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -160,7 +160,7 @@
if(do_after(user, 20))
if(P)
P:amount -= 5
- if(!P:amount) del(P)
+ if(!P:amount) qdel(P)
user << "\blue You add cables to the frame."
src.state = 3
src.icon_state = "3"
@@ -212,7 +212,7 @@
if(circuit.OS)
circuit.OS.computer = B
B.RefreshParts() // todo
- del(src)
+ qdel(src)
/*
This will remove peripherals if you specify one, but the main function is to
diff --git a/code/modules/computer3/computers/HolodeckControl.dm b/code/modules/computer3/computers/HolodeckControl.dm
index d53946fa12c..0e04ed50d59 100644
--- a/code/modules/computer3/computers/HolodeckControl.dm
+++ b/code/modules/computer3/computers/HolodeckControl.dm
@@ -160,7 +160,7 @@
if(!silent)
var/obj/oldobj = obj
obj.visible_message("The [oldobj.name] fades away!")
- del(obj)
+ qdel(obj)
proc/checkInteg(var/area/A)
for(var/turf/T in A)
@@ -213,10 +213,10 @@
derez(item)
for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
- del(B)
+ qdel(B)
for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck)
- del(C)
+ qdel(C)
holographic_items = A.copy_contents_to(linkedholodeck , 1)
diff --git a/code/modules/computer3/computers/medical.dm b/code/modules/computer3/computers/medical.dm
index af2a3340ae3..a2aba803e5d 100644
--- a/code/modules/computer3/computers/medical.dm
+++ b/code/modules/computer3/computers/medical.dm
@@ -253,7 +253,7 @@
if (href_list["del_all2"])
for(var/datum/data/record/R in data_core.medical)
//R = null
- del(R)
+ qdel(R)
//Foreach goto(494)
src.temp = "All records deleted."
@@ -419,7 +419,7 @@
if (href_list["del_r2"])
if (src.active2)
//src.active2 = null
- del(src.active2)
+ qdel(src.active2)
if (href_list["d_rec"])
var/datum/data/record/R = locate(href_list["d_rec"])
diff --git a/code/modules/computer3/computers/security.dm b/code/modules/computer3/computers/security.dm
index cccfaca2d6e..4f9d2088074 100644
--- a/code/modules/computer3/computers/security.dm
+++ b/code/modules/computer3/computers/security.dm
@@ -397,7 +397,7 @@ What a mess.*/
if ("Purge All Records")
for(var/datum/data/record/R in data_core.security)
- del(R)
+ qdel(R)
temp = "All Security records deleted."
if ("Add Entry")
@@ -581,17 +581,17 @@ What a mess.*/
if ("Delete Record (Security) Execute")
if (active2)
- del(active2)
+ qdel(active2)
if ("Delete Record (ALL) Execute")
if (active1)
for(var/datum/data/record/R in data_core.medical)
if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
- del(R)
+ qdel(R)
else
- del(active1)
+ qdel(active1)
if (active2)
- del(active2)
+ qdel(active2)
else
temp = "This function does not appear to be working at the moment. Our apologies."
@@ -622,7 +622,7 @@ What a mess.*/
continue
else if(prob(1))
- del(R)
+ qdel(R)
continue
..(severity)
diff --git a/code/modules/computer3/laptop.dm b/code/modules/computer3/laptop.dm
index 6880935e495..e4e3876e89f 100644
--- a/code/modules/computer3/laptop.dm
+++ b/code/modules/computer3/laptop.dm
@@ -52,7 +52,7 @@
O.loc = loc
usr << "\The [src] crumbles to pieces."
spawn(5)
- del src
+ qdel(src)
return
if(!stored_computer.manipulating)
@@ -65,7 +65,7 @@
spawn(5)
stored_computer.manipulating = 0
- del src
+ qdel(src)
else
usr << "\red You are already opening the computer!"
diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm
index a87bc08c4f0..4d96d94878e 100644
--- a/code/modules/computer3/lapvend.dm
+++ b/code/modules/computer3/lapvend.dm
@@ -31,7 +31,7 @@
/obj/machinery/lapvend/blob_act()
if (prob(50))
spawn(0)
- del(src)
+ qdel(src)
return
return
@@ -201,10 +201,10 @@
if (network == 3)
newlap.spawn_parts += (/obj/item/part/computer/networking/cable)
if (power == 1)
- del(newlap.battery)
+ qdel(newlap.battery)
newlap.battery = new /obj/item/weapon/stock_parts/cell/high(newlap)
if (power == 2)
- del(newlap.battery)
+ qdel(newlap.battery)
newlap.battery = new /obj/item/weapon/stock_parts/cell/super(newlap)
newlap.spawn_parts()
@@ -394,7 +394,7 @@
T.time = worldtime2text()
vendor_account.transaction_log.Add(T)
- del(relap)
+ qdel(relap)
vendmode = 0
cardreader = 0
diff --git a/code/modules/computer3/program.dm b/code/modules/computer3/program.dm
index ebead299e1e..f1f68c0890d 100644
--- a/code/modules/computer3/program.dm
+++ b/code/modules/computer3/program.dm
@@ -111,7 +111,7 @@ Programs are a file that can be executed
update_icon()
if(popup)
popup.close()
- del popup
+ qdel(popup)
return
/*
diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm
index e29a1b47e64..095dfcbe360 100644
--- a/code/modules/crafting/guncrafting.dm
+++ b/code/modules/crafting/guncrafting.dm
@@ -24,8 +24,8 @@
var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
user.unEquip(src)
user.put_in_hands(I)
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
return
// SHOTGUN //
@@ -57,8 +57,8 @@
var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
user.unEquip(src)
user.put_in_hands(I)
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
return
/obj/item/weaponcrafting/ishotgunconstruction3
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index 3818786a3e6..c1b1e5f644e 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -77,7 +77,7 @@
I.fingerprint_hash = C.fingerprint_hash
//I.pin = C.pin
//replace old ID
- del(C)
+ qdel(C)
ok = M.equip_if_possible(I, slot_wear_id, 0) //if 1, last argument deletes on fail
break
testing("Replaced ID!")
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index fad9c88110b..e09a3b887c5 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -115,7 +115,7 @@ log transactions
user << "You insert [I] into [src]."
src.attack_hand(user)
- del I
+ qdel(I)
else
..()
diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index 06098e5e34f..9bcec386386 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -23,4 +23,4 @@
if(!C.stat)
var/turf/T = get_turf(C)
if(istype(T, /turf/space))
- del(C)
+ qdel(C)
diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm
index d96c80f60f8..92619024056 100644
--- a/code/modules/events/rogue_drones.dm
+++ b/code/modules/events/rogue_drones.dm
@@ -45,7 +45,7 @@
D.z = 2
D.has_loot = 0
- del(D)
+ qdel(D)
num_recovered++
if(num_recovered > drones_list.len * 0.75)
diff --git a/code/modules/events/sayuevents/meaty_ores.dm b/code/modules/events/sayuevents/meaty_ores.dm
index b5cb7e390cc..0694b932a2c 100644
--- a/code/modules/events/sayuevents/meaty_ores.dm
+++ b/code/modules/events/sayuevents/meaty_ores.dm
@@ -50,4 +50,4 @@
else
new /mob/living/simple_animal/cow(loc)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/events/tear.dm b/code/modules/events/tear.dm
index 4efd8e87582..718b86edeed 100644
--- a/code/modules/events/tear.dm
+++ b/code/modules/events/tear.dm
@@ -19,7 +19,7 @@
/datum/event/tear/end()
if(TE)
- del(TE)
+ qdel(TE)
/obj/effect/tear
name="Dimensional Tear"
@@ -40,7 +40,7 @@
animation.master = src
// flick("newtear",usr)
spawn(15)
- if(animation) del(animation)
+ if(animation) qdel(animation)
spawn(rand(30,120))
diff --git a/code/modules/events/tgevents/dust.dm b/code/modules/events/tgevents/dust.dm
index 17523a92e8e..7bfb719e677 100644
--- a/code/modules/events/tgevents/dust.dm
+++ b/code/modules/events/tgevents/dust.dm
@@ -88,7 +88,7 @@
if(life <= 0)
walk(src,0)
spawn(1)
- del(src)
+ qdel(src)
return 0
return
diff --git a/code/modules/events/tgevents/immovable_rod.dm b/code/modules/events/tgevents/immovable_rod.dm
index d1a09d8633d..cdfdde48afc 100644
--- a/code/modules/events/tgevents/immovable_rod.dm
+++ b/code/modules/events/tgevents/immovable_rod.dm
@@ -67,7 +67,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
Move()
if(z != z_original || loc == destination)
- spawn(0) del(src)
+ spawn(0) qdel(src)
return ..()
Bump(atom/clong)
@@ -87,7 +87,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if(clong.density || prob(10))
clong.ex_act(2)
else
- del(src)
+ qdel(src)
if(clong && prob(25))
src.loc = clong.loc
diff --git a/code/modules/food/candy_maker.dm b/code/modules/food/candy_maker.dm
index b9afb48ad77..3518c4769b0 100644
--- a/code/modules/food/candy_maker.dm
+++ b/code/modules/food/candy_maker.dm
@@ -37,7 +37,7 @@
if(recipe.result) // Ignore recipe subtypes that lack a result
available_recipes += recipe
else
- del(recipe)
+ qdel(recipe)
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/candy/recipe in available_recipes)
@@ -404,7 +404,7 @@
var/id = O.reagents.get_master_reagent_id()
if (id)
amount+=O.reagents.get_reagent_amount(id)
- del(O)
+ qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
diff --git a/code/modules/food/cooker.dm b/code/modules/food/cooker.dm
index 798d0d80f07..30e2dac9ac7 100644
--- a/code/modules/food/cooker.dm
+++ b/code/modules/food/cooker.dm
@@ -52,7 +52,7 @@ obj/machinery/cooker/proc/turnoff(obj/item/olditem)
icon_state = officon
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
on = 0
- del(olditem)
+ qdel(olditem)
return
// Burns the food with a chance of starting a fire - for if you try cooking something that's already been cooked that way
diff --git a/code/modules/food/grill_new.dm b/code/modules/food/grill_new.dm
index 43914a63967..1a4c6f7b98a 100644
--- a/code/modules/food/grill_new.dm
+++ b/code/modules/food/grill_new.dm
@@ -38,7 +38,7 @@
if(recipe.result) // Ignore recipe subtypes that lack a result
available_recipes += recipe
else
- del(recipe)
+ qdel(recipe)
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/grill/recipe in available_recipes)
@@ -402,7 +402,7 @@
var/id = O.reagents.get_master_reagent_id()
if (id)
amount+=O.reagents.get_reagent_amount(id)
- del(O)
+ qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
diff --git a/code/modules/food/oven_new.dm b/code/modules/food/oven_new.dm
index 136b26a5bd0..937913a25b7 100644
--- a/code/modules/food/oven_new.dm
+++ b/code/modules/food/oven_new.dm
@@ -38,7 +38,7 @@
if(recipe.result) // Ignore recipe subtypes that lack a result
available_recipes += recipe
else
- del(recipe)
+ qdel(recipe)
acceptable_items = new
acceptable_reagents = new
for (var/datum/recipe/oven/recipe in available_recipes)
@@ -402,7 +402,7 @@
var/id = O.reagents.get_master_reagent_id()
if (id)
amount+=O.reagents.get_reagent_amount(id)
- del(O)
+ qdel(O)
src.reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
diff --git a/code/modules/holiday/christmas.dm b/code/modules/holiday/christmas.dm
index 5a98288a1cd..765792e5da1 100644
--- a/code/modules/holiday/christmas.dm
+++ b/code/modules/holiday/christmas.dm
@@ -17,7 +17,7 @@
evil_tree.icon_living = evil_tree.icon_state
evil_tree.icon_dead = evil_tree.icon_state
evil_tree.icon_gib = evil_tree.icon_state
- del(xmas)
+ qdel(xmas)
/obj/item/weapon/toy/xmas_cracker
name = "xmas cracker"
diff --git a/code/modules/jungle/jungle.dm b/code/modules/jungle/jungle.dm
index eadeff7558e..54819de1dda 100644
--- a/code/modules/jungle/jungle.dm
+++ b/code/modules/jungle/jungle.dm
@@ -49,8 +49,8 @@
dest_temple.my_ladder.up = my_ladder
//delete the landmarks now that we're finished
- del(dest_temple)
- del(src)
+ qdel(dest_temple)
+ qdel(src)
/obj/effect/landmark/temple/destination/New()
//nothing
@@ -74,7 +74,7 @@
fwall.mineral = mineral
if(mineral == "iron")
fwall.is_metal = 1
- del(F)
+ qdel(F)
for(var/obj/effect/landmark/door_spawner/D in T.contents)
var/spawn_type
@@ -83,7 +83,7 @@
else
spawn_type = text2path("/obj/machinery/door/airlock/[mineral]")
new spawn_type(D.loc)
- del(D)
+ qdel(D)
for(var/turf/unsimulated/wall/T in temple_turfs)
if(mineral != "plasma")
diff --git a/code/modules/jungle/jungle_animals.dm b/code/modules/jungle/jungle_animals.dm
index 37d22ead14e..44391896c87 100644
--- a/code/modules/jungle/jungle_animals.dm
+++ b/code/modules/jungle/jungle_animals.dm
@@ -10,7 +10,7 @@
if(!spawn_type)
var/new_type = pick(typesof(/obj/effect/landmark/animal_spawner) - /obj/effect/landmark/animal_spawner)
new new_type(get_turf(src))
- del(src)
+ qdel(src)
processing_objects.Add(src)
spawned_animal = new spawn_type(get_turf(src))
diff --git a/code/modules/jungle/jungle_plants.dm b/code/modules/jungle/jungle_plants.dm
index f8caa30bb22..28fe2fd1d72 100644
--- a/code/modules/jungle/jungle_plants.dm
+++ b/code/modules/jungle/jungle_plants.dm
@@ -49,7 +49,7 @@
pixel_x = rand(-6,6)
pixel_y = rand(-6,6)
else
- del(src)
+ qdel(src)
else
return ..()
diff --git a/code/modules/jungle/jungle_temple.dm b/code/modules/jungle/jungle_temple.dm
index 90331034774..88be7ed4398 100644
--- a/code/modules/jungle/jungle_temple.dm
+++ b/code/modules/jungle/jungle_temple.dm
@@ -310,7 +310,7 @@
myloc.overlays += flicker
spawn(8)
myloc.overlays -= flicker
- del(flicker)
+ qdel(flicker)
//flick("sawblade",src)
if("poison_dart")
M << "\red You feel something small and sharp strike you!"
@@ -321,7 +321,7 @@
myloc.overlays += flicker
spawn(8)
myloc.overlays -= flicker
- del(flicker)
+ qdel(flicker)
//flick("dart[rand(1,3)]",src)
if("flame_burst")
M << "\red A jet of fire comes out of nowhere!"
@@ -332,7 +332,7 @@
myloc.overlays += flicker
spawn(8)
myloc.overlays -= flicker
- del flicker
+ qdel(flicker)
//flick("flameburst",src)
if("plasma_gas")
//spawn a bunch of plasma
@@ -353,7 +353,7 @@
my_turf.density = 0
spawn(8)
myloc.overlays -= flicker
- del(flicker)
+ qdel(flicker)
var/dist = rand(1,5)
var/curtiles = 0
@@ -381,7 +381,7 @@
if(prob(90))
var/turf/T = get_turf(src)
T.desc = pick("It looks a little dustier than the surrounding tiles.","It is somewhat ornate.","It looks a little darker than the surrounding tiles.")
- del(src)
+ qdel(src)
//50% chance of being a trap
/obj/effect/step_trigger/trap/fifty
@@ -395,4 +395,4 @@
else
if(prob(10))
new /obj/effect/glowshroom(src.loc)
- del(src)
+ qdel(src)
diff --git a/code/modules/jungle/jungle_turfs.dm b/code/modules/jungle/jungle_turfs.dm
index 3ae601693e9..ffc5391ed8f 100644
--- a/code/modules/jungle/jungle_turfs.dm
+++ b/code/modules/jungle/jungle_turfs.dm
@@ -53,7 +53,7 @@
New()
..()
for(var/obj/structure/bush/B in src)
- del B
+ qdel(B)
/turf/unsimulated/jungle/proc/Spread(var/probability, var/prob_loss = 50)
if(probability <= 0)
@@ -123,7 +123,7 @@
/turf/unsimulated/jungle/water/New()
..()
for(var/obj/structure/bush/B in src)
- del(B)
+ qdel(B)
/turf/unsimulated/jungle/water/Entered(atom/movable/O)
..()
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index fd4a79eed40..22f90482727 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -469,7 +469,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
b.dat = O:info
b.name = "Print Job #" + "[rand(100, 999)]"
b.icon_state = "book[rand(1,7)]"
- del(O)
+ qdel(O)
else
..()
/client/proc/delbook()
diff --git a/code/modules/mob/dead/observer/logout.dm b/code/modules/mob/dead/observer/logout.dm
index 969f6574b9b..f80f0100cfc 100644
--- a/code/modules/mob/dead/observer/logout.dm
+++ b/code/modules/mob/dead/observer/logout.dm
@@ -4,4 +4,4 @@
..()
spawn(0)
if(src && !key) //we've transferred to another mob. This ghost should be deleted.
- del(src)
+ qdel(src)
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index e6107b4cca2..908d6510d03 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -21,8 +21,8 @@
if(client)
respawnable_list += src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
//This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
@@ -48,8 +48,8 @@
if(client)
respawnable_list += src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/proc/melt()
death(1)
@@ -71,8 +71,8 @@
if(client)
respawnable_list += src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/proc/death(gibbed)
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 1f0c56d857e..90c1574c7eb 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -258,6 +258,6 @@
W.loc = src
else
if (del_on_fail)
- del(W)
+ qdel(W)
return equipped
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index d6cf5225b29..ac7fe6b7222 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -266,7 +266,7 @@ Des: Removes all infected images from the alien.
if (client)
for(var/image/I in client.images)
if(dd_hasprefix_case(I.icon_state, "infected"))
- del(I)
+ qdel(I)
return
/mob/living/carbon/alien/canBeHandcuffed()
diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm
index c72220790d1..40303b03543 100644
--- a/code/modules/mob/living/carbon/alien/death.dm
+++ b/code/modules/mob/living/carbon/alien/death.dm
@@ -16,8 +16,8 @@
dead_mob_list -= src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/carbon/alien/dust()
death(1)
@@ -37,8 +37,8 @@
dead_mob_list -= src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/carbon/alien/death(gibbed)
if(stat == DEAD) return
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
index 839a0163b3c..201ab0e1f77 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
@@ -42,7 +42,7 @@
var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(loc)
mind.transfer_to(new_xeno)
new_xeno.mind.name = new_xeno.name
- del(src)
+ qdel(src)
else
src << "We already have an alive queen."
return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index 549b2ce6c93..e3df53a681a 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -157,7 +157,7 @@
if (targeted_by && target_locked)
overlays_standing[TARGETED_LAYER] = target_locked
else if (!targeted_by && target_locked)
- del(target_locked)
+ qdel(target_locked)
if (!targeted_by)
overlays_standing[TARGETED_LAYER] = null
if(update_icons) update_icons()
diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index a5655da1da5..a8cb230f9e7 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -53,7 +53,7 @@
else
new_xeno.key = key
new_xeno.mind.name = new_xeno.name
- del(src)
+ qdel(src)
return
else
src << "You are not fully grown."
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index 68c67b0418c..e6f39f606fa 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -137,4 +137,4 @@ Des: Removes all images from the mob infected by this embryo
if(alien.client)
for(var/image/I in alien.client.images)
if(dd_hasprefix_case(I.icon_state, "infected") && I.loc == affected_mob)
- del(I)
\ No newline at end of file
+ qdel(I)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 937fe0a0ad7..5e6a471834d 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -50,7 +50,7 @@
name = "Man-Machine Interface: [brainmob.real_name]"
icon_state = "mmi_full"
alien = 0
- del(O)
+ qdel(O)
locked = 1
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 24b900a7a2d..0c4c8d96c45 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -34,10 +34,10 @@
dead_mob_list -= src
if(container && istype(container, /obj/item/device/mmi))
- del(container)//Gets rid of the MMI if there is one
+ qdel(container)//Gets rid of the MMI if there is one
if(loc)
if(istype(loc,/obj/item/organ/brain))
del(loc)//Gets rid of the brain item
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
\ No newline at end of file
+ if(animation) qdel(animation)
+ if(src) qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 15a4229c49f..29dfa0aceed 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -37,8 +37,8 @@
s.start()
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/carbon/human/dust()
death(1)
@@ -57,8 +57,8 @@
new /obj/effect/decal/remains/human(loc)
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/carbon/human/melt()
death(1)
@@ -77,8 +77,8 @@
//new /obj/effect/decal/remains/human(loc)
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/carbon/human/death(gibbed)
if(stat == DEAD) return
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3fabd2ef851..5949aa18f60 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -246,7 +246,7 @@
if (client.statpanel == "Status")
if (internal)
if (!internal.air_contents)
- del(internal)
+ qdel(internal)
else
stat("Internal Atmosphere Info", internal.name)
stat("Tank Pressure", internal.air_contents.return_pressure())
@@ -1205,7 +1205,7 @@
if(H.brainmob.real_name == src.real_name)
if(H.brainmob.mind)
H.brainmob.mind.transfer_to(src)
- del(H)
+ qdel(H)
@@ -1279,7 +1279,7 @@
.=..()
if(clean_feet && !shoes && istype(feet_blood_DNA, /list) && feet_blood_DNA.len)
feet_blood_color = null
- del(feet_blood_DNA)
+ qdel(feet_blood_DNA)
update_inv_shoes(1)
return 1
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 159ab81ad44..f6bc3b36f1d 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -206,14 +206,14 @@
visible_message("\red [M] has broken [src]'s grip on [lgrab.affecting]!")
talked = 1
spawn(1)
- del(lgrab)
+ qdel(lgrab)
if(istype(r_hand, /obj/item/weapon/grab))
var/obj/item/weapon/grab/rgrab = r_hand
if(rgrab.affecting)
visible_message("\red [M] has broken [src]'s grip on [rgrab.affecting]!")
talked = 1
spawn(1)
- del(rgrab)
+ qdel(rgrab)
//End BubbleWrap
if(!talked) //BubbleWrap
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index f3936682e98..33aa4df7abe 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -247,7 +247,7 @@ emp_act
else
LAssailant = user
- del(src)
+ qdel(src)
var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting))
if(!affecting || affecting.is_stump() || (affecting.status & ORGAN_DESTROYED))
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index defc3548317..193f8373242 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -139,7 +139,7 @@
spark_system.attach(src)
spark_system.start()
spawn(10)
- del(spark_system)
+ qdel(spark_system)
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index c5760170c68..bc0504f29c9 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -42,7 +42,7 @@
if (equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0))
return slot
if (del_on_fail)
- del(W)
+ qdel(W)
return null
/mob/living/carbon/human/proc/is_in_hands(var/typepath)
@@ -353,9 +353,9 @@
/obj/effect/equip_e/New()
if (!ticker)
- del(src)
+ qdel(src)
spawn(100)
- del(src)
+ qdel(src)
..()
return
@@ -366,22 +366,22 @@
switch(place)
if("mask")
if (!( target.wear_mask ))
- del(src)
+ qdel(src)
if("l_hand")
if (!( target.l_hand ))
- del(src)
+ qdel(src)
if("r_hand")
if (!( target.r_hand ))
- del(src)
+ qdel(src)
if("suit")
if (!( target.wear_suit ))
- del(src)
+ qdel(src)
if("uniform")
if (!( target.w_uniform ))
- del(src)
+ qdel(src)
if("back")
if (!( target.back ))
- del(src)
+ qdel(src)
if("syringe")
return
if("pill")
@@ -394,10 +394,10 @@
return
if("handcuff")
if (!( target.handcuffed ))
- del(src)
+ qdel(src)
if("id")
if ((!( target.wear_id ) || !( target.w_uniform )))
- del(src)
+ qdel(src)
if("splints")
var/count = 0
for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
@@ -406,11 +406,11 @@
count = 1
break
if(count == 0)
- del(src)
+ qdel(src)
return
if("internal")
if ((!( (istype(target.wear_mask, /obj/item/clothing/mask) && (istype(target.back, /obj/item/weapon/tank) || istype(target.belt, /obj/item/weapon/tank) || istype(target.s_store, /obj/item/weapon/tank)) && !( target.internal )) ) && !( target.internal )))
- del(src)
+ qdel(src)
var/message=null
if(target.frozen)
@@ -557,7 +557,7 @@
message = "\red [source] is trying to empty [target]'s pockets!"
if("CPR")
if (!target.cpr_time)
- del(src)
+ qdel(src)
target.cpr_time = 0
message = "\red [source] is trying perform CPR on [target]!"
if("id")
@@ -668,13 +668,13 @@ It can still be worn/put on as normal.
strip_item = target.shoes
if("l_hand")
if (istype(target, /obj/item/clothing/suit/straight_jacket))
- del(src)
+ qdel(src)
slot_to_process = slot_l_hand
if (target.l_hand)
strip_item = target.l_hand
if("r_hand")
if (istype(target, /obj/item/clothing/suit/straight_jacket))
- del(src)
+ qdel(src)
slot_to_process = slot_r_hand
if (target.r_hand)
strip_item = target.r_hand
@@ -746,11 +746,11 @@ It can still be worn/put on as normal.
S.add_fingerprint(source)
if (!( istype(S, /obj/item/weapon/dnainjector) ))
S.inuse = 0
- del(src)
+ qdel(src)
S.inject(target, source)
if (S.s_time >= world.time + 30)
S.inuse = 0
- del(src)
+ qdel(src)
S.s_time = world.time
for(var/mob/O in viewers(source, null))
O.show_message("\red [source] injects [target] with the DNA Injector!", 1)
@@ -815,7 +815,7 @@ It can still be worn/put on as normal.
if(source && target)
if(source.machine == target)
target.show_inv(source)
- del(src)
+ qdel(src)
/mob/proc/get_item_by_slot(slot_id)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 951e9f03563..1f153a2e4be 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1471,7 +1471,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(M.stat == 2)
M.death(1)
stomach_contents.Remove(M)
- del(M)
+ qdel(M)
continue
if(mob_master.current_cycle%3==1)
if(!(M.status_flags & GODMODE))
diff --git a/code/modules/mob/living/carbon/human/species/apollo.dm b/code/modules/mob/living/carbon/human/species/apollo.dm
index 1528307d566..fa428ac43a2 100644
--- a/code/modules/mob/living/carbon/human/species/apollo.dm
+++ b/code/modules/mob/living/carbon/human/species/apollo.dm
@@ -60,7 +60,7 @@
H << "[M] grips your antennae and starts violently pulling!"
do_after(H, 250)
if(p_loc == M.loc && p_loc_m == H.loc)
- del(H.internal_organs_by_name["antennae"])
+ qdel(H.internal_organs_by_name["antennae"])
H.remove_language("Wryn Hivemind")
new /obj/item/organ/wryn/hivenode(M.loc)
M << "You hear a loud crunch as you mercilessly pull off [H]'s antennae."
@@ -110,4 +110,4 @@
H.visible_message("\red[H]'s body explodes, leaving behind a pile of microscopic crystals!")
explosion(T, 0, 0, 2, 2) // Create a small explosion burst upon death
// new /obj/item/weapon/shard/supermatter( T )
- del(H)
\ No newline at end of file
+ qdel(H)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index f7bc6239a26..5113ea3144e 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -122,7 +122,7 @@
for(var/obj/item/organ/organ in H.contents)
if((organ in H.organs) || (organ in H.internal_organs))
- del(organ)
+ qdel(organ)
if(H.organs) H.organs.Cut()
if(H.internal_organs) H.internal_organs.Cut()
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index 0e59d8fc745..3ba7ade2e25 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -133,7 +133,7 @@
//now mobs
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
- spawn(30) del(speech_bubble)
+ spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm
index 1981bb8ec6c..aede207673f 100644
--- a/code/modules/mob/living/carbon/metroid/metroid.dm
+++ b/code/modules/mob/living/carbon/metroid/metroid.dm
@@ -638,7 +638,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
user <<"You apply the enhancer. It now has triple the amount of uses."
Uses = 3
enhanced = 1
- del(O)
+ qdel(O)
/obj/item/slime_extract/New()
..()
@@ -777,14 +777,14 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
pet.icon_dead = "[M.colour] baby slime dead"
pet.colour = "[M.colour]"
user <<"You feed the slime the potion, removing it's powers and calming it."
- del(M)
+ qdel(M)
var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
if (!newname)
newname = "pet slime"
pet.name = newname
pet.real_name = newname
- del(src)
+ qdel(src)
/obj/item/weapon/slimepotion2
name = "advanced docility potion"
@@ -808,14 +808,14 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
pet.icon_dead = "[M.colour] baby slime dead"
pet.colour = "[M.colour]"
user <<"You feed the slime the potion, removing it's powers and calming it."
- del(M)
+ qdel(M)
var/newname = sanitize(copytext(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text,1,MAX_NAME_LEN))
if (!newname)
newname = "pet slime"
pet.name = newname
pet.real_name = newname
- del(src)
+ qdel(src)
/obj/item/weapon/slimesteroid
@@ -840,7 +840,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
user <<"You feed the slime the steroid. It now has triple the amount of extract."
M.cores = 3
- del(src)
+ qdel(src)
/obj/item/weapon/slimesteroid2
name = "extract enhancer"
@@ -885,7 +885,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
G.loc = src.loc
G.key = ghost.key
G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
- del (src)
+ qdel(src)
proc/announce_to_ghosts()
diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm
index 15fdb60349f..cc55ac61572 100644
--- a/code/modules/mob/living/carbon/metroid/powers.dm
+++ b/code/modules/mob/living/carbon/metroid/powers.dm
@@ -221,7 +221,7 @@
src.mind.transfer_to(new_slime)
else
new_slime.key = src.key
- del(src)
+ qdel(src)
else
src << "I am not ready to reproduce yet..."
else
diff --git a/code/modules/mob/living/carbon/primitive/dionaold.dm b/code/modules/mob/living/carbon/primitive/dionaold.dm
index a14fd3bdb50..6f0b20ce04a 100644
--- a/code/modules/mob/living/carbon/primitive/dionaold.dm
+++ b/code/modules/mob/living/carbon/primitive/dionaold.dm
@@ -167,7 +167,7 @@
if(istype(loc,/obj/item/weapon/holder/diona))
var/obj/item/weapon/holder/diona/L = loc
src.loc = L.loc
- del(L)
+ qdel(L)
for(var/datum/language/L in languages)
adult.add_language(L.name)
@@ -182,7 +182,7 @@
for (var/obj/item/W in src.contents)
src.unEquip(W)
- del(src)
+ qdel(src)
/mob/living/carbon/primitive/diona/verb/steal_blood()
set category = "Diona"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 4d9661c92d7..1c1067cb240 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -423,7 +423,7 @@
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1)
//G = null
- del(G)
+ qdel(G)
else
ok = 0
if (locate(/obj/item/weapon/grab, M.grabbed_by.len))
@@ -565,7 +565,7 @@
for(var/obj/O in L.requests)
L.requests.Remove(O)
- del(O)
+ qdel(O)
resisting++
for(var/obj/item/weapon/grab/G in usr.grabbed_by)
@@ -739,7 +739,7 @@
if(hulklien)
CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- del(CM.handcuffed)
+ qdel(CM.handcuffed)
CM.handcuffed = null
CM.update_inv_handcuffed()
return
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 6d6706a056a..f34b3caf692 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -122,7 +122,7 @@ proc/get_radio_key_from_channel(var/channel)
var/speech_bubble_test = say_test(message)
var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
- spawn(30) del(speech_bubble)
+ spawn(30) qdel(speech_bubble)
for(var/mob/M in listening)
M << speech_bubble
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 63573fb70b0..30e4ad4b282 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -882,7 +882,7 @@ var/list/ai_verbs_default = list(
input = input("Select a crew member:") as null|anything in personnel_list
var/icon/character_icon = personnel_list[input]
if(character_icon)
- del(holo_icon)//Clear old icon so we're not storing it in memory.
+ qdel(holo_icon)//Clear old icon so we're not storing it in memory.
holo_icon = getHologramIcon(icon(character_icon))
else
alert("No suitable records found. Aborting.")
@@ -895,7 +895,7 @@ var/list/ai_verbs_default = list(
)
input = input("Please select a hologram:") as null|anything in icon_list
if(input)
- del(holo_icon)
+ qdel(holo_icon)
switch(input)
if("default")
holo_icon = getHologramIcon(icon('icons/mob/AI.dmi',"holo1"))
diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm
index c8c7e41d94e..067e8e7928b 100644
--- a/code/modules/mob/living/silicon/death.dm
+++ b/code/modules/mob/living/silicon/death.dm
@@ -16,8 +16,8 @@
dead_mob_list -= src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/silicon/dust()
death(1)
@@ -37,5 +37,5 @@
dead_mob_list -= src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index 7a45d39f2ce..33055ac3d8e 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -6,7 +6,7 @@
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
- del(src.cable)
+ qdel(src.cable)
sleeping = 0
ear_deaf = 0
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index c73bf68f1ab..60296dde007 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/code/modules/mob/living/silicon/robot/death.dm
@@ -17,8 +17,8 @@
living_mob_list -= src
dead_mob_list -= src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/silicon/robot/dust()
death(1)
@@ -35,12 +35,12 @@
flick("dust-r", animation)
new /obj/effect/decal/remains/robot(loc)
- if(mmi) del(mmi) //Delete the MMI first so that it won't go popping out.
+ if(mmi) qdel(mmi) //Delete the MMI first so that it won't go popping out.
dead_mob_list -= src
spawn(15)
- if(animation) del(animation)
- if(src) del(src)
+ if(animation) qdel(animation)
+ if(src) qdel(src)
/mob/living/silicon/robot/death(gibbed)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 571beea1048..f1367d3fc19 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -176,7 +176,7 @@
if(istype(M,/mob/living/simple_animal/lizard) || istype(M,/mob/living/simple_animal/mouse))
src.loc.visible_message("\red [src.loc] sucks [M] into its decompiler. There's a horrible crunching noise.","\red It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.")
new/obj/effect/decal/cleanable/blood/splatter(get_turf(src))
- del(M)
+ qdel(M)
stored_comms["wood"]++
stored_comms["wood"]++
stored_comms["plastic"]++
@@ -200,7 +200,7 @@
D << "\red You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself."
- del(M)
+ qdel(M)
new/obj/effect/decal/cleanable/blood/oil(get_turf(src))
stored_comms["metal"] += 15
@@ -267,7 +267,7 @@
else
continue
- del(W)
+ qdel(W)
grabbed_something = 1
if(grabbed_something)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index b826e2e0a34..fe015b41da5 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -703,7 +703,7 @@ var/list/robot_verbs_default = list(
// This doesn't work. Don't use it.
//src.Destroy()
// del() because it's infrequent and mobs act weird in qdel.
- del(src)
+ qdel(src)
else
// Okay we're not removing the cell or an MMI, but maybe something else?
var/list/removable_components = list()
@@ -865,7 +865,7 @@ var/list/robot_verbs_default = list(
src << "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands."
if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
- del(D)
+ qdel(D)
src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
src.module.rebuild()
if(src.module && istype(src.module, /obj/item/weapon/robot_module/medical))
@@ -1067,7 +1067,7 @@ var/list/robot_verbs_default = list(
//Call when target overlay should be added/removed
/mob/living/silicon/robot/update_targeted()
if(!targeted_by && target_locked)
- del(target_locked)
+ qdel(target_locked)
updateicon()
if (targeted_by && target_locked)
overlays += target_locked
@@ -1205,7 +1205,7 @@ var/list/robot_verbs_default = list(
for(var/A in tile)
if(istype(A, /obj/effect))
if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
- del(A)
+ qdel(A)
else if(istype(A, /obj/item))
var/obj/item/cleaned_item = A
cleaned_item.clean_blood()
diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm
index b6d6b13db11..6d5cd3ba6bd 100644
--- a/code/modules/mob/living/simple_animal/bees.dm
+++ b/code/modules/mob/living/simple_animal/bees.dm
@@ -117,7 +117,7 @@
if(feral > 0)
src.strength += B.strength
- del(B)
+ qdel(B)
src.icon_state = "bees[src.strength]"
if(strength > 5)
icon_state = "bees_swarm"
@@ -130,7 +130,7 @@
B.icon_state = "bees[B.strength]"
if(src.strength <= 0)
- del(src)
+ qdel(src)
return
src.icon_state = "bees[B.strength]"
var/turf/simulated/floor/T = get_turf(get_step(src, pick(1,2,4,8)))
@@ -179,7 +179,7 @@
if(!parent && prob(10))
strength -= 1
if(strength <= 0)
- del(src)
+ qdel(src)
else if(strength <= 5)
icon_state = "bees[strength]"
diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm
index 17eee2662d4..ad664975908 100644
--- a/code/modules/mob/living/simple_animal/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer.dm
@@ -204,7 +204,7 @@
host.computer_id = null
host.lastKnownIP = null
- del(host_brain)
+ qdel(host_brain)
host_brain = new(src)
host_brain.ckey = host.ckey
@@ -352,7 +352,7 @@ mob/living/simple_animal/borer/proc/detatch()
if(!host.lastKnownIP)
host.lastKnownIP = b2h_ip
- del(host_brain)
+ qdel(host_brain)
return
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 8d3a43e9ab4..df86545879b 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -668,5 +668,5 @@
s.set_up(3, 1, src)
s.start()
respawnable_list += src
- del src
+ qdel(src)
return
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 0e924a432a3..238ef2c5852 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -47,7 +47,7 @@
if(locate(/obj/effect/plant) in loc)
var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
- del(SV)
+ qdel(SV)
if(prob(10))
say("Nom")
@@ -67,7 +67,7 @@
if(!stat)
if(locate(/obj/effect/plant) in loc)
var/obj/effect/plant/SV = locate(/obj/effect/plant) in loc
- del(SV)
+ qdel(SV)
if(prob(10))
say("Nom")
@@ -245,7 +245,7 @@ var/global/chicken_count = 0
if(!stat && eggsleft < 8)
user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
user.drop_item()
- del(O)
+ qdel(O)
eggsleft += rand(1, 4)
//world << eggsleft
else
@@ -276,7 +276,7 @@ var/global/chicken_count = 0
visible_message("[src] hatches with a quiet cracking sound.")
new /mob/living/simple_animal/chick(get_turf(src))
processing_objects.Remove(src)
- del(src)
+ qdel(src)
else
processing_objects.Remove(src)
diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm
index df1fc75659d..d44cdde68ab 100644
--- a/code/modules/mob/living/simple_animal/friendly/slime.dm
+++ b/code/modules/mob/living/simple_animal/friendly/slime.dm
@@ -81,4 +81,4 @@
S2.icon_living = "[src.colour] baby slime"
S2.icon_dead = "[src.colour] baby slime dead"
S2.colour = "[src.colour]"
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 91e99507875..8a88958fa18 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -100,7 +100,7 @@
if("rapid")
new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
spawn(100)
- del(src)
+ qdel(src)
return
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index 58be749d984..e4b9fe7ac0f 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -159,7 +159,7 @@
/mob/living/simple_animal/hostile/retaliate/malf_drone/Die()
src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
..()
- del(src)
+ qdel(src)
/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy()
//some random debris left behind
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index 417e4d99f3e..01178af83f2 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -69,7 +69,7 @@
..()
/mob/living/simple_animal/hostile/retaliate/ghost/Die()
new /obj/item/weapon/reagent_containers/food/snacks/ectoplasm(loc)
- del src
+ qdel(src)
return
/mob/living/simple_animal/hostile/retaliate/skeleton
@@ -107,7 +107,7 @@
/mob/living/simple_animal/hostile/retaliate/skeleton/Die()
new /obj/effect/decal/remains/human(loc)
- del src
+ qdel(src)
return
/mob/living/simple_animal/hostile/retaliate/zombie
@@ -145,5 +145,5 @@
/mob/living/simple_animal/hostile/retaliate/zombie/Die()
new /obj/effect/decal/cleanable/blood/gibs(loc)
- del src
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index b594de5e398..d1140f38c5b 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -57,5 +57,5 @@
new corpse (src.loc)
if(weapon1)
new weapon1 (src.loc)
- del src
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index d7ac5db34f6..a83eddf5e84 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -42,7 +42,7 @@
new weapon1 (src.loc)
if(weapon2)
new weapon2 (src.loc)
- del src
+ qdel(src)
return
///////////////Sword and shield////////////
@@ -165,5 +165,5 @@
/mob/living/simple_animal/hostile/viscerator/Die()
..()
visible_message("\red [src] is smashed into pieces!")
- del src
+ qdel(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index c03e6dbdcb0..2d49cbf836d 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -54,4 +54,4 @@
..()
visible_message("\red [src] is hacked into pieces!")
new /obj/item/stack/sheet/wood(loc)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index aa1a9509b5a..c722ac36e80 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -36,7 +36,7 @@
if((M.client && !( M.blinded )))
M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")
ghostize()
- del src
+ qdel(src)
return
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 5513002abd2..f95ad48c2a5 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -399,7 +399,7 @@
adjustBruteLoss(-MED.heal_brute)
MED.amount -= 1
if(MED.amount <= 0)
- del(MED)
+ qdel(MED)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\blue [user] applies [MED] on [src]")
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index fa8051f43a2..b4eac82db6c 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -49,7 +49,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
T.gestation = src.gestation
T.pickup(user)
user.put_in_active_hand(T)
- del(src)
+ qdel(src)
/mob/living/simple_animal/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params)
@@ -109,7 +109,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
T.gestation = src.gestation
user << "The tribble gets up and wanders around."
- del(src)
+ qdel(src)
/obj/item/toy/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) //neutering and un-neutering
..()
@@ -162,7 +162,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
if (prob(75))
new /obj/item/weapon/shard( src.loc )
Break()
- del(src)
+ qdel(src)
/obj/structure/tribble_cage/proc/healthcheck()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 1a42d6f9614..5002f258cac 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -168,7 +168,7 @@
if(!W.mob_can_equip(src, slot, disable_warning))
if(del_on_fail)
- del(W)
+ qdel(W)
else
if(!disable_warning)
src << "\red You are unable to equip that." //Only print if del_on_fail is false
@@ -510,7 +510,7 @@ var/list/slot_equipment_priority = list( \
var/list/temp = list( )
temp += L.container
//L = null
- del(L)
+ qdel(L)
return temp
else
return L.container
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 999bd0145fc..d7f8f756120 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -374,17 +374,17 @@
var/obj/item/weapon/grab/G = mob.r_hand
grabbing += G.affecting
for(var/obj/item/weapon/grab/G in mob.grabbed_by)
- if((G.state == 1)&&(!grabbing.Find(G.assailant))) del(G)
+ if((G.state == 1)&&(!grabbing.Find(G.assailant))) qdel(G)
if(G.state == 2)
move_delay = world.time + 10
if(!prob(25)) return 1
mob.visible_message("\red [mob] has broken free of [G.assailant]'s grip!")
- del(G)
+ qdel(G)
if(G.state == 3)
move_delay = world.time + 10
if(!prob(5)) return 1
mob.visible_message("\red [mob] has broken free of [G.assailant]'s headlock!")
- del(G)
+ qdel(G)
return 0
diff --git a/code/modules/mob/spirit/mask/respawn.dm b/code/modules/mob/spirit/mask/respawn.dm
index acfb69073c2..60330de917d 100644
--- a/code/modules/mob/spirit/mask/respawn.dm
+++ b/code/modules/mob/spirit/mask/respawn.dm
@@ -10,9 +10,9 @@
ghost.timeofdeath = world.time - 20000
ghost.newPlayerType = /mob/new_player/cultist
// remove old mask body
- del(currentSpirit)
+ qdel(currentSpirit)
+
-
/mob/new_player/cultist/AttemptLateSpawn(rank)
var/mob/newCharacter = ..(rank)
if(ticker.mode)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 0aa42b25e2e..bd2734c5134 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -65,7 +65,7 @@
if (notransform)
return
for(var/t in organs)
- del(t)
+ qdel(t)
return ..(move)
@@ -159,7 +159,7 @@
"[src] disappears into the shadows, never to be seen again.", \
"You disappear into the shadows, never to be seen again.", \
"You hear strange noise, you can't quite place it.")
- del(src)
+ qdel(src)
new_spirit << "You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god."
new_spirit << "Your job is to help your acolytes complete their goals. Be spooky. Do evil."
@@ -188,9 +188,9 @@
icon = null
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
for(var/i in internal_organs)
- del(i)
+ qdel(i)
var/mob/living/silicon/robot/O = new /mob/living/silicon/robot( loc )
@@ -233,7 +233,7 @@
O.Namepick()
spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return O
//human -> alien
@@ -248,7 +248,7 @@
icon = null
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/alien_caste = pick("Hunter","Sentinel","Drone")
var/mob/living/carbon/alien/humanoid/new_xeno
@@ -266,7 +266,7 @@
new_xeno << "You are now an alien."
new_xeno.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return
/mob/living/carbon/human/proc/slimeize(adult as num, reproduce as num)
@@ -280,7 +280,7 @@
icon = null
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/mob/living/carbon/slime/new_slime
if(reproduce)
@@ -302,7 +302,7 @@
new_slime << "You are now a slime. Skreee!"
new_slime.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return
/mob/living/carbon/human/proc/corgize()
@@ -316,7 +316,7 @@
icon = null
invisibility = 101
for(var/t in organs) //this really should not be necessary
- del(t)
+ qdel(t)
var/mob/living/simple_animal/pet/corgi/new_corgi = new /mob/living/simple_animal/pet/corgi (loc)
new_corgi.a_intent = "harm"
@@ -325,7 +325,7 @@
new_corgi << "You are now a Corgi. Yap Yap!"
new_corgi.update_pipe_vision()
spawn(0)//To prevent the proc from returning null.
- del(src)
+ qdel(src)
return
/mob/living/carbon/human/Animalize()
@@ -349,7 +349,7 @@
invisibility = 101
for(var/t in organs)
- del(t)
+ qdel(t)
var/mob/new_mob = new mobpath(src.loc)
@@ -360,7 +360,7 @@
new_mob << "You suddenly feel more... animalistic."
new_mob.update_pipe_vision()
spawn()
- del(src)
+ qdel(src)
return
/mob/proc/Animalize()
@@ -379,7 +379,7 @@
new_mob << "You feel more... animalistic"
new_mob.update_pipe_vision()
- del(src)
+ qdel(src)
/* Certain mob types have problems and should not be allowed to be controlled by players.
*
diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index 9cc65e3920d..e65ed5bb870 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -71,7 +71,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
src.nutrition += (15 * REAGENTS_METABOLISM)
BL.volume -= REAGENTS_METABOLISM
if(BL.volume <= 0)
- del(BL)
+ qdel(BL)
break //Only process one blood per tick, to maintain the same metabolism as nutriment for non-vampires.
if(B.data["donor"] != src) //If it's not theirs, then we look for theirs
@@ -332,7 +332,7 @@ proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
// Only a certain number of drips (or one large splatter) can be on a given turf.
for(var/obj/effect/decal/cleanable/blood/drip/drop in T)
drips |= drop.drips
- del(drop)
+ qdel(drop)
if(!large && drips.len < 3)
decal_type = /obj/effect/decal/cleanable/blood/drip
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 670aab1669e..08a946e547c 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -282,4 +282,4 @@ var/list/organ_cache = list()
if(fingerprintslast) O.fingerprintslast = fingerprintslast
user.put_in_active_hand(O)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/organs/organ_alien.dm b/code/modules/organs/organ_alien.dm
index 0c3a68bc866..e564979bde2 100644
--- a/code/modules/organs/organ_alien.dm
+++ b/code/modules/organs/organ_alien.dm
@@ -247,7 +247,7 @@
B.ckey = owner.ckey
spawn(0)
- del(src)
+ qdel(src)
//XENOMORPH ORGANS
/obj/item/organ/xenos/eggsac
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 2bb78b9c55f..d045017117d 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -834,7 +834,7 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.bad_external_organs -= src
for(var/implant in implants) //todo: check if this can be left alone
- del(implant)
+ qdel(implant)
// Attached organs also fly off.
if(!ignore_children)
@@ -864,8 +864,8 @@ Note that amputating the affected organ does in fact remove the infection from t
spark_system.attach(owner)
spark_system.start()
spawn(10)
- del(spark_system)
- del(src)
+ qdel(spark_system)
+ qdel(src)
/obj/item/organ/external/proc/disfigure(var/type = "brute")
if (disfigured)
diff --git a/code/modules/organs/organ_stump.dm b/code/modules/organs/organ_stump.dm
index e1a0611a017..545ca746275 100644
--- a/code/modules/organs/organ_stump.dm
+++ b/code/modules/organs/organ_stump.dm
@@ -19,4 +19,4 @@
/obj/item/organ/external/stump/removed()
..()
- del(src)
+ qdel(src)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 52d82c47d0a..50309dd859b 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -300,7 +300,7 @@
user.unEquip(src)
new /obj/effect/decal/cleanable/ash(get_turf(src))
- del(src)
+ qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 06000ed8a7d..31c170b18f8 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -56,7 +56,7 @@
if(screen == 2)
screen = 1
user << "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."
- del(W)
+ qdel(W)
else
if(istype(W, /obj/item/stack/tape_roll))
return 0
@@ -91,7 +91,7 @@
user.unEquip(src)
new /obj/effect/decal/cleanable/ash(get_turf(src))
- del(src)
+ qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
@@ -171,7 +171,7 @@
var/obj/item/weapon/paper/P = src[1]
usr.unEquip(src)
usr.put_in_hands(P)
- del(src)
+ qdel(src)
else if(page == amount)
screen = 2
else if(page == amount+1)
@@ -210,7 +210,7 @@
O.layer = initial(O.layer)
O.add_fingerprint(usr)
usr.unEquip(src)
- del(src)
+ qdel(src)
return
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index bc20b6fe13c..78aa9174d5f 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -119,7 +119,7 @@
user << "You insert the toner cartridge into \the [src]."
var/obj/item/device/toner/T = O
toner += T.toner_amount
- del(O)
+ qdel(O)
updateUsrDialog()
else
user << "This cartridge is not yet ready for replacement! Use up the rest of the toner."
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index c7c4205bc1c..2876c7ad89a 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -64,7 +64,7 @@
user.unEquip(src)
new /obj/effect/decal/cleanable/ash(get_turf(src))
- del(src)
+ qdel(src)
else
user << "\red You must hold \the [P] steady to burn \the [src]."
@@ -178,7 +178,7 @@
return
user << "You insert [I] into [src]."
user.drop_item()
- del(I)
+ qdel(I)
pictures_left = pictures_max
return
..()
@@ -201,7 +201,7 @@
for(var/atom/A in the_turf)
if(A.invisibility) continue
atoms.Add(A)
-
+
// Sort the atoms into their layers
var/list/sorted = sort_atoms_by_layer(atoms)
var/center_offset = (size-1)/2 * 32 + 1
@@ -229,7 +229,7 @@
// Calculate where we are relative to the center of the photo
var/xoff = (the_turf.x - center.x) * 32 + center_offset
var/yoff = (the_turf.y - center.y) * 32 + center_offset
- res.Blend(getFlatIcon(the_turf.loc), blendMode2iconMode(the_turf.blend_mode),xoff,yoff)
+ res.Blend(getFlatIcon(the_turf.loc), blendMode2iconMode(the_turf.blend_mode),xoff,yoff)
return res
@@ -464,7 +464,7 @@
camera.network = list("news")
camera.c_tag = user.name
else
-
+
src.icon_state = icon_on
camera = new /obj/machinery/camera(src)
camera.network = list("news")
@@ -483,4 +483,4 @@
if(get_dist(src, M) <= canhear_range)
talk_into(M, msg)
for(var/mob/living/carbon/human/H in watcherslist)
- H.show_message(text("\blue (Newscaster) [] says, '[]'",M,msg), 1)
+ H.show_message(text("\blue (Newscaster) [] says, '[]'",M,msg), 1)
diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm
index 4fbe953d729..0826090c59c 100644
--- a/code/modules/paperwork/silicon_photography.dm
+++ b/code/modules/paperwork/silicon_photography.dm
@@ -64,7 +64,7 @@
usr << P.desc
// TG uses a special garbage collector.. qdel(P)
- del(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
+ qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all.
/obj/item/device/camera/siliconcam/proc/deletepicture(obj/item/device/camera/siliconcam/cam)
var/datum/picture/selection = selectpicture(cam)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 78bda4169b3..2f875d6a1ee 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -498,14 +498,14 @@
user.visible_message(\
"\red [user.name] cut the cables and dismantled the power terminal.",\
"You cut the cables and dismantle the power terminal.")
- del(terminal)
+ qdel(terminal)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
user << "You trying to insert the power control board into the frame..."
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10))
has_electronics = 1
user << "You place the power control board inside the frame."
- del(W)
+ qdel(W)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
user << "\red You cannot put the board inside, the frame is damaged."
return
@@ -530,7 +530,7 @@
"\red [src] has been cut from the wall by [user.name] with the weldingtool.",\
"You cut the APC frame from the wall.",\
"\red You hear welding.")
- del(src)
+ qdel(src)
return
else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && emagged)
emagged = 0
@@ -539,7 +539,7 @@
user.visible_message(\
"\red [user.name] has replaced the damaged APC frontal panel with a new one.",\
"You replace the damaged APC frontal panel with a new one.")
- del(W)
+ qdel(W)
update_icon()
else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack))
if (has_electronics)
@@ -550,7 +550,7 @@
user.visible_message(\
"\red [user.name] has replaced the damaged APC frame with new one.",\
"You replace the damaged APC frame with new one.")
- del(W)
+ qdel(W)
stat &= ~BROKEN
malfai = null
malfhack = 0
@@ -1000,7 +1000,7 @@
malf.mind.transfer_to(src.occupant)
src.occupant.eyeobj.name = "[src.occupant.name] (AI Eye)"
if(malf.parent)
- del(malf)
+ qdel(malf)
src.occupant.verbs += /mob/living/silicon/ai/proc/corereturn
src.occupant.verbs += /datum/game_mode/malfunction/proc/takeover
src.occupant.cancel_camera()
@@ -1016,7 +1016,7 @@
src.occupant.mind.transfer_to(src.occupant.parent)
src.occupant.parent.adjustOxyLoss(src.occupant.getOxyLoss())
src.occupant.parent.cancel_camera()
- del(src.occupant)
+ qdel(src.occupant)
if (seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
for(var/obj/item/weapon/pinpointer/point in world)
for(var/datum/mind/AI_mind in ticker.mode.malf_ai)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 928491a322c..550d0ada3fe 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -136,7 +136,7 @@
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
- del(src)
+ qdel(src)
return
@@ -309,7 +309,7 @@
if(ismob(loc))
var/mob/M = loc
M.unEquip(src)
- del(src)
+ qdel(src)
else
amount -= used
update_icon()
@@ -371,7 +371,7 @@
if (C.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(C.loc, 1, C.cable_color)
- del(C)
+ qdel(C)
//src.laying = 1
//last = C
@@ -431,7 +431,7 @@
if (NC.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(NC.loc, 1, NC.cable_color)
- del(NC)
+ qdel(NC)
return
else if(C.d1 == 0) // exisiting cable doesn't point at our position, so see if it's a stub
@@ -470,7 +470,7 @@
if (C.shock(user, 50))
if (prob(50)) //fail
new/obj/item/stack/cable_coil(C.loc, 2, C.cable_color)
- del(C)
+ qdel(C)
return
diff --git a/code/modules/power/engine.dm b/code/modules/power/engine.dm
index 50473d3e445..614a7393d9a 100644
--- a/code/modules/power/engine.dm
+++ b/code/modules/power/engine.dm
@@ -33,6 +33,6 @@
/turf/simulated/floor/engine/blob_act()
if (prob(25))
ChangeTurf(/turf/space)
- del(src)
+ qdel(src)
return
return
\ No newline at end of file
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 96f943f05f2..74d633a8fbe 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -53,7 +53,7 @@
user.visible_message("[user.name] deconstructs [src].", \
"You deconstruct [src].", "You hear a noise.")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
- del(src)
+ qdel(src)
if (src.stage == 2)
usr << "You have to remove the wires first."
return
@@ -111,7 +111,7 @@
newlight.dir = src.dir
src.transfer_fingerprints_to(newlight)
- del(src)
+ qdel(src)
return
..()
@@ -315,7 +315,7 @@
update()
user.drop_item() //drop the item to update overlays and such
- del(L)
+ qdel(L)
if(on && rigged)
@@ -370,7 +370,7 @@
newlight.fingerprints = src.fingerprints
newlight.fingerprintshidden = src.fingerprintshidden
newlight.fingerprintslast = src.fingerprintslast
- del(src)
+ qdel(src)
return
user << "You stick \the [W] into the light socket!"
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 5431c137b4c..0e5e10c7a08 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -188,7 +188,7 @@ display round(lastgen) and plasmatank amount
if (heat > 300)
overheat()
- del(src)
+ qdel(src)
return
/obj/machinery/power/port_gen/pacman/handleInactive()
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 768bf712c0f..ff952f7c07e 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -83,7 +83,7 @@
/proc/makepowernets()
for(var/datum/powernet/PN in powernets)
- del(PN)
+ qdel(PN)
powernets.Cut()
for(var/obj/structure/cable/PC in cable_list)
@@ -373,7 +373,7 @@
Cable.powernet = net1
net1.cables += Cable
- del(net2)
+ qdel(net2)
return net1
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index b908fc4be22..b940014b517 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -52,7 +52,7 @@
if(hasShocked)
return 0
if(!FG1 || !FG2)
- del(src)
+ qdel(src)
return 0
if(iscarbon(user))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index a616a7b3381..7b8547eb880 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -326,7 +326,7 @@ field_generator power level display
for (var/obj/machinery/containment_field/F in fields)
if (isnull(F))
continue
- del(F)
+ qdel(F)
fields = list()
for(var/obj/machinery/field_generator/FG in connected_gens)
if (isnull(FG))
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 2ce8694a7fa..ba38cf9ea73 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -204,7 +204,7 @@
"[user.name] cuts the cables and dismantles the power terminal.",\
"You cut the cables and dismantle the power terminal.")
charging = 0 //stop inputting, since we have don't have a terminal anymore
- del(terminal)
+ qdel(terminal)
return
//crowbarring it !
@@ -436,7 +436,7 @@
smoke.attach(src)
smoke.start()
explosion(src.loc, -1, 0, 1, 3, 0)
- del(src)
+ qdel(src)
return
if(prob(15)) //Power drain
world << "\red SMES power drain in [src.loc.loc]"
diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm
index 3ddce50ceac..4d11564f01b 100644
--- a/code/modules/projectiles/guns/projectile/crossbow.dm
+++ b/code/modules/projectiles/guns/projectile/crossbow.dm
@@ -312,7 +312,7 @@
if(buildstate == 5)
user << "\blue You secure the crossbow's various parts."
new /obj/item/weapon/gun/launcher/crossbow(get_turf(src))
- del(src)
+ qdel(src)
return
else
..()
diff --git a/code/modules/projectiles/guns/projectile/pneumatic.dm b/code/modules/projectiles/guns/projectile/pneumatic.dm
index 305c9fb6f95..7f8d61a0d29 100644
--- a/code/modules/projectiles/guns/projectile/pneumatic.dm
+++ b/code/modules/projectiles/guns/projectile/pneumatic.dm
@@ -158,7 +158,7 @@
if(istype(W,/obj/item/pipe))
if(buildstate == 0)
user.drop_item()
- del(W)
+ qdel(W)
user << "\blue You secure the piping inside the frame."
buildstate++
update_icon()
@@ -177,7 +177,7 @@
else if(istype(W,/obj/item/device/transfer_valve))
if(buildstate == 4)
user.drop_item()
- del(W)
+ qdel(W)
user << "\blue You install the transfer valve and connect it to the piping."
buildstate++
update_icon()
@@ -206,7 +206,7 @@
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "\blue You weld the valve into place."
new /obj/item/weapon/gun/launcher/pneumatic(get_turf(src))
- del(src)
+ qdel(src)
return
else
..()
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 1aec8692f1d..262dec36b5c 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -79,7 +79,7 @@
M << "[src] blows up in your face!"
M.take_organ_damage(0,20)
M.drop_item()
- del(src)
+ qdel(src)
return 0
return 1
diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm
index 8df666a62a4..bdabba15f51 100644
--- a/code/modules/projectiles/guns/projectile/rocket.dm
+++ b/code/modules/projectiles/guns/projectile/rocket.dm
@@ -46,7 +46,7 @@
message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]).")
log_game("[key_name_admin(user)] used a rocket launcher ([src.name]).")
rockets -= I
- del(I)
+ qdel(I)
return
else
usr << "\red [src] is empty."
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index f8d2cfd5620..b4462517019 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -197,21 +197,21 @@
if(TT == firer.loc)
continue
if(TT.density)
- del(X)
+ qdel(X)
break
for(var/atom/O in TT)
if(istype(O,/mob/living))
if(O.density)
- del(X)
+ qdel(X)
broke = 1
break
if(!O.CanPass(src))
- del(X)
+ qdel(X)
broke = 1
break
if(broke)
if(X)
- del(X)
+ qdel(X)
break
spawn
while(src) //Move until we hit something
@@ -264,7 +264,7 @@
if(src.loc != current)
tang = adjustAngle(get_angle(src.loc,current))
icon_state = "[tang]"
- del(src)
+ qdel(src)
return
/*cleanup(reference) //Waits .3 seconds then removes the overlay.
//world << "setting invisibility"
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 785b619186b..9d7e8c90efc 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -56,7 +56,7 @@
O.mind.transfer_to(A)
else
A.key = O.key
- del(O)
+ qdel(O)
target = A
else
target.revive()
@@ -136,15 +136,15 @@ proc/wabbajack(mob/living/M)
if(istype(M, /mob/living/silicon/robot))
var/mob/living/silicon/robot/Robot = M
- if(Robot.mmi) del(Robot.mmi)
+ if(Robot.mmi) qdel(Robot.mmi)
else
if(ishuman(M))
var/mob/living/carbon/human/H = M
// Make sure there are no organs or limbs to drop
for(var/t in H.organs)
- del(t)
+ qdel(t)
for(var/i in H.internal_organs)
- del(i)
+ qdel(i)
for(var/obj/item/W in M)
M.unEquip(W)
@@ -240,7 +240,7 @@ proc/wabbajack(mob/living/M)
new_mob << "Your form morphs into that of a [randomize]."
- del(M)
+ qdel(M)
return new_mob
/obj/item/projectile/magic/animate
@@ -265,7 +265,7 @@ proc/wabbajack(mob/living/M)
S << "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! Do not harm [firer.name], your creator."
H = change
H.loc = S
- del(src)
+ qdel(src)
else
var/obj/O = change
new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index c4813e05bb1..c5f6fa4e855 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -82,7 +82,7 @@
for(var/mob/M in range(10, src))
if(!M.stat && !istype(M, /mob/living/silicon/ai))\
shake_camera(M, 3, 1)
- del(src)
+ qdel(src)
return 1
else
return 0
@@ -167,7 +167,7 @@
new /obj/effect/decal/cleanable/ash(src.loc)
src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
- del(src)
+ qdel(src)
/obj/item/projectile/kinetic
name = "kinetic force"
@@ -192,7 +192,7 @@ obj/item/projectile/kinetic/New()
range--
if(range <= 0)
new /obj/item/effect/kinetic_blast(src.loc)
- del(src)
+ qdel(src)
/obj/item/projectile/kinetic/on_hit(atom/target)
var/turf/target_turf= get_turf(target)
@@ -210,7 +210,7 @@ obj/item/projectile/kinetic/New()
/obj/item/effect/kinetic_blast/New()
spawn(4)
- del(src)
+ qdel(src)
/obj/item/projectile/bullet/frag12
name ="explosive slug"
diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm
index 08ed266f855..c3f7b695ef5 100644
--- a/code/modules/projectiles/targeting.dm
+++ b/code/modules/projectiles/targeting.dm
@@ -38,7 +38,7 @@
for(var/mob/living/M in target)
if(M)
M.NotTargeted(src) //Untargeting people.
- del(target)
+ qdel(target)
//Compute how to fire.....
/obj/item/weapon/gun/proc/PreFire(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, params)
@@ -63,7 +63,7 @@
for(var/mob/living/L in target)
if(L)
L.NotTargeted(src)
- del(target)
+ qdel(target)
usr.visible_message("\red [usr] turns \the [src] on [M]!")
else
usr.visible_message("\red [usr] aims \a [src] at [M]!")
@@ -218,13 +218,13 @@ mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I)
targeted_by -= I
I.target.Remove(src) //De-target them
if(!I.target.len)
- del(I.target)
+ qdel(I.target)
var/mob/living/T = I.loc //Remove the targeting icons
if(T && ismob(T) && !I.target)
T.client.remove_gun_icons()
if(!targeted_by.len)
- del target_locked //Remove the overlay
- del targeted_by
+ qdel(target_locked) //Remove the overlay
+ qdel(targeted_by)
spawn(1) update_targeted()
mob/living/Move()
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index d5390125378..bd9cf955453 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -357,7 +357,7 @@ datum
var/mob/living/M = my_atom
R.reagent_deleted(M)
reagent_list -= A
- del(A)
+ qdel(A)
update_total()
my_atom.on_reagent_change()
check_ignoreslow(my_atom)
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 634519a7b83..53698650d4c 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -95,7 +95,7 @@
/obj/machinery/chem_dispenser/blob_act()
if (prob(50))
- del(src)
+ qdel(src)
/**
* The ui_interact proc is used to open and update Nano UIs
@@ -209,7 +209,7 @@
S.use(1)
else
user.drop_item()
- del(B)
+ qdel(B)
return
if(src.beaker)
@@ -970,7 +970,7 @@
/obj/machinery/reagentgrinder/proc/remove_object(var/obj/item/O)
holdingitems -= O
- del(O)
+ qdel(O)
/obj/machinery/reagentgrinder/proc/juice()
power_change()
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index c3191029e4a..d851dfcbece 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -428,7 +428,7 @@ datum
M.invisibility = 101
for(var/obj/item/W in M)
if(istype(W, /obj/item/weapon/implant)) //TODO: Carn. give implants a dropped() or something
- del(W)
+ qdel(W)
continue
W.layer = initial(W.layer)
W.loc = M.loc
@@ -440,7 +440,7 @@ datum
M.mind.transfer_to(new_mob)
else
new_mob.key = M.key
- del(M)
+ qdel(M)
..()
return
@@ -834,7 +834,7 @@ datum
I.desc = "Looks like this was \an [O] some time ago."
for(var/mob/M in viewers(5, O))
M << "\red \the [O] melts."
- del(O)
+ qdel(O)
glycerol
name = "Glycerol"
@@ -1118,7 +1118,7 @@ datum
reaction_obj(var/obj/O, var/volume)
if(istype(O,/obj/effect/decal/cleanable))
- del(O)
+ qdel(O)
else
if(O)
O.clean_blood()
@@ -1127,7 +1127,7 @@ datum
T.overlays.Cut()
T.clean_blood()
for(var/obj/effect/decal/cleanable/C in src)
- del(C)
+ qdel(C)
for(var/mob/living/carbon/slime/M in T)
M.adjustToxLoss(rand(5,10))
diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm
index 1e483a54e23..75825c4939c 100644
--- a/code/modules/reagents/dartgun.dm
+++ b/code/modules/reagents/dartgun.dm
@@ -155,7 +155,7 @@
cartridge.darts--
src.update_icon()
S.reagents.trans_to(D, S.reagents.total_volume)
- del(S)
+ qdel(S)
D.icon_state = "syringeproj"
D.name = "syringe"
D.flags |= NOREACT
@@ -194,16 +194,16 @@
D.reagents.trans_to(M, 15)
M << "You feel a slight prick."
- del(D)
+ qdel(D)
break
if(D)
for(var/atom/A in D.loc)
if(A == user) continue
- if(A.density) del(D)
+ if(A.density) qdel(D)
sleep(1)
- if (D) spawn(10) del(D)
+ if (D) spawn(10) qdel(D)
return
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index 4902d8d0eee..54bd296a1ea 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -249,7 +249,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(method == TOUCH)
if(H.wear_mask)
if(!H.wear_mask.unacidable)
- qdel (H.wear_mask)
+ qdel(H.wear_mask)
H.update_inv_wear_mask()
H << "\red Your mask melts away but protects you from the acid!"
else
@@ -574,7 +574,9 @@ datum/reagent/atrazine/reaction_turf(var/turf/T, var/volume)
var/turf/simulated/wall/W = T
if(W.rotting)
W.rotting = 0
- for(var/obj/effect/E in W) if(E.name == "Wallrot") del E
+ for(var/obj/effect/E in W)
+ if(E.name == "Wallrot")
+ qdel(E)
for(var/mob/O in viewers(W, null))
O.show_message(text("\blue The fungi are completely dissolved by the solution!"), 1)
@@ -585,9 +587,9 @@ datum/reagent/atrazine/reaction_obj(var/obj/O, var/volume)
alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
alien_weeds.healthcheck()
else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
- del(O)
+ qdel(O)
else if(istype(O,/obj/effect/plant))
- if(prob(50)) del(O) //Kills kudzu too.
+ if(prob(50)) qdel(O) //Kills kudzu too.
// Damage that is done to growing plants is separately at code/game/machinery/hydroponics at obj/item/hydroponics
datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 58945a89c4d..20da18a668f 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -30,7 +30,7 @@
user.put_in_active_hand(B)
src.transfer_fingerprints_to(B)
- del(src)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/drinks/bottle/attack(mob/living/target as mob, mob/living/user as mob)
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index 43fcf939996..ce50606d7c5 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -19,7 +19,7 @@
user.put_in_active_hand(S)
src.transfer_fingerprints_to(S)
- del(src)
+ qdel(src)
attack(mob/living/target as mob, mob/living/user as mob)
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 11367d61787..e8acb8f0f99 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -30,7 +30,7 @@
usr.put_in_hands(TrashItem)
else if(istype(trash,/obj/item))
usr.put_in_hands(trash)
- del(src)
+ qdel(src)
return
/obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user as mob)
@@ -40,7 +40,7 @@
if(!reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
user << "\red None of [src] left, oh no!"
M.unEquip(src) //so icons update :[
- del(src)
+ qdel(src)
return 0
if(istype(M, /mob/living/carbon))
@@ -169,7 +169,7 @@
reagents.trans_to(U,min(reagents.total_volume,5))
if (reagents.total_volume <= 0)
- del(src)
+ qdel(src)
return
if((slices_num <= 0 || !slices_num) || !slice_path)
@@ -227,7 +227,7 @@
for(var/i=1 to (slices_num-slices_lost))
var/obj/slice = new slice_path (src.loc)
reagents.trans_to(slice,reagents_per_slice)
- del(src)
+ qdel(src)
return
@@ -246,7 +246,7 @@
playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
var/mob/living/simple_animal/pet/corgi/C = M
C.health = min(C.health + 5, C.maxHealth)
- del(src)
+ qdel(src)
else
M.visible_message("[M] takes a bite of \the [src].","You take a bite of \the [src].")
playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
@@ -541,7 +541,7 @@
new/obj/effect/decal/cleanable/egg_smudge(src.loc)
src.reagents.reaction(hit_atom, TOUCH)
src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
- del(src)
+ qdel(src)
attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype( W, /obj/item/toy/crayon ))
@@ -1019,7 +1019,7 @@
..()
new/obj/effect/decal/cleanable/pie_smudge(src.loc)
src.visible_message("\red [src.name] splats.","\red You hear a splat.")
- del(src)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
name = "Berry Clafoutis"
@@ -1731,7 +1731,7 @@
M << "\red \The [src] expands!"
var/mob/living/carbon/human/H = new (src)
H.set_species(monkey_type)
- del(src)
+ qdel(src)
proc/Unwrap(mob/user as mob)
icon_state = "monkeycube"
@@ -2308,7 +2308,7 @@
"\blue You flatten the dough with your rolling pin!" \
)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(src.loc)
- del(src)
+ qdel(src)
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -3253,16 +3253,16 @@
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg))
new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
user << "You make some dough."
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
// Egg + flour = dough
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/flour))
new /obj/item/weapon/reagent_containers/food/snacks/dough(src)
user << "You make some dough."
- del(W)
- del(src)
+ qdel(W)
+ qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/dough
name = "dough"
@@ -3382,7 +3382,7 @@
if(istype(W,/obj/item/weapon/kitchen/utensil/knife))
new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src)
user << "You cut the potato."
- del(src)
+ qdel(src)
else
..()
diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
index b49e6187d99..b05478ca01b 100644
--- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm
@@ -15,7 +15,7 @@
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
user << "You cut the meat in thin strips."
- del(src)
+ qdel(src)
else
..()
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 87388cb3fe3..6288a6058bc 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -346,7 +346,7 @@
attackby(var/obj/D, mob/user as mob, params)
if(isprox(D))
user << "You add [D] to [src]."
- del(D)
+ qdel(D)
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
user.unEquip(src)
qdel(src)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index b15c03ee984..fe255c9caf7 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -71,7 +71,7 @@
for(var/atom/T in get_turf(D))
D.reagents.reaction(T)
sleep(3)
- del(D)
+ qdel(D)
/obj/item/weapon/reagent_containers/spray/attack_self(var/mob/user)
@@ -200,7 +200,7 @@
for(var/atom/t in get_turf(D))
D.reagents.reaction(t)
sleep(2)
- del(D)
+ qdel(D)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index e53a9c15c4c..c0d29bd79e0 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -305,7 +305,7 @@
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1)
user.unEquip(src)
- del(src)
+ qdel(src)
return
for(var/mob/O in viewers(world.view, user))
diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm
index 965110d220b..ac70be0f387 100644
--- a/code/modules/reagents/syringe_gun.dm
+++ b/code/modules/reagents/syringe_gun.dm
@@ -25,7 +25,7 @@
in_chamber.name = S.name
syringes.Remove(S)
- del(S)
+ qdel(S)
return 1
/obj/item/weapon/gun/syringe/examine()
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index fc6f51bf037..8eddccfac04 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -252,7 +252,7 @@
src.transfer_fingerprints_to(P)
P.dir = dir
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 3b57147aba8..9c32b654ec3 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -83,7 +83,7 @@
C.anchored = 1
C.density = 1
C.update()
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
@@ -117,7 +117,7 @@
GM.loc = src
for (var/mob/C in viewers(src))
C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
- del(G)
+ qdel(G)
usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.")
GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])")
if(GM.ckey)
@@ -460,7 +460,7 @@
AM.throw_at(target, 5, 1)
H.vent_gas(loc)
- del(H)
+ qdel(H)
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (istype(mover,/obj/item) && mover.throwing)
@@ -611,7 +611,7 @@
if(other.has_fat_guy)
has_fat_guy = 1
- del(other)
+ qdel(other)
// called when player tries to move while in a pipe
@@ -778,7 +778,7 @@
if(AM)
AM.throw_at(target, 100, 1)
H.vent_gas(T)
- del(H)
+ qdel(H)
else // no specified direction, so throw in random direction
@@ -794,7 +794,7 @@
AM.throw_at(target, 5, 1)
H.vent_gas(T) // all gas vent to turf
- del(H)
+ qdel(H)
return
@@ -822,7 +822,7 @@
for(var/atom/movable/AM in H)
AM.loc = T
AM.pipe_eject(0)
- del(H)
+ qdel(H)
return
// otherwise, do normal expel from turf
@@ -830,7 +830,7 @@
expel(H, T, 0)
spawn(2) // delete pipe after 2 ticks to ensure expel proc finished
- del(src)
+ qdel(src)
// pipe affected by explosion
@@ -913,7 +913,7 @@
C.anchored = 1
C.update()
- del(src)
+ qdel(src)
// *** TEST verb
//client/verb/dispstop()
@@ -1253,7 +1253,7 @@
welded()
// var/obj/item/scrap/S = new(src.loc)
// S.set_components(200,0,0)
- del(src)
+ qdel(src)
// the disposal outlet machine
@@ -1297,7 +1297,7 @@
if(AM)
AM.throw_at(target, 3, 1)
H.vent_gas(src.loc)
- del(H)
+ qdel(H)
return
@@ -1330,7 +1330,7 @@
C.update()
C.anchored = 1
C.density = 1
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 95f149fa611..21182bd0e10 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -329,7 +329,7 @@
C.update()
C.anchored = 1
C.density = 1
- del(src)
+ qdel(src)
return
else
user << "You need more welding fuel to complete this task."
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index df881681284..f73061bcbbc 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -192,7 +192,7 @@ var/obj/machinery/blackbox_recorder/blackbox
/obj/machinery/blackbox_recorder/New()
if(blackbox)
if(istype(blackbox,/obj/machinery/blackbox_recorder))
- del(src)
+ qdel(src)
blackbox = src
/obj/machinery/blackbox_recorder/Destroy()
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 964af1cea1f..be845f32868 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -62,7 +62,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
check_tech = new T()
if(check_tech.id == ID)
return_name = check_tech.name
- del(check_tech)
+ qdel(check_tech)
check_tech = null
break
@@ -96,7 +96,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
temp_reagent = new R()
if(temp_reagent.id == ID)
return_name = temp_reagent.name
- del(temp_reagent)
+ qdel(temp_reagent)
temp_reagent = null
break
return return_name
@@ -595,7 +595,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/choice = alert("R&D Console Database Reset", "Are you sure you want to reset the R&D console's database? Data lost cannot be recovered.", "Continue", "Cancel")
if(choice == "Continue")
screen = 0.0
- del(files)
+ qdel(files)
files = new /datum/research(src)
spawn(20)
screen = 1.6
diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
index 1503e4e9c90..23413d4f0df 100644
--- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
+++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
@@ -59,7 +59,7 @@ datum/genesequence
visible_message("\red \icon[src] [src] can not extract any more genetic data from new fossils.")
if(4)
src.visible_message("\blue \icon[src] [user] inserts [W] into [src], the fossil is consumed as [src] extracts genetic data from it.")
- del(W)
+ qdel(W)
updateDialog()
else if (istype(W, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = W
@@ -76,7 +76,7 @@ datum/genesequence
if(SCANFOSSIL_RETVAL_SUCCESS)
numaccepted += 1
S.remove_from_storage(F, src) //This will move the item to this item's contents
- del(F)
+ qdel(F)
updateDialog()
var/outmsg = "\blue You empty all the fossils from [S] into [src]."
if(numaccepted)
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
index 9209e062657..1c772d33bf0 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
@@ -156,7 +156,7 @@
//see if we can clear out an old effect
//delete it when the ids match to account for duplicate ids having different effects
if(inserted_battery.battery_effect && inserted_battery.stored_charge <= 0)
- del(inserted_battery.battery_effect)
+ qdel(inserted_battery.battery_effect)
//
var/datum/artifact_effect/source_effect
diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
index 2d65cbb5e1e..e5a13d5fde2 100644
--- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
@@ -309,7 +309,7 @@
M.weakened = min(M.weakened, 3)
src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.")
- del(suspension_field)
+ qdel(suspension_field)
icon_state = "suspension2"
/obj/machinery/suspension_gen/Destroy()
diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
index 1aa2a4a37eb..be3f958e3f5 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
@@ -38,7 +38,7 @@
/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/evidencebag))
if(num_stored_bags < 10)
- del(W)
+ qdel(W)
num_stored_bags += 1
user << "\blue You insert the [W] into the core sampler."
else
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index 7c55b81004a..078266508fe 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -118,11 +118,11 @@
if(index <= positive_locations.len)
var/datum/depth_scan/D = positive_locations[index]
positive_locations.Remove(D)
- del(D)
+ qdel(D)
else
//GC will hopefully pick them up before too long
positive_locations = list()
- del(current)
+ qdel(current)
else if(href_list["close"])
usr.unset_machine()
usr << browse(null, "window=depth_scanner")
diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm
index 09c327482e3..6755c2b8a47 100644
--- a/code/modules/shieldgen/shield_gen.dm
+++ b/code/modules/shieldgen/shield_gen.dm
@@ -259,14 +259,14 @@
for(var/turf/O in covered_turfs)
var/obj/effect/energy_field/E = new(O)
field.Add(E)
- del covered_turfs
+ qdel(covered_turfs)
for(var/mob/M in view(5,src))
M << "\icon[src] You hear heavy droning start up."
else
for(var/obj/effect/energy_field/D in field)
field.Remove(D)
- del D
+ qdel(D)
for(var/mob/M in view(5,src))
M << "\icon[src] You hear heavy droning fade out."
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 77927deb6ca..600e8d5d86b 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -96,7 +96,7 @@
for(var/atom/movable/AM as mob|obj in T)
AM.Move(D)
if(istype(T, /turf/simulated))
- del(T)
+ qdel(T)
for(var/mob/living/carbon/bug in destination)
bug.gib()
diff --git a/code/modules/surgery/robolimbs.dm b/code/modules/surgery/robolimbs.dm
index becd430d4a7..17d92cf9b4e 100644
--- a/code/modules/surgery/robolimbs.dm
+++ b/code/modules/surgery/robolimbs.dm
@@ -52,7 +52,7 @@
target.updatehealth()
target.UpdateDamageIcon()
- del(tool)
+ qdel(tool)
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
user.visible_message("\red [user]'s hand slips, damaging [target]'s flesh!", \
diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm
index 08fc98cacf0..85d0acf03a3 100644
--- a/code/modules/vehicle/vehicle.dm
+++ b/code/modules/vehicle/vehicle.dm
@@ -214,7 +214,7 @@
new /obj/effect/gibspawner/robot(Tsec)
new /obj/effect/decal/cleanable/blood/oil(src.loc)
- del(src)
+ qdel(src)
/obj/vehicle/proc/healthcheck()
if(health <= 0)
diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index 4a2ac380a55..b3c7154ea79 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -71,7 +71,7 @@
new/mob/living/carbon/alien/larva(mob.loc)
var/datum/disease2/disease/D = mob:virus2
mob:gib()
- del D
+ qdel(D)
/datum/disease2/effect/invisible
diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm
index fbbc64f79b8..6008c5b8879 100644
--- a/code/modules/virus2/items_devices.dm
+++ b/code/modules/virus2/items_devices.dm
@@ -64,7 +64,7 @@
if(airborne_can_reach(get_turf(src), get_turf(target)))
if(get_infection_chance(target))
infect_virus2(target,src.virus2)
- del src
+ qdel(src)
/obj/item/weapon/virusdish/examine()
usr << "This is a virus containment dish."
@@ -84,7 +84,7 @@
if(prob(50))
user << "\The [src] shatters!"
- del src
+ qdel(src)
///////////////GNA DISK///////////////