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

Research Biohazard Lockdown #4067

Merged

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jul 31, 2023

About the pull request

Adds a unique lockdown system for research biohazards.

Explain why it's good for the game

Adds some nice flavour to research.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Added a new lockdown system to research.
add: Added an admin button to interact with above.
/:cl:

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels Jul 31, 2023
@frozentsbgg
Copy link
Contributor

frozentsbgg commented Aug 1, 2023

Pretty Dope.

Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

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

No star wars sounds

@morrowwolf morrowwolf marked this pull request as draft August 1, 2023 19:54
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 22, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@harryob harryob added this pull request to the merge queue Aug 24, 2023
Merged via the queue into cmss13-devs:master with commit fe1cd9a Aug 24, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants