Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # SpaceStation14.sln		2024-08-28 16:40:36 +03:00
..
Loadouts	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-08-28 16:40:36 +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
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 'refs/remotes/wizards/master' into upstream-sync	2024-08-02 11:29:44 +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	Make the lobby AHelp button red for admins when one is received (#20390)	2023-09-21 17:40:57 +10:00
LobbyGui.xaml.cs	Power stuff (#31314)	2024-08-25 22:18:42 +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