From 0e62abc49360cb18146bdb6cb5cb8949443b6b9d Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Sun, 15 Mar 2020 20:41:36 -0500
Subject: [PATCH] Unconscious in Stasis (#8448)

---
 code/modules/mob/living/carbon/human/life.dm | 9 ++++++---
 html/changelogs/doxxmedearly - stasis.yml    | 8 ++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/doxxmedearly - stasis.yml

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index f7d38172da6..76eec5a0fe8 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -232,6 +232,9 @@
 		// Next, the method to induce stasis has some adverse side-effects, manifesting
 		// as cloneloss
 		adjustCloneLoss(0.1)
+		if(stat != DEAD)
+			blinded = TRUE
+			stat = UNCONSCIOUS
 
 /mob/living/carbon/human/handle_mutations_and_radiation()
 	if(in_stasis)
@@ -756,8 +759,8 @@
 				src.visible_message("<B>[src]</B> [species.halloss_message]")
 			Paralyse(10)
 
-		if(paralysis || sleeping)
-			blinded = 1
+		if(paralysis || sleeping || in_stasis)
+			blinded = TRUE
 			stat = UNCONSCIOUS
 
 			adjustHalLoss(-3)
@@ -783,7 +786,7 @@
 
 
 		//CONSCIOUS
-		else
+		else if(!in_stasis)
 			stat = CONSCIOUS
 			willfully_sleeping = FALSE
 
diff --git a/html/changelogs/doxxmedearly - stasis.yml b/html/changelogs/doxxmedearly - stasis.yml
new file mode 100644
index 00000000000..5b7e4aa6522
--- /dev/null
+++ b/html/changelogs/doxxmedearly - stasis.yml	
@@ -0,0 +1,8 @@
+# Your name.  
+author: Doxxmedearly
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+changes: 
+  - bugfix: "Being in a stasis bag will properly render you unconscious."