From 7bd1c025b6028c5e897cc2a5807f4e036f8d2ddf Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Sun, 17 Sep 2023 19:48:50 -0400 Subject: [PATCH] More testing --- code/__DEFINES/ARES.dm | 2 +- code/game/gamemodes/cm_initialize.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm index 6e9b62d022c0..d9f71ba88f0a 100644 --- a/code/__DEFINES/ARES.dm +++ b/code/__DEFINES/ARES.dm @@ -72,4 +72,4 @@ #define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS /// Time until someone can respawn as Working Joe -#define JOE_JOIN_DEAD_TIME = 10 MINUTES +#define JOE_JOIN_DEAD_TIME (10 MINUTES) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 46b1c66ba74f..8abe0182b25d 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -966,9 +966,10 @@ Additional game mode variables. return var/deathtime = world.time - joe_candidate.timeofdeath - if(istype(joe_candidate, /mob/new_player)) + if(isnewplayer(joe_candidate)) + message_admins("This triggered.") deathtime = JOE_JOIN_DEAD_TIME //so new players don't have to wait to latejoin as Working Joe in the round's first 10 mins. - if(deathtime < JOE_JOIN_DEAD_TIME && !check_client_rights(joe_candidate.client, R_ADMIN, FALSE) && !MODE_HAS_TOGGLEABLE_FLAG(MODE_BYPASS_JOE)) + if(deathtime < JOE_JOIN_DEAD_TIME && check_client_rights(joe_candidate.client, R_ADMIN, FALSE) && !MODE_HAS_TOGGLEABLE_FLAG(MODE_BYPASS_JOE)) to_chat(joe_candidate, SPAN_WARNING("You have been dead for [DisplayTimeText(deathtime)]. You need to wait [DisplayTimeText(JOE_JOIN_DEAD_TIME - deathtime)] before rejoining as a Working Joe!")) return FALSE