Removes More Del's

This commit is contained in:
Fox-McCloud
2016-08-01 21:24:38 -04:00
parent 762af0abf8
commit 2e69b0eec1
4 changed files with 11 additions and 10 deletions
@@ -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)
+6 -5
View File
@@ -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
+1 -1
View File
@@ -89,7 +89,7 @@
if("delete")
for(var/datum/d in objs)
del(d)
qdel(d)
if("select")
var/text = ""
+1 -1
View File
@@ -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)