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

Funny #1559

Merged
merged 8 commits into from
Apr 20, 2024
Merged

Funny #1559

merged 8 commits into from
Apr 20, 2024

Conversation

wraith-54321
Copy link
Collaborator

@wraith-54321 wraith-54321 commented Apr 2, 2024

About The Pull Request

honk
ports the changes to the timestop file from tgstation/tgstation#81136
also adds some debug logging to antag event rolling
also nerfs to baton attack cooldown, again

Why It's Good For The Game

funni

Changelog

🆑 MrMelbert
/:cl:

MrMelbert and others added 5 commits April 1, 2024 17:36
I made it so Wizarditis Timestop just freezes yourself but forgot
timestop makes you immune to timestop.

So now I added some vars to timestop both to fix this and also for
admins to mess around with.

:cl: Melbert
fix: Wizarditis Timestop now has the desired effect.
admin: Admins can now VV Timestop to make the caster not immune to their
own Timestop. If they really wanted.
/:cl:
This reverts commit 628ba0e.
This was referenced Apr 13, 2024
@dwasint dwasint merged commit 4403eff into Monkestation:master Apr 20, 2024
20 checks passed
@wraith-54321 wraith-54321 deleted the april-clowns branch April 26, 2024 04:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants