Vigers Ray 0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/workflows/build-test-debug.yml # Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Nutrition/EntitySystems/HungerSystem.cs # Resources/Locale/en-US/_strings/atmos/gases.ftl # Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl # Resources/Locale/en-US/_strings/tools/components/tool-component.ftl # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/ai_factions.yml # Resources/toolshedEngineCommandPerms.yml		2024-12-21 18:51:37 +03:00
..
SharedToolSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-21 18:51:37 +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