From e6c598e1c1316c6eb134605d26c7d2ece66ee74e Mon Sep 17 00:00:00 2001 From: Farie82 Date: Tue, 17 Oct 2023 22:27:06 +0200 Subject: [PATCH] Ensure the fake death power checks the status again after input (#22943) --- code/modules/antagonists/changeling/powers/fakedeath.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm index ddfd307e7cd..2f44a349b75 100644 --- a/code/modules/antagonists/changeling/powers/fakedeath.dm +++ b/code/modules/antagonists/changeling/powers/fakedeath.dm @@ -35,4 +35,10 @@ switch(alert("Are we sure we wish to fake our death?",,"Yes","No")) if("No") return FALSE + // Do the checks again since we had user input + if(cling.owner != user.mind) + return FALSE + if(HAS_TRAIT(user, TRAIT_FAKEDEATH)) + to_chat(user, "We are already regenerating.") + return FALSE return ..()