Skip to content

Commit

Permalink
Second pass
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben10083 committed Sep 17, 2023
1 parent b93313e commit 940e8c8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 3 additions & 0 deletions code/__DEFINES/ARES.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@
/// Cooldowns
#define COOLDOWN_ARES_SENSOR 60 SECONDS
#define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS

/// Time until someone can respawn as Working Joe
#define JOE_JOIN_DEAD_TIME = 10 MINUTES
6 changes: 3 additions & 3 deletions code/game/gamemodes/cm_initialize.dm
Original file line number Diff line number Diff line change
Expand Up @@ -967,9 +967,9 @@ Additional game mode variables.

var/deathtime = world.time - joe_candidate.timeofdeath
if(istype(joe_candidate, /mob/new_player))
deathtime = JOE_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_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_DEAD_TIME - deathtime)] before rejoining as a Working Joe!"))
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))
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

if(!enter_allowed && !MODE_HAS_TOGGLEABLE_FLAG(MODE_BYPASS_JOE))
Expand Down
4 changes: 0 additions & 4 deletions code/game/jobs/job/civilians/support/working_joe.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#define STANDARD_VARIANT "Working Joe"
#define HAZMAT_VARIANT "Hazmat Joe"

/// Time until someone can respawn as Working Joe

#define JOE_DEAD_TIME = 10 MINUTES

/datum/job/civilian/working_joe
title = JOB_WORKING_JOE
total_positions = 6
Expand Down

0 comments on commit 940e8c8

Please sign in to comment.