diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index c78d99e3db6..742934ef4c2 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -141,7 +141,7 @@ dat += "Activate Timer and close door
" dat += "Time Left: [(minute ? text("[minute]:") : null)][second]
" - dat += "- - - + +
+
" + dat += "- - - + + +
" for(var/obj/machinery/flasher/F in targets) if(F.last_flash && (F.last_flash + 150) > world.time) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 388729b9b1b..8c0bf186172 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/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() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 7dfe4cb5901..4b5eb200b59 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -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() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 9e2070097b8..d68b0c714d5 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/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