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
..
base_objectives.yml	make objectives use entityCategory (#28269)	2024-06-03 09:23:52 -04:00
changeling.yml	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
dragon.yml	Character menu issuer localization (#29840)	2024-07-17 08:47:50 +03:00
ninja.yml	Character menu issuer localization (#29840)	2024-07-17 08:47:50 +03:00
objectiveGroups.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
stealTargetGroups.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
terminator.yml	фиксы	2024-09-19 16:57:23 +03:00
thief.yml	Changing the thief's objective to stealing ID cards. (#32411)	2024-10-01 00:40:31 +02:00
traitor.yml	Генератор Супер материи (#399)	2024-09-26 20:09:27 +03:00