Merge pull request #1050 from Erthilo/TGUpdates

Fix for brig timer spacing. Minor grammar fixes. Fix for logged out people not staying asleep.

code/game/machinery/doors/brigdoors.dm

@@ -141,7 +141,7 @@
 			dat += "<a href='?src=\ref[src];timing=1'>Activate Timer and close door</a><br/>"
 
 		dat += "Time Left: [(minute ? text("[minute]:") : null)][second] <br/>"
-		dat += "<a href='?src=\ref[src];tp=-600'>-</a> <a href='?src=\ref[src];tp=-60'>-</a> <a href='?src=\ref[src];tp=-1'>-</a> <a href='?src=\ref[src];tp=1'>+</a> <A href='?src=\ref[src];tp=60'>+</a><br/> <A href='?src=\ref[src];tp=600'>+</a><br/>"
+		dat += "<a href='?src=\ref[src];tp=-600'>-</a> <a href='?src=\ref[src];tp=-60'>-</a> <a href='?src=\ref[src];tp=-1'>-</a> <a href='?src=\ref[src];tp=1'>+</a> <A href='?src=\ref[src];tp=60'>+</a> <A href='?src=\ref[src];tp=600'>+</a><br/>"
 
 		for(var/obj/machinery/flasher/F in targets)
 			if(F.last_flash && (F.last_flash + 150) > world.time)

code/modules/admin/verbs/debug.dm

@@ -897,7 +897,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	M.update_clothing()
 
 	log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].")
-	message_admins("\blue [key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..", 1)
+	message_admins("\blue [key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode].", 1)
 	return
 
 /client/proc/startSinglo()

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

@@ -995,7 +995,8 @@
 						if (prob(10) && health && !hal_crit)
 							spawn(0)
 								emote("snore")
-						sleeping--
+						if(!sleeping_willingly)
+							sleeping--
 
 					if(resting)
 						lying = 1