NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-15 05:11:15 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Content.Client/Options/UI
History
Morbo 1b79af1fc2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Changelog/ChangelogManager.cs
#	Content.Client/Doors/AirlockVisualizer.cs
#	Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
..
Tabs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-04-23 16:02:09 +03:00
EscapeMenu.xaml Guidebook Revival (#13320) 2023-01-16 02:42:22 -06:00
EscapeMenu.xaml.cs Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07:00
OptionsMenu.xaml Guidebook Revival (#13320) 2023-01-16 02:42:22 -06:00
OptionsMenu.xaml.cs Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07:00