This commit is contained in:
Aurorablade
2017-02-22 08:37:27 -05:00
parent c203a22276
commit dcc74e5f10
4 changed files with 9 additions and 5 deletions
@@ -19,6 +19,8 @@
if(dir & (EAST|WEST)) //Facing east or west
final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
lying_prev = lying //so we don't try to animate until there's been another change.
if(resize != RESIZE_DEFAULT_SIZE)
changed++
ntransform.Scale(resize)
+2 -2
View File
@@ -103,6 +103,7 @@
// Booleans
var/resting = FALSE
var/rest_CD = 0
/*
STATUS EFFECTS
@@ -141,14 +142,13 @@
var/val_change = !resting
resting = TRUE
to_chat(src, "<span class='notice'>You are now resting.</span>")
if(updating && val_change)
update_canmove()
/mob/living/proc/StopResting(updating = 1)
var/val_change = !!resting
resting = FALSE
to_chat(src, "<span class='notice'>You are now getting up.</span>")
if(updating && val_change)
update_canmove()
+1 -1
View File
@@ -93,7 +93,7 @@
update_action_buttons_icon()
if(!lying && lying_prev)
if(client)
client.move_delay = world.time + movement_delay()
client.move_delay = max(world.time + movement_delay(), world.time + 20)
lying_prev = lying
return canmove
+4 -2
View File
@@ -361,9 +361,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
set name = "Rest"
set category = "IC"
if(!resting)
if(!resting && (world.time > rest_CD))
to_chat(src, "<span class='notice'>You are now resting.</span>")
StartResting()
else if(resting)
else if(resting && (world.time > rest_CD))
to_chat(src, "<span class='notice'>You are now getting up.</span>")
StopResting()
/proc/is_blind(A)