NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 11:21:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
CatStation/Content.Client/UserInterface/Systems
History
Morb0 33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
..
Actions ok final actions fixes fr this time (#21683) 2023-11-16 00:12:47 -05:00
Admin Fix admin verb PVS issue (#21406) 2023-11-05 02:58:26 +11:00
Alerts Remove custom tooltip timings (#19604) 2023-09-11 13:53:35 +10:00
Atmos/GasTank Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
Bwoink Add ahelp bwoink sound cvar (#22439) 2023-12-13 01:51:30 -07:00
Character Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
Chat Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-14 00:57:14 +03:00
CloseWindow Add EscapeContext keybind (#15301) 2023-04-13 18:10:44 -07:00
Crafting Fix construction button not working (#12033) 2022-10-22 10:51:03 +11:00
DamageOverlays Merge ActorSystem and IPlayerManager (#21314) 2023-11-11 13:08:10 +11:00
DecalPlacer Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07:00
EscapeMenu Added a toggle fullscreen button (default F11) (#20272) 2023-09-28 18:55:10 -05:00
Gameplay Removes IOnStateChanged calls from GameplayStateLoadController (#14617) 2023-03-12 21:02:14 -04:00
Ghost Roundstart antag role restrictions revival (#20108) 2023-09-20 17:54:53 +10:00
Guidebook Revert "Guidebook can POP OUT YAYYYY" (#20520) 2023-09-26 07:49:27 -07:00
Hands Even spaced hotbar (#22252) 2023-12-11 04:37:51 -07:00
Hotbar Even spaced hotbar (#22252) 2023-12-11 04:37:51 -07:00
Info Hud refactor (#7202) 2022-10-12 10:16:23 +02:00
Inventory Even spaced hotbar (#22252) 2023-12-11 04:37:51 -07:00
MenuBar Stretch top bar for separated hud (#14873) 2023-03-27 19:51:40 -07:00
Objectives/Controls reformatted syndicate objectives for readability (#17745) 2023-07-04 18:33:11 -06:00
Sandbox Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
Storage Miscellaneous inventory tweaks (#22371) 2023-12-12 00:49:37 -07:00
Viewport Remove SharedEye (but content) (#19481) 2023-09-11 16:15:23 +10:00
Vote Fix lobby votes (#15041) 2023-04-02 01:00:48 +11:00