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

[Fix] Antags Refactor Fix #14

Merged
merged 7 commits into from
Aug 24, 2024
Merged

[Fix] Antags Refactor Fix #14

merged 7 commits into from
Aug 24, 2024

Conversation

Remuchi
Copy link
Collaborator

@Remuchi Remuchi commented Aug 23, 2024

Описание PR

A bunch of fixes for recent antag refactor port from Wizden.


Изменения

🆑

  • fix: Thieves and Ninjas now properly spawn with their gear / Ниндзя и воры теперь корректно спавнятся со своим снаряжением.
  • fix Fixed MakeThief icon in admin verbs / Исправлена иконка MakeThief в педальной панели

Remuchi and others added 3 commits August 23, 2024 23:14
* Prevent SecretRule from picking invalid presets

* remove lonely semicolon

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
@riddleridou riddleridou changed the title [Fix] Antags Refactor fix [Fix] Antags Refactor Fix Aug 23, 2024
deltanedas and others added 4 commits August 24, 2024 08:55
* 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 <leonsfriedrich@gmail.com>
# Conflicts:
#	Content.Server/Antag/AntagSelectionSystem.API.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
Fix under selecting antags
@Remuchi Remuchi merged commit 69f3452 into master Aug 24, 2024
11 checks passed
@Remuchi Remuchi deleted the fix/antags-refactor-fix branch August 24, 2024 04:45
riddleridou added a commit that referenced this pull request Aug 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants