Vigers Ray
8d8a908e8d
Ротация карт + мертики карт, эвентов и режимов.
2025-04-13 23:19:55 +03:00
VigersRay
0a91b468b4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Client/Voting/UI/VotePopup.xaml.cs
# Content.Client/Voting/VoteManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/BatterySystem.cs
# Content.Server/Radio/EntitySystems/RadioSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Voting/Managers/VoteManager.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Voting/MsgVoteData.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Recipes/Crafting/crates.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +03:00
SlamBamActionman
eeadc75b0a
Add Votekick functionality ( #32005 )
2024-09-26 18:32:13 +02:00
VigersRay
b90d87c1c5
Добавил все режимы в голосование, скрыл голоса игроков.
2024-07-25 01:17:34 +03:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Visne
b7dc3c81ae
Remove redundant #nullable enable ( #4275 )
2021-07-16 17:37:09 -07:00
Galactic Chimp
392b820796
Removed old Loc.GetString() use instances ( #4155 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-06-21 02:13:54 +02:00
Pieter-Jan Briers
cea87d6985
Voting ( #3185 )
...
* Basic voting
* Rewrite lobby in XAML.
Working lobby voting.
* Escape menu is now XAML.
* Vote menu works, custom votes, gamemode votes.
* Vote timeouts & administration.
Basically done now.
* I will now pretend I was never planning to code voting hotkeys.
* Make vote call UI a bit... funny.
* Fix exception on round restart.
* Fix some vote command definitions.
2021-02-17 01:07:17 +11:00