cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 15:36:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

A plethora of Destroy() fixes - return qdel hints and clean stuff up.

Browse Source
This commit is contained in:
Leshana
2017-06-14 01:07:35 -04:00
parent 2cd91c8bfc
commit 4b46703d9d
17 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+5 -8
View File
@@ -18,11 +18,7 @@
unwrap()
proc/unwrap()
if(wrapped) //sometimes items can disappear. For example, bombs. --rastaf0
wrapped.loc = (get_turf(src.loc))
if(istype(wrapped, /obj/structure/closet))
var/obj/structure/closet/O = wrapped
O.welded = 0
// Destroy will drop our wrapped object on the turf, so let it.
qdel(src)
attackby(obj/item/W as obj, mob/user as mob)
@@ -312,14 +308,15 @@
/obj/structure/bigDelivery/Destroy()
if(wrapped) //sometimes items can disappear. For example, bombs. --rastaf0
wrapped.loc = (get_turf(loc))
wrapped.forceMove(get_turf(src))
if(istype(wrapped, /obj/structure/closet))
var/obj/structure/closet/O = wrapped
O.welded = 0
wrapped = null
var/turf/T = get_turf(src)
for(var/atom/movable/AM in contents)
AM.loc = T
..()
AM.forceMove(T)
return ..()
/obj/item/device/destTagger
name = "destination tagger"