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
..
BloodstreamSystem.cs	Fix cauterization spam from space damage (#32080)	2024-09-11 18:05:54 +02:00
BodySystem.cs	Move OnGhostAttempt to GhostSystem (#31445)	2024-08-26 14:15:33 +02:00
BrainSystem.cs	Body code cleanup (#24946)	2024-03-27 17:48:37 -07:00
InternalsSystem.cs	Replace IClickAlert with events (#30728)	2024-08-07 15:15:35 +10:00
LungSystem.cs	Fix RA0032 (#32514)	2024-09-29 02:25:21 +02:00
MetabolizerSystem.cs	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
RespiratorSystem.cs	upstream	2024-09-16 12:40:23 +03:00
StomachSystem.cs	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
ThermalRegulatorSystem.cs	Body code cleanup (#24946)	2024-03-27 17:48:37 -07:00