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
..
SharedToolSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
SharedToolSystem.MultipleTool.cs	Fix prying speed & log (#29210)	2024-06-21 00:19:22 +10:00
SharedToolSystem.Tile.cs	Fix prying speed & log (#29210)	2024-06-21 00:19:22 +10:00
SharedToolSystem.Welder.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
ToolOpenableSystem.cs	Secret stash refractor (#29396)	2024-08-09 09:51:58 +10:00
ToolRefinableSystem.cs	Welding tweaks (#27959)	2024-06-02 23:28:53 -04:00
WeldableAttemptEvent.cs	Weldable cleanup (#19809)	2023-09-05 00:07:01 +10:00
WeldableChangedEvent.cs	Weldable cleanup (#19809)	2023-09-05 00:07:01 +10:00
WeldableSystem.cs	add fuel costs back to finishing welding (#27030)	2024-04-19 19:20:30 -04:00
WeldFinishedEvent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00