From 8ad196da0f9bf7dcf4000c686afdf521e4438290 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 7 Feb 2017 09:42:49 -0500 Subject: [PATCH 1/2] Makes all Mobs Hard Delete --- code/modules/mob/camera/camera.dm | 4 ---- code/modules/mob/living/living.dm | 5 ++--- code/modules/mob/mob.dm | 3 ++- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm index 18a066d03a9..f9cb1123ca3 100644 --- a/code/modules/mob/camera/camera.dm +++ b/code/modules/mob/camera/camera.dm @@ -14,10 +14,6 @@ /mob/camera/experience_pressure_difference() return -/mob/camera/Destroy() - ..() - return QDEL_HINT_HARDDEL_NOW - /mob/camera/Login() ..() update_interface() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index bc849f9674e..8252fab511d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -2,9 +2,8 @@ /mob/living/Destroy() if(ranged_ability) ranged_ability.remove_ranged_ability(src) - ..() - return QDEL_HINT_HARDDEL_NOW - + return ..() + /mob/living/ghostize(can_reenter_corpse = 1) var/prev_client = client if(..()) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 216bb896e7e..efe3f003972 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -19,7 +19,8 @@ for(var/datum/alternate_appearance/AA in viewing_alternate_appearances) AA.viewers -= src viewing_alternate_appearances = null - return ..() + .. () + return QDEL_HINT_HARDDEL /mob/New() mob_list += src From e60cc252c6e59fecbebaa161f123b479d7dd89aa Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 7 Feb 2017 10:01:20 -0500 Subject: [PATCH 2/2] fix --- code/modules/mob/mob.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index efe3f003972..3f3792fd1b7 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -19,8 +19,8 @@ for(var/datum/alternate_appearance/AA in viewing_alternate_appearances) AA.viewers -= src viewing_alternate_appearances = null - .. () - return QDEL_HINT_HARDDEL + ..() + return QDEL_HINT_HARDDEL_NOW /mob/New() mob_list += src