From 8860b285ff612519a7f6bb086a443325c167c997 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Mon, 29 Oct 2018 14:55:14 -0700 Subject: [PATCH 1/3] Makes drone gib on shutdown --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 0a24b6414ca..afbca436c06 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -243,7 +243,7 @@ return to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") - death() + gib() /mob/living/silicon/robot/drone/proc/full_law_reset() clear_supplied_laws() From c3236e84acb19989c701016dce64e4e7d45c79e8 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Tue, 30 Oct 2018 18:50:32 -0700 Subject: [PATCH 2/3] Revert "Makes drone gib on shutdown" This reverts commit 8860b285ff612519a7f6bb086a443325c167c997. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index afbca436c06..0a24b6414ca 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -243,7 +243,7 @@ return to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") - gib() + death() /mob/living/silicon/robot/drone/proc/full_law_reset() clear_supplied_laws() From c6249d89f5a2b4d4ee0cefd6a542a5fbd176d761 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Tue, 30 Oct 2018 19:06:23 -0700 Subject: [PATCH 3/3] Fixed by not allowing ghost to reenter corpse. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 0a24b6414ca..fd3d8818ce7 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -223,6 +223,10 @@ health = 35 - (getBruteLoss() + getFireLoss()) update_stat("updatehealth([reason])") +/mob/living/silicon/robot/drone/death(gibbed) + . = ..(gibbed) + ghostize(can_reenter_corpse = 0) + //CONSOLE PROCS /mob/living/silicon/robot/drone/proc/law_resync()