Morb0 9888f8fa57 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs # Content.Client/Lobby/LobbyUIController.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Roles/Antags/nukeops.yml # Resources/Prototypes/Roles/Antags/revolutionary.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Antags/zombie.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Cargo/Cargo.xml # Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/ServerInfo/Guidebook/Controls/Controls.xml # Resources/ServerInfo/Guidebook/Controls/Radio.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Medical/Chemist.xml # Resources/ServerInfo/Guidebook/Medical/Medical.xml # Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Security/Security.xml # Resources/ServerInfo/Guidebook/Service/Bartender.xml # Resources/ServerInfo/Guidebook/Service/Chef.xml # Resources/ServerInfo/Guidebook/SpaceStation14.xml # Resources/ServerInfo/Guidebook/Survival.xml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2024-06-14 19:48:52 +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-14 19:48:52 +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