NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 02:41:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/UserInterface/Systems
History
Morb0 f062cbcec2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
#	LICENSE.TXT
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
#	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
#	Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
2024-01-02 23:07:58 +03:00
..
Actions Add UI click sounds (#22410) 2023-12-29 15:43:36 +11:00
Admin Add UI click sounds (#22410) 2023-12-29 15:43:36 +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 UI click sounds (#22410) 2023-12-29 15:43:36 +11:00
Character Add UI click sounds (#22410) 2023-12-29 15:43:36 +11:00
Chat Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-01-02 23:07:58 +03:00
CloseWindow Add EscapeContext keybind (#15301) 2023-04-13 18:10:44 -07:00
Crafting
DamageOverlays Merge ActorSystem and IPlayerManager (#21314) 2023-11-11 13:08:10 +11:00
DecalPlacer Use ECS prototype-reload events (#22613) 2023-12-23 01:13:45 +11:00
EscapeMenu Add UI click sounds (#22410) 2023-12-29 15:43:36 +11: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 Add UI click sounds (#22410) 2023-12-29 15:43:36 +11:00
Hands Even spaced hotbar (#22252) 2023-12-11 04:37:51 -07:00
Hotbar Corner Clothing UI (#22883) 2023-12-22 23:32:23 -07:00
Info
Inventory Add UI click sounds (#22410) 2023-12-29 15:43:36 +11:00
MenuBar Corner Clothing UI (#22883) 2023-12-22 23:32:23 -07:00
Objectives/Controls reformatted syndicate objectives for readability (#17745) 2023-07-04 18:33:11 -06:00
Sandbox Add UI click sounds (#22410) 2023-12-29 15:43:36 +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