NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-13 20:31:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/UserInterface
History
Morbo c58729755f Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
#	Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +03:00
..
Controls removes previous bruteforce method (#14548) 2023-03-09 10:33:13 -06:00
Fragments Exosuit: Ripley (#12668) 2022-12-10 11:05:39 -06:00
Screens Expand the viewport when the game window is resized instead of the chat window in the Separated HUD layout (#13694) 2023-03-10 00:56:43 +11:00
Systems Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-03-24 05:48:43 +03:00
XamlExtensions Hud refactor (#7202) 2022-10-12 10:16:23 +02:00
BoundKeyHelpers.cs Hud refactor (#7202) 2022-10-12 10:16:23 +02:00
ButtonHelpers.cs Add ButtonHelpers and the SetButtonDisabledRecursive helper. 2021-07-29 12:55:37 +02:00
StatsWindow.xaml Cargo economy balance (#11123) 2022-09-15 11:53:17 +10:00
StatsWindow.xaml.cs Cargo economy balance (#11123) 2022-09-15 11:53:17 +10:00
StatValuesEui.cs Cargo economy balance (#11123) 2022-09-15 11:53:17 +10:00