Morbo ea68e39611 Merge remote-tracking branch 'upstream/master' into upstream-sync2 ... # Conflicts: # Resources/Prototypes/Datasets/Names/syndicate.yml # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/RulesCorvax.txt # Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json # Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json		2023-04-19 02:54:06 +03:00
..
Actions	Screen load event for GameplayState (#14316)	2023-03-11 14:25:56 +11:00
Admin	Make the admin menu openable in the lobby (#15444)	2023-04-16 16:06:01 +10:00
Alerts	More DoAfter Changes (#14609)	2023-04-02 21:13:48 -04:00
Atmos/GasTank	Localize internals status (#12527)	2022-11-14 15:54:49 +01:00
Bwoink	Fix not showing ahelp relay label to players (#15327)	2023-04-12 10:19:09 +10: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-27 07:49:16 +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	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	Add EscapeContext keybind (#15301)	2023-04-13 18:10:44 -07: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	Remove hands component reference (#15197)	2023-04-07 11:21:12 -07: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	Remove inventory component references (#15249)	2023-04-12 10:20:47 +10:00
MenuBar	Stretch top bar for separated hud (#14873)	2023-03-27 19:51:40 -07: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	Revert "Moony z level hack (#15031)" (#15032)	2023-03-31 21:50:11 -05:00
Vote	Fix lobby votes (#15041)	2023-04-02 01:00:48 +11:00