diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index d49e36b3f3a..7af5577e576 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/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)
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index d80f27c729d..7df9fa4325f 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/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
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 3091517fbce..f838fa3d2fe 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/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)