Merge antag refactor #1204
Merged
Merge antag refactor #1204
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Mega Antag Refactor * last minute delta save * more workshopping * more shit * ok tested this for once * okkkkk sure * generic delays for starting rules * well darn * nukies partially * ouagh * ballin' faded and smonkin wed * obliterated the diff * Spread my arms and soak up congratulations * I've got plenty of love, but nothing to show for it * but there’s too much sunlight Shining on my laptop monitor, so I Can’t see anything with any amount of clarity * ok this junk * OOK! * fubar * most of sloth's review * oh boy * eek * hell yea! * ASDFJASDJFvsakcvjkzjnhhhyh
* fix antag bugs * Update NukeopsRuleComponent.cs
TOO MANY DAMN SYNDIES Co-authored-by: Plykiya <[email protected]>
Co-authored-by: Plykiya <[email protected]>
…get (#27584) Fix antag verb giving role to admin player instead of target
* Intercept rule (#10) * add * b * add this back lol * fix test fails (alert levels dont have prototypes) * tweaks
Update GameRuleSystem.cs
Update GameRuleSystem.cs
* scattershot antag fixes * this too? * dawg fuck this code * ok so we kinda need this?
github-actions
bot
added
Changes: YML
deltanedas
approved these changes
May 15, 2024
|
Pro MobMimic |
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
# Description Returned **some** old lobby music, what have been cutted by ([#24480](space-wizards/space-station-14#24480)). --- # Changelog :cl: - add: Return 'Monument' and 'Atomic Amnesia MMX' as a lobby music.
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
This brings me down to a single list of prs remaining I need to pull, and they aren't important enough to prevent a proper upstream sync
Untested, will check code though
Changelog
🆑 Space Station 14 contributors