Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mob/living/carbon/human/emote.dm

@@ -591,8 +591,8 @@
 
 
 /mob/living/carbon/human/verb/pose()
-	set name = "Set pose"
-	set desc = "Sets description which will be shown when someone examines you"
+	set name = "Set Pose"
+	set desc = "Sets a description which will be shown when someone examines you."
 	set category = "IC"
 
 	pose =  copytext(sanitize(input(usr, "This is [src]. \He is...", "Pose", null)  as text), 1, MAX_MESSAGE_LEN)

code/modules/mob/living/carbon/human/examine.dm

@@ -419,6 +419,8 @@
 
 	msg += "*---------*</span>"
 	if (pose)
-		msg += "\n[t_He] is [pose]."
+		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
+			pose = addtext(pose,".") //Makes sure all emotes end with a period.
+		msg += "\n[t_He] is [pose]"
 
 	usr << msg

code/modules/mob/living/carbon/human/life.dm

@@ -1108,7 +1108,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 				handle_dreams()
 				adjustHalLoss(-5)
 				if (mind)
-					if(mind.active || immune_to_ssd)
+					if((mind.active && client != null) || immune_to_ssd) //This also checks whether a client is connected, if not, sleep is not reduced.
 						sleeping = max(sleeping-1, 0)
 				blinded = 1
 				stat = UNCONSCIOUS

code/modules/mob/living/logout.dm

@@ -4,4 +4,4 @@
 		if(!key)	//key and mind have become seperated.
 			mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
 		if(!immune_to_ssd && sleeping < 2 && mind.active)
-			sleeping = 2
+			sleeping = 2	//This causes instant sleep, but does not prolong it. See life.dm for furthering SSD.

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -227,8 +227,10 @@
 /mob/living/simple_animal/emote(var/act)
 	if(act)
 		if(act == "scream")	act = "makes a loud and pained whimper" //ugly hack to stop animals screaming when crushed :P
+		if( findtext(act,".",lentext(act)) == 0 && findtext(act,"!",lentext(act)) == 0 && findtext(act,"?",lentext(act)) == 0 )
+			act = addtext(act,".") //Makes sure all emotes end with a period.
 		for (var/mob/O in viewers(src, null))
-			O.show_message("<B>[src]</B> [act].")
+			O.show_message("<B>[src]</B> [act]")
 
 
 /mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob)