Merge pull request #3181 from MrPerson/qdel_DEL_THE_MOBS

Make most mobs del() instead of trying to GC them.
This commit is contained in:
Aranclanos
2014-03-26 03:37:31 -03:00
4 changed files with 10 additions and 11 deletions
-6
View File
@@ -44,12 +44,6 @@
/atom/proc/CheckParts()
return
/atom/Del()
// Pass to Destroy().
if(isnull(gc_destroyed)) // If we're just straight up calling del(atom), make sure anything in Destroy() gets called anyways just to be sure.
Destroy()
..()
// Like Del(), but for qdel.
// Called BEFORE qdel moves shit.
// Also called on del()
+2 -2
View File
@@ -23,9 +23,9 @@
return
/atom/movable/Del()
if(!gc_destroyed && loc)
if(isnull(gc_destroyed) && loc)
testing("GC: -- [type] was deleted via del() rather than qdel() --")
// else if(!gc_destroyed)
// else if(isnull(gc_destroyed))
// testing("GC: [type] was deleted via GC without qdel()") //Not really a huge issue but from now on, please qdel()
// else
// testing("GC: [type] was deleted via GC with qdel()")
+5 -1
View File
@@ -12,4 +12,8 @@
move_on_shuttle = 0
/mob/camera/experience_pressure_difference()
return
return
/mob/camera/Destroy()
..()
del(src)
+3 -2
View File
@@ -5,9 +5,10 @@
cur_area.mob_activate(src)
/mob/living/Destroy()
if(mind)
mind.current = null
// if(mind)
// mind.current = null
..()
del(src)
/mob/living/verb/succumb(var/whispered as null)
set hidden = 1