Fixes #1528 + hard delete for admins (#1534)

This commit is contained in:
skull132
2017-01-12 16:19:17 +02:00
committed by GitHub
parent 0b5fdba52d
commit 9ae619d02e
3 changed files with 37 additions and 13 deletions

View File

@@ -34,8 +34,11 @@
return ..(loc)
/obj/effect/blob/Destroy()
processing_objects.Remove(src)
parent_core.blob_count -= 1
// Sanity time.
if (parent_core)
parent_core.blob_count -= 1
parent_core = null
..()
/obj/effect/blob/process()
@@ -45,6 +48,11 @@
playsound(loc, 'sound/effects/splat.ogg', 50, 1)
return
// Make deleting the parent more responsive.
if(!isnull(parent_core.gcDestroyed))
parent_core = null
return
if(prob(70))
for(var/mob/living/L in src.loc)
if(L.stat == DEAD)