diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index f96b10fff23..4d8b27a6690 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -21,16 +21,16 @@ new/obj/item/stack/sheet/glass(user.loc) if(amount <= 0) user.unEquip(src, 1) - del(src) + qdel(src) if(istype(O,/obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = O M.amount-- if(M.amount <= 0) user.unEquip(src, 1) - del(M) + qdel(M) amount-- new/obj/item/stack/tile/light(user.loc) if(amount <= 0) user.unEquip(src, 1) - del(src) + qdel(src) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 917d030cd63..753cc9f9de8 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -23,7 +23,8 @@ /obj/item/stack/Destroy() if(usr && usr.machine == src) usr << browse(null, "window=stack") - return ..() + ..() + return QDEL_HINT_HARDDEL_NOW // because qdel'd stacks act strange for cyborgs /obj/item/stack/examine(mob/user) if(..(user, 1)) @@ -111,7 +112,7 @@ if(href_list["make"]) if(amount < 1) - del(src) //Never should happen + qdel(src) //Never should happen var/list/recipes_list = recipes if(href_list["sublist"]) @@ -160,7 +161,7 @@ var/oldsrc = src src = null //dont kill proc after del() usr.unEquip(oldsrc, 1) - del(oldsrc) // Not qdel, because qdel'd stacks act strange for cyborgs + qdel(oldsrc) if(istype(O, /obj/item)) usr.put_in_hands(O) @@ -168,7 +169,7 @@ //BubbleWrap - so newly formed boxes are empty if(istype(O, /obj/item/weapon/storage)) for(var/obj/item/I in O) - del(I) + qdel(I) //BubbleWrap END if(src && usr.machine == src) //do not reopen closed window @@ -184,7 +185,7 @@ if(usr) usr.unEquip(src, 1) spawn() - del(src) // Not qdel, because qdel'd stacks act strange for cyborgs + qdel(src) update_icon() return 1 diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 27048b441dd..e07bda7c8ee 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -89,7 +89,7 @@ if("delete") for(var/datum/d in objs) - del(d) + qdel(d) if("select") var/text = "" diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index dd685a37a0b..e7eedea85e3 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -737,7 +737,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) var/obj/item/weapon/storage/backpack/backpack = new(M) for(var/obj/item/I in backpack) - del(I) + qdel(I) M.equip_to_slot_or_del(backpack, slot_back) M.equip_to_slot_or_del(new /obj/item/weapon/mop(M), slot_r_hand) var/obj/item/weapon/reagent_containers/glass/bucket/bucket = new(M)