NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 02:41:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/Lobby/UI
History
Exact
Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Content.Server/VoiceMask/VoiceMaskerComponent.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Command/captain.yml
#	Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/blue_circuit.png
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +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 Disable resizing of lobby character editor (#32313) 2024-09-20 21:47:29 +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