VigersRay b1cac7e781 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Chat/Managers/IChatManager.cs # Content.Client/IoC/ClientContentIoC.cs # Content.Server/Administration/Systems/BwoinkSystem.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.Player.cs # Resources/Audio/Machines/attributions.yml # Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl # Resources/Locale/en-US/_strings/discord/vote-notifications.ftl # Resources/Locale/en-US/_strings/npc/firebot.ftl # Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl # Resources/Locale/en-US/_strings/store/uplink-catalog.ftl # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Recipes/Crafting/bots.yml # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png		2024-10-02 06:45:10 +03:00
..
Managers	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
IVoteHandle.cs	Add Votekick functionality (#32005)	2024-09-26 18:32:13 +02:00
VoteCommands.cs	Add webhook for votekicks (#32513)	2024-09-29 15:23:53 +02:00
VoteFinishedEventArgs.cs	Relay custom votes to a webhook (#18561)	2023-12-14 20:03:32 -08:00
VoteFinishedEventHandler.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
VoteOptions.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-09-26 20:17:14 +03:00
VotingSystem.cs	Add Votekick functionality (#32005)	2024-09-26 18:32:13 +02:00