rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Options/UI
History
Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Content.Server/Mindshield/MindShieldSystem.cs
#	Content.Shared/Gravity/SharedGravitySystem.cs
#	Content.Shared/Implants/SharedSubdermalImplantSystem.cs
#	Resources/Locale/en-US/_strings/traits/traits.ftl
#	Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
#	Resources/Prototypes/Entities/Objects/Misc/implanters.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
..
Tabs Merge remote-tracking branch 'space-wizards/master' 2025-08-23 23:10:05 +03:00
EscapeMenu.xaml Merge remote-tracking branch 'space-wizards/master' 2025-08-10 01:49:23 +03:00
EscapeMenu.xaml.cs Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07:00
OptionColorSlider.xaml Add text highlighting (#31442) 2025-06-04 12:12:37 +02:00
OptionColorSlider.xaml.cs Add text highlighting (#31442) 2025-06-04 12:12:37 +02:00
OptionDropDown.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionDropDown.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionSlider.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionSlider.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionsMenu.xaml Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +03:00
OptionsMenu.xaml.cs Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +03:00
OptionsTabControlRow.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionsTabControlRow.xaml.cs Add text highlighting (#31442) 2025-06-04 12:12:37 +02:00