From 4a1f3967076c0f6bb973e511a406084e2f238fc2 Mon Sep 17 00:00:00 2001 From: dearmochi <1496804+dearmochi@users.noreply.github.com> Date: Thu, 2 May 2024 08:52:14 +0900 Subject: [PATCH] Grant TRAIT_NOFIRE while cloning (#25327) * Grant TRAIT_NOFIRE while cloning * Update code/game/machinery/clonepod.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --- code/game/machinery/clonepod.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/clonepod.dm b/code/game/machinery/clonepod.dm index 4853ae760b0..04e8e8a0a0b 100644 --- a/code/game/machinery/clonepod.dm +++ b/code/game/machinery/clonepod.dm @@ -358,6 +358,7 @@ clone.set_heartattack(FALSE) //you are not allowed to die clone.adjustCloneLoss(25) //to punish early ejects clone.Weaken(4 SECONDS) + ADD_TRAIT(clone, TRAIT_NOFIRE, "cloning") // Plasmamen shouldn't catch fire while cloning //Ejects a clone. The force var ejects even if there's still clone damage. /obj/machinery/clonepod/proc/eject_clone(force = FALSE) @@ -376,6 +377,7 @@ patient_mind.transfer_to(clone) clone.grab_ghost() clone.update_revive() + REMOVE_TRAIT(clone, TRAIT_NOFIRE, "cloning") to_chat(clone, "You remember nothing from the time that you were dead!") to_chat(clone, "There's a bright flash of light, and you take your first breath once more.") @@ -393,7 +395,8 @@ patient_mind.transfer_to(clone) clone.grab_ghost() clone.update_revive() - to_chat(clone, "You remember nothing from the time that you were dead!") + REMOVE_TRAIT(clone, TRAIT_NOFIRE, "cloning") + to_chat(clone, "You remember nothing from the time that you were dead!") to_chat(clone, "You're ripped out of blissful oblivion! You feel like shit.") reset_cloning()