Morb0 da4af61aee Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs # Resources/Prototypes/GameRules/events.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json		2024-06-15 10:39:49 +03:00
..
Loadouts	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
Roles	Give jobs & antags prototypes a guide field (#28614)	2024-06-06 05:05:58 -07:00
CharacterPickerButton.xaml	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10:00
CharacterPickerButton.xaml.cs	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
CharacterSetupGui.xaml	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
CharacterSetupGui.xaml.cs	Return sponsor window to character setup	2024-05-23 15:44:14 +03: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	Fix upstream	2024-05-15 19:36:04 +03:00
HumanoidProfileEditor.xaml.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-15 10:39:49 +03:00
LobbyCharacterPreviewPanel.xaml	Loadouts redux (#25715)	2024-04-16 22:57:43 +10:00
LobbyCharacterPreviewPanel.xaml.cs	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10:00
LobbyGui.xaml	Make the lobby AHelp button red for admins when one is received (#20390)	2023-09-21 17:40:57 +10:00
LobbyGui.xaml.cs	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10: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