From 7601c29d89f76c5a8b09274f00d5adfbd3d3d2fd Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Fri, 26 Jul 2019 10:15:15 -0400 Subject: [PATCH] Timeclock Fixes Fixes time left output as well as for when the timeclock announces the wrong position when it was an alternate title, etc.: https://github.com/VOREStation/VOREStation/pull/5434 --- code/game/machinery/computer/timeclock_vr.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index c9e8d3ee26..6e10fdd1f2 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -170,6 +170,7 @@ foundjob.current_positions++ var/mob/living/carbon/human/H = usr H.mind.assigned_role = foundjob.title + H.mind.role_alt_title = newjob //TFF 26/7/19 - VOREStation fix port of announcement fix for wrong position announce.autosay("[card.registered_name] has moved On-Duty as [card.assignment].", "Employee Oversight") return @@ -200,6 +201,7 @@ callHook("reassign_employee", list(card)) var/mob/living/carbon/human/H = usr H.mind.assigned_role = ptojob.title + H.mind.role_alt_title = ptojob.title //TFF 26/7/19 - VOREStation fix port of announcement fix for wrong position foundjob.current_positions-- announce.autosay("[card.registered_name], [oldtitle], has moved Off-Duty.", "Employee Oversight") return @@ -208,7 +210,7 @@ if(!card) return FALSE if((world.time - card.last_job_switch) < 15 MINUTES) - to_chat(usr, "You need to wait at least 15 minutes after last duty switch. It has only been [world.time - card.last_job_switch] minutes since you have had your job changed.") + to_chat(usr, "You need to wait at least 15 minutes after last duty switch. It has only been [card.last_job_switch] minutes since you have had your job changed.") return FALSE return TRUE