From 331abddcafca4bf53906375efd0974447dcce069 Mon Sep 17 00:00:00 2001 From: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Date: Sat, 16 Jul 2022 10:40:08 -0400 Subject: [PATCH] PAI's no longer runtime when suiciding (#18369) * PAI's no longer runtime when suiciding * WAGH --- code/game/verbs/suicide.dm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 101b7842789..cc6746215e2 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -172,18 +172,20 @@ set category = "pAI Commands" set desc = "Kill yourself and become a ghost (You will receive a confirmation prompt)" set name = "pAI Suicide" - var/answer = input("REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No") - if(answer == "Yes") - if(mobility_flags & MOBILITY_MOVE) - close_up() - var/obj/item/paicard/card = loc - card.removePersonality() - var/turf/T = get_turf_or_move(card.loc) - for(var/mob/M in viewers(T)) - M.show_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "[src] bleeps electronically.", 2) - death(0, 1) - else + + var/answer = input(src, "REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No") + if(answer != "Yes") to_chat(src, "Aborting suicide attempt.") + return + + if(mobility_flags & MOBILITY_MOVE) + close_up() + card.removePersonality() + var/turf/T = get_turf(card.loc) + for(var/mob/M in viewers(T)) + M.show_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "[src] bleeps electronically.", 2) + death(gibbed = FALSE, cleanWipe = TRUE) + /mob/living/carbon/alien/humanoid/verb/suicide() set hidden = 1