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 84c607c84a Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Resources/Locale/en-US/_strings/administration/antag.ftl
#	Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl
#	Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl
#	Resources/Locale/en-US/_strings/power/commands.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
#	Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
#	Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
2025-03-27 20:37:49 +03:00
..
Tabs Merge remote-tracking branch 'space-wizards/master' 2025-03-27 20:37:49 +03:00
EscapeMenu.xaml Провиль и привязка через лобби. 2024-10-11 23:44:48 +03:00
EscapeMenu.xaml.cs Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07: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 Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00