Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Working Joe Respawns #4429

Closed
wants to merge 7 commits into from
Closed

Working Joe Respawns #4429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b93313e
First Pass
Ben10083 Sep 17, 2023
940e8c8
Second pass
Ben10083 Sep 17, 2023
7bd1c02
More testing
Ben10083 Sep 17, 2023
1037509
Remove unusable code
Ben10083 Sep 18, 2023
db6cd9a
oops
Ben10083 Sep 18, 2023
5b12467
Forest Changes
Ben10083 Sep 18, 2023
57cf0fb
Merge branch 'master' into Working_Joe_Respawns
Ben10083 Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/ARES.dm
View file
Open in desktop
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)
10 changes: 5 additions & 5 deletions code/game/gamemodes/cm_initialize.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,11 +957,6 @@ Additional game mode variables.
to_chat(joe_candidate, SPAN_WARNING("You are not whitelisted! You may apply on the forums to be whitelisted as a synth."))
return

if((joe_candidate.ckey in joes) && !MODE_HAS_TOGGLEABLE_FLAG(MODE_BYPASS_JOE))
if(show_warning)
to_chat(joe_candidate, SPAN_WARNING("You already were a Working Joe this round!"))
return

// council doesn't count towards this conditional.
if(joe_job.get_whitelist_status(RoleAuthority.roles_whitelist, joe_candidate.client) == WHITELIST_NORMAL)
var/joe_max = joe_job.total_positions
Expand All @@ -970,6 +965,11 @@ Additional game mode variables.
to_chat(joe_candidate, SPAN_WARNING("Only [joe_max] Working Joes may spawn per round."))
return

var/deathtime = world.time - joe_candidate.timeofdeath
if(deathtime < JOE_JOIN_DEAD_TIME && !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))
if(show_warning)
to_chat(joe_candidate, SPAN_WARNING("There is an administrative lock from entering the game."))
Expand Down