From 0a91b351c03cebbd917e53c0502ae7df07b37897 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Thu, 7 Jan 2016 09:05:52 -0800
Subject: [PATCH] SSD people fall asleep more reliably

---
 code/modules/mob/living/carbon/human/life.dm |  9 -----
 code/modules/mob/living/carbon/life.dm       |  4 +++
 html/changelogs/crazylemon-sleepymobs.yml    | 35 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 html/changelogs/crazylemon-sleepymobs.yml

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 80640ce7bcf..f9546827a42 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -827,10 +827,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 	. = ..()
 
-	//SSD check, if a logged player is awake put them back to sleep!
-	if(player_logged && sleeping < 2)
-		sleeping = 2
-
 	if(.) //alive
 		if(REGEN in mutations)
 			if(nutrition)
@@ -865,11 +861,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		else if(sleeping)
 			speech_problem_flag = 1
 
-			if(mind)
-				//Are they SSD? If so we'll keep them asleep but work off some of that sleep var in case of ether or similar.
-				if(player_logged)
-					sleeping = max(sleeping - 1, 2)
-
 			blinded = 1
 			stat = UNCONSCIOUS
 
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 542db99dc1e..a182fa62f84 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -371,6 +371,10 @@
 		if(prob(10) && health && !hal_crit)
 			spawn(0)
 				emote("snore")
+	// Keep SSD people asleep
+	if(player_logged && sleeping < 2)
+		sleeping = 2
+	return sleeping
 
 
 //this handles hud updates. Calls update_vision() and handle_hud_icons()
diff --git a/html/changelogs/crazylemon-sleepymobs.yml b/html/changelogs/crazylemon-sleepymobs.yml
new file mode 100644
index 00000000000..06d4726dc83
--- /dev/null
+++ b/html/changelogs/crazylemon-sleepymobs.yml
@@ -0,0 +1,35 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog.
+author: Crazylemon
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "SSD humans should be asleep more reliably now."