Morb0 6c09b978a3 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Telephone/TelephoneSystem.cs # LICENSE.TXT # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Guidebook/rules.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/ServerInfo/Guidebook/Chemicals.xml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json		2025-01-12 19:59:31 +03:00
..
Loadouts	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-12-26 00:30:02 +03:00
Roles	Give jobs & antags prototypes a guide field (#28614)	2024-06-06 05:05:58 -07:00
CharacterPickerButton.xaml	Give silicons proper lobby/character editor previews (#33763)	2024-12-08 02:46:41 +01:00
CharacterPickerButton.xaml.cs	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
CharacterSetupGui.xaml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-11-19 19:20:31 +03:00
CharacterSetupGui.xaml.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-11-19 19:20:31 +03:00
CharacterSetupGuiSavePanel.xaml	Character menu asks if you want to save your character on exit (#29875)	2024-07-11 10:24:37 +10:00
CharacterSetupGuiSavePanel.xaml.cs	Character menu asks if you want to save your character on exit (#29875)	2024-07-11 10:24:37 +10:00
HighlightedContainer.xaml	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10:00
HighlightedContainer.xaml.cs	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10:00
HumanoidProfileEditor.xaml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-12-26 00:30:02 +03:00
HumanoidProfileEditor.xaml.cs	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-08-28 16:40:36 +03:00
LobbyCharacterPreviewPanel.xaml	Loadouts redux (#25715)	2024-04-16 22:57:43 +10:00
LobbyCharacterPreviewPanel.xaml.cs	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
LobbyGui.xaml	Lobby chat width and custom lobby titles (#33783)	2025-01-05 21:56:01 +01:00
LobbyGui.xaml.cs	Add admin remarks button to lobby (#31761)	2024-11-15 23:09:29 -06:00
ObserveWarningWindow.xaml	Fix late join & observe to de-admin admins. (#28319)	2024-05-28 14:00:42 -04:00
ObserveWarningWindow.xaml.cs	Fix late join & observe to de-admin admins. (#28319)	2024-05-28 14:00:42 -04:00