diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 0ee9264a211..acefa9c1d93 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -193,7 +193,7 @@ datum/shuttle_controller sleep(speed) step(src, direction) for(var/obj/effect/starender/E in loc) - del(src) + qdel(src) /obj/effect/starender diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 5339eaa3757..855ca45dc7b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -121,7 +121,7 @@ //Handle the destruction of the shield if (src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return //The shield becomes dense to absorb the blow.. purely asthetic. diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index b551c23c821..9c6dbbdb37c 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -86,7 +86,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 diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 6a681816ad7..770a1159de5 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -25,7 +25,7 @@ var/list/world_uplinks = list() welcome = ticker.mode.uplink_welcome uses = ticker.mode.uplink_uses -/obj/item/device/uplink/Del() +/obj/item/device/uplink/Destroy() world_uplinks-=src ..() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index cfee2bba557..35f0eadaa47 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -80,10 +80,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM flags |= NOREACT // so it doesn't react until you light it create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 -/obj/item/clothing/mask/cigarette/Destroy() - del(reagents) - ..() - /obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/weapon/weldingtool)) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index de28bde61e6..4fdfba975c5 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -21,7 +21,7 @@ var/obj/item/weapon/tank/plasma/ptank = null -/obj/item/weapon/flamethrower/Del() +/obj/item/weapon/flamethrower/Destroy() if(weldtool) qdel(weldtool) if(igniter) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 8b4ccbf48f6..96375165496 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -163,11 +163,6 @@ new /obj/item/clothing/mask/cigarette(src) create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one -/obj/item/weapon/storage/fancy/cigarettes/Destroy() - del(reagents) - ..() - - /obj/item/weapon/storage/fancy/cigarettes/update_icon() icon_state = "[initial(icon_state)][contents.len]" desc = "There are [contents.len] cig\s left!" diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index d999b2ba21c..0dd98f20695 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -40,12 +40,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 /* diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 9137ebbc52c..9e892238681 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -107,7 +107,7 @@ else new /obj/item/stack/rods(loc) new /obj/item/stack/rods(loc) - del(src) + qdel(src) else if((istype(W, /obj/item/weapon/screwdriver)) && (istype(loc, /turf/simulated) || anchored)) if(!shock(user, 90)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 712c8f3a7ff..9b511b88559 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -189,7 +189,7 @@ G = new (user.loc) G.add_fingerprint(user) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - src.Del(1) + qdel(src) else if(I.damtype == BRUTE || I.damtype == BURN) hit(I.force) @@ -303,10 +303,10 @@ return -/obj/structure/window/Destroy(quiet) +/obj/structure/window/Destroy() density = 0 air_update_turf(1) - if(!quiet)playsound(src, "shatter", 70, 1) + if(anchored)playsound(src, "shatter", 70, 1) update_nearby_icons() ..() diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index c72e6704110..c660de9c68f 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -1052,4 +1052,4 @@ obj/machinery/hydroponics/constructable/attackby(var/obj/item/O as obj, var/mob/ ..() if(istype(O, /obj/item/weapon/shovel)) user << "You clear up [src]!" - del(src) + qdel(src) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 866fd510645..1923fa230b2 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -116,7 +116,7 @@ b.loc = (get_turf(src)) else qdel(b) - del(src) + qdel(src) if(3.0) if(prob(50)) for(var/obj/item/weapon/book/b in contents)