VigersRay bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Mobs/Species.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml # Resources/migration.yml		2024-07-11 14:05:37 +03:00
..
SharedToolSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05: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-06-04 09:41:27 +03: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