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
..
AbsorbentSystem.cs	upstream	2024-09-16 12:40:23 +03:00
DrainSystem.cs	Optimise drains (#32230)	2024-09-28 15:16:54 +10:00
PuddleDebugDebugOverlaySystem.cs	Code cleanup: puddles and spreaders (#26102)	2024-03-15 14:41:08 +11:00
PuddleSystem.cs	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
PuddleSystem.Evaporation.cs	Add prediction for puddle and spillable examines (#25794)	2024-03-03 16:36:36 +11:00
PuddleSystem.Spillable.cs	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
PuddleSystem.Transfers.cs	Revert 'Revert 'Solution Entities'' (#23168)	2023-12-29 08:47:43 -04:00
SmokeSystem.cs	Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem (#30084)	2024-09-02 13:26:04 +02:00
SpraySystem.cs	Added Firebots - Real (#32482)	2024-09-30 20:13:16 -07:00