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.

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

Working Joes now Respawn (The PR respawned again) #6009

Merged
merged 9 commits into from
Mar 26, 2024

Conversation

Ben10083
Copy link
Contributor

@Ben10083 Ben10083 commented Mar 25, 2024

About the pull request

Redo of #4429 and #4795, done after someone requested I revive the revived PR.

15 minute respawns for Working Joes, they can still be revived and still have to follow other limits such as job limits and admin locks.

Explain why it's good for the game

Working Joes being able to respawn allows for a Joe player to still participate in the round as a Working Joe, even if they died as a Joe before. This should only really have an impact if the Joe died before hijack and will not be revived.

Changelog

🆑
add: Working Joes can now respawn as a Working Joe after 15 minutes, previous restriction on respawn removed.
admin: New flag to disable Working Joe respawns
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Mar 25, 2024
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a flag that can disable joes respawning.

@Drulikar Drulikar marked this pull request as draft March 25, 2024 02:50
@Ben10083 Ben10083 marked this pull request as ready for review March 25, 2024 03:08
@Ben10083 Ben10083 requested a review from Drulikar March 25, 2024 03:08
code/game/gamemodes/cm_initialize.dm Outdated Show resolved Hide resolved
code/modules/admin/tabs/admin_tab.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft March 25, 2024 21:51
@Ben10083 Ben10083 requested a review from Drulikar March 25, 2024 22:17
@Ben10083 Ben10083 marked this pull request as ready for review March 25, 2024 22:17
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can confirm working:
image

@Drulikar Drulikar added the Admin Make things harder for admins label Mar 26, 2024
@Drulikar Drulikar added this pull request to the merge queue Mar 26, 2024
@Drulikar Drulikar added Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. labels Mar 26, 2024
Merged via the queue into cmss13-devs:master with commit 0b5aa22 Mar 26, 2024
26 checks passed
cm13-github added a commit that referenced this pull request Mar 26, 2024
@Ben10083 Ben10083 deleted the Working_Joe_Respawns branch March 26, 2024 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Make things harder for admins Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants