Revert Revert Antag Refactor With Fixes #794
Merged
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
* fix: fix loadouts not spawning items inhands * Prevent SecretRule from picking invalid presets (#27456) * Prevent SecretRule from picking invalid presets * remove lonely semicolon --------- Co-authored-by: Nemanja <[email protected]> * fix: fix makethief adminverb icon * fix antag selection being evil (#28197) * fix antag selection being evil * fix test * untroll the other tests * remove role timer troll * Allow tests to modify antag preferences * Fix antag selection * Misc test fixes * Add AntagPreferenceTest * Fix lazy mistakes * Test cleanup * Try stop players in lobbies from being assigned mid-round antags * ranting * I am going insane --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: ElectroJr <[email protected]> # Conflicts: # Content.Server/Antag/AntagSelectionSystem.API.cs # Content.Server/Antag/AntagSelectionSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs * Fix under-selecting antags (#28327) Fix under selecting antags * fix: antag adminverbs now target actual target * fix: test --------- Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: deltanedas <[email protected]>
github-actions
bot
added
Changes: C#
DangerRevolution
approved these changes
Aug 25, 2024
DangerRevolution
requested review from
DEATHB4DEFEAT,
Peptide90,
Pspritechologist and
OldDanceJacket
OldDanceJacket
approved these changes
Sep 1, 2024
Peptide90
approved these changes
Sep 9, 2024
SimpleStation14
added a commit
that referenced
this pull request
Sep 9, 2024
This was referenced Sep 22, 2024
VMSolidus
added a commit
that referenced
this pull request
Sep 28, 2024
# Description #794 apparently silently deprecated the Backpack Preferences button. Selecting a backpack preference no longer actually does anything, and instead your backpack comes from your Loadout. This would have been fine if we were warned about this, but because nobody merged upstream for 2 weeks after the release of PR794, this issue went unreported. Well now the solution is going to require adding every backpack in the entire game to a new Backpacks tab. I've started this PR, but because it's really late and I have Calculus classes in the morning, I won't be able to finish it tonight. So I'm enlisting the help of a few other people I know to PR to this PR to help get the backpacks in. After we have backpacks in the loadout tab, and after Wizmerge, I'll probably do a separate PR to actually remove the now useless Backpack selection button. This is probably for the better long term. Since this technically means Backpack slots are no longer hardcoded to "Backpack/Duffelbag/Satchel", and now the back slot is freeeeee to be used for anything. <details><summary><h1>Media</h1></summary> <p>  </p> </details> # Changelog :cl: - add: Backpacks, Duffelbags, and Satchels have been added to loadouts. - remove: The button for "Backpack Preference" has been removed. Backpacks selection is now done via Loadouts. - remove: The button for "Suit/Skirt Preference" has also been removed. Suit selection is done via Loadouts.
VMSolidus
added a commit
that referenced
this pull request
Oct 1, 2024
# Description Rampant Brand Intelligence was apparently accidentally reverted by #794 , and I didn't realize it until the MobMimic Heisentest mysteriously returned. I apologize that it took me so long to realize that meant we were missing an entire event. This is all still shitcode, so at *some point* I'm still probably going to revisit this whenever I get around to it. # Changelog :cl: - fix: Rampant Brand Intelligence has been unreverted. It was reverted by complete accident a few weeks ago. I apologize to anyone who missed the thrill of killing murderous vending machines. --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: Remuchi <[email protected]>
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.
Description
Thank you to Remuchi from White Dream Project for this, I appreciate your help with this.
TODO
Changelog
🆑 @Remuchi