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
..
Aliens	upstream	2024-09-16 12:40:23 +03:00
Animals	upstream	2024-09-16 12:40:23 +03:00
Customization	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
Demons	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Effects	Fire sprite change for mice (#26758)	2024-04-06 00:41:23 -04:00
Elemental	crystals drop shards and ore crab tweaks. (#20930)	2023-12-16 15:20:14 -07:00
Ghosts	Use new validate-rsis for workflow (#12997)	2022-12-20 06:31:17 +01:00
Pets	Dev mouse acorgillation (#32040)	2024-09-15 02:21:33 +10:00
Silicon	Added Firebots - Real (#32482)	2024-09-30 20:13:16 -07:00
Species	upstream	2024-09-16 12:40:23 +03:00