From 372d5a8ac9e7805ef03b29391e7336a3e7418422 Mon Sep 17 00:00:00 2001 From: lbnesquik Date: Tue, 14 Apr 2020 02:50:20 +0200 Subject: [PATCH 1/3] Reduce job switch time from 15 to 10 minutes. Given the poor performance and frequent bouts of lag on the server, it is pretty common for more than 15 minutes to pass IRL before they do in game. This is a shoddy patch to help this being less annoying. --- code/game/machinery/computer/timeclock_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index cce66feba46..371d4978872 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -208,8 +208,8 @@ /obj/machinery/computer/timeclock/proc/checkCardCooldown() 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.") + if((world.time - card.last_job_switch) < 10 MINUTES) + to_chat(usr, "You need to wait at least 10 minutes after last duty switch.") return FALSE return TRUE From e35868832b84cb1b2581818dde74c3401c9a4019 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 19 Apr 2020 23:17:09 -0400 Subject: [PATCH 2/3] Update code/game/machinery/computer/timeclock_vr.dm --- code/game/machinery/computer/timeclock_vr.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 371d4978872..16a3c893bf6 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -208,8 +208,9 @@ /obj/machinery/computer/timeclock/proc/checkCardCooldown() if(!card) return FALSE - if((world.time - card.last_job_switch) < 10 MINUTES) - to_chat(usr, "You need to wait at least 10 minutes after last duty switch.") + var/time_left = 10 MINUTES - (world.time - card.last_job_switch) + if((time_left > 0) + to_chat(usr, "You need to wait another [round((time_left/10)/60, 1)] minute\s before you can switch.") return FALSE return TRUE @@ -269,4 +270,4 @@ /obj/machinery/computer/timeclock/premade/west dir = 4 - pixel_x = -26 \ No newline at end of file + pixel_x = -26 From 5d01b70234a3297668ba2fd9081b406c676de88a Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 27 Apr 2020 10:21:14 -0400 Subject: [PATCH 3/3] Fix missing parens --- code/game/machinery/computer/timeclock_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index 16a3c893bf6..561216979e4 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -209,7 +209,7 @@ if(!card) return FALSE var/time_left = 10 MINUTES - (world.time - card.last_job_switch) - if((time_left > 0) + if(time_left > 0) to_chat(usr, "You need to wait another [round((time_left/10)/60, 1)] minute\s before you can switch.") return FALSE return TRUE