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

This commit is contained in:
Erthilo
2012-05-13 23:50:27 +01:00
parent 2c08c02099
commit 9d5f0cce5c
4 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -252,7 +252,7 @@
if(!src.sleeping && !src.admin_observing) // would be exploited by stoxin'd people otherwise ;)
// (also make admins set-observing not sleep)
src.sleeping = 1
src.sleeping += 1
src.sleeping_willingly = 1
/mob/living/carbon/Login()
+2 -1
View File
@@ -995,7 +995,8 @@
if (prob(10) && health && !hal_crit)
spawn(0)
emote("snore")
sleeping--
if(!sleeping_willingly)
sleeping--
if(resting)
lying = 1