From 01a660298e7ce4a893cb7bc899348d2a421df26e Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 8 Feb 2017 12:17:36 -0500 Subject: [PATCH] CD edits --- code/modules/mob/living/status_procs.dm | 2 +- code/modules/mob/mob_helpers.dm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 7dc2d1b8d58..08eff7eada0 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -141,7 +141,7 @@ /mob/living/proc/StartResting(updating = 1) var/val_change = !resting resting = TRUE - rest_CD = world.time + 20//this is for tracking it for the verb + to_chat(src, "You are now resting.") if(updating && val_change) update_canmove() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index dc33990dcca..75f64c753e8 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -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)) + rest_CD = world.time + 20 StartResting() - else if(resting && !(rest_CD > world.time)) + else if(resting && (world.time > rest_CD)) + rest_CD = world.time + 20 StopResting() /proc/is_blind(A)