Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775

[MIRROR] [READY]Randomized Station Time + Night Shifts
2018-02-24 00:24:47 -06:00
parent 4d42f68508 26240bbca4
commit 6ce5985f9f
33 changed files with 245 additions and 165 deletions
@@ -1,37 +1,37 @@
-/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."
+	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 = station_time_timestamp()
+	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 ..()