NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-14 04:41:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/UserInterface/Systems
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
..
Actions Screen load event for GameplayState (#14316) 2023-03-11 14:25:56 +11:00
Admin Context menu UI backend refactor & better UX (#13318) 2023-01-07 19:24:52 -08:00
Alerts Screen load event for GameplayState (#14316) 2023-03-11 14:25:56 +11:00
Atmos/GasTank Localize internals status (#12527) 2022-11-14 15:54:49 +01:00
Bwoink Fix AHelp window being recentered when opened through the verb (#14219) 2023-02-22 23:26:02 +11:00
Character Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Chat Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-03-24 05:48:43 +03:00
Crafting Fix construction button not working (#12033) 2022-10-22 10:51:03 +11:00
DamageOverlays Mobstate Refactor (#13389) 2023-01-13 16:57:10 -08:00
DecalPlacer Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07:00
EscapeMenu Moves guidebook UI logic to a UI Controller, some tweaks (#14601) 2023-03-22 23:41:43 -04:00
Gameplay Removes IOnStateChanged calls from GameplayStateLoadController (#14617) 2023-03-12 21:02:14 -04:00
Ghost Screen load event for GameplayState (#14316) 2023-03-11 14:25:56 +11:00
Guidebook Moves guidebook UI logic to a UI Controller, some tweaks (#14601) 2023-03-22 23:41:43 -04:00
Hands Add alt click to hands (#12330) 2022-11-04 12:36:45 +11:00
Hotbar Screen load event for GameplayState (#14316) 2023-03-11 14:25:56 +11:00
Info Hud refactor (#7202) 2022-10-12 10:16:23 +02:00
Inventory Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
MenuBar Moves guidebook UI logic to a UI Controller, some tweaks (#14601) 2023-03-22 23:41:43 -04:00
Objectives/Controls Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Sandbox Oldchat (#11913) 2022-10-17 17:13:41 -05:00
Viewport Screen load event for GameplayState (#14316) 2023-03-11 14:25:56 +11:00