From 233fb786e8b494d8ae9bc09cc41346a81f1c5402 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Tue, 25 Aug 2020 23:29:06 +0100
Subject: [PATCH] Fix swap forms suicide bug

---
 code/game/gamemodes/changeling/powers/swap_form.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm
index 02cca052ea8..32f83b6af50 100644
--- a/code/game/gamemodes/changeling/powers/swap_form.dm
+++ b/code/game/gamemodes/changeling/powers/swap_form.dm
@@ -63,6 +63,8 @@
 	target.add_language("Changeling")
 	user.remove_language("Changeling")
 	user.regenerate_icons()
+	if(target.stat == DEAD && target.suiciding)  //If Target committed suicide, unset flag for User
+		target.suiciding = 0
 
 	for(var/power in lingpowers)
 		var/datum/action/changeling/S = power