Morb0 636bea81df Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Client/Entry/EntryPoint.cs # Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs # Content.Server/Zombies/ZombifyOnDeathSystem.cs # Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Datasets/Names/cargo_shuttle.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Command/captain.yml # Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-06-19 21:06:28 +03:00
..
Actions	Fix action bar not filling with mappables (#17218)	2023-06-15 13:21:52 -06: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	Set SpriteView sizes in various controls. (#15935)	2023-04-30 16:46:45 +10:00
Chat	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-06-19 21:06:28 +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	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
Guidebook	Make guidebook start with some entries collapsed (#16181)	2023-05-07 13:12:29 +10: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