From 4608244c8728d17af1942b20c1b51d0b5b3e92f8 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 21 Feb 2018 13:06:07 -0500
Subject: [PATCH] Update fakedeath.dm

---
 .../changeling/powers/fakedeath.dm            | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm
index b930b4d609..754c894278 100644
--- a/code/modules/antagonists/changeling/powers/fakedeath.dm
+++ b/code/modules/antagonists/changeling/powers/fakedeath.dm
@@ -1,42 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/proc_holder/changeling/fakedeath
-	name = "Reviving Stasis"
-	desc = "We fall into a stasis, allowing us to regenerate and trick our enemies."
-	chemical_cost = 15
-	dna_cost = 0
-	req_dna = 1
-	req_stat = DEAD
-
-//Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay.
-/obj/effect/proc_holder/changeling/fakedeath/sting_action(mob/living/user)
-	to_chat(user, "<span class='notice'>We begin our stasis, preparing energy to arise once more.</span>")
-	if(user.stat != DEAD)
-		user.emote("deathgasp")
-		user.tod = worldtime2text()
-	user.fakedeath("changeling") //play dead
-	user.update_stat()
-	user.update_canmove()
-
-	addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE)
-	return TRUE
-
-/obj/effect/proc_holder/changeling/fakedeath/proc/ready_to_regenerate(mob/user)
-	if(user && user.mind)
-		var/datum/antagonist/changeling/C = user.mind.has_antag_datum(/datum/antagonist/changeling)
-		if(C && C.purchasedpowers)
-			to_chat(user, "<span class='notice'>We are ready to revive.</span>")
-			C.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
-
-/obj/effect/proc_holder/changeling/fakedeath/can_sting(mob/living/user)
-	if(user.has_trait(TRAIT_FAKEDEATH, "changeling"))
-		to_chat(user, "<span class='warning'>We are already reviving.</span>")
-		return
-	if(!user.stat) //Confirmation for living changelings if they want to fake their death
-		switch(alert("Are we sure we wish to fake our own death?",,"Yes", "No"))
-			if("No")
-				return
-	return ..()
-=======
 /obj/effect/proc_holder/changeling/fakedeath
 	name = "Reviving Stasis"
 	desc = "We fall into a stasis, allowing us to regenerate and trick our enemies."
@@ -74,4 +35,3 @@
 			if("No")
 				return
 	return ..()
->>>>>>> 3622768... Merge pull request #35775 from kevinz000/night_shift