More testing

cmss13-devs · Sep 17, 2023 · 7bd1c02 · 7bd1c02
1 parent 940e8c8
commit 7bd1c02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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