Morb0 860f045b08 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Audio/Machines/attributions.yml # Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png # Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png # Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png # Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png # Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json # Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png # Resources/Textures/Objects/Misc/books.rsi/book0.png # Resources/Textures/Objects/Misc/books.rsi/book1.png # Resources/Textures/Objects/Misc/books.rsi/book2.png # Resources/Textures/Objects/Misc/books.rsi/book3.png # Resources/Textures/Objects/Misc/books.rsi/book4.png # Resources/Textures/Objects/Misc/books.rsi/book5.png # Resources/Textures/Objects/Misc/books.rsi/book6.png # Resources/Textures/Objects/Misc/books.rsi/book7.png # Resources/Textures/Objects/Misc/books.rsi/book8.png # Resources/Textures/Objects/Misc/books.rsi/book_bar.png # Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png # Resources/Textures/Objects/Misc/books.rsi/book_borg.png # Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png # Resources/Textures/Objects/Misc/books.rsi/book_cooking.png # Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png # Resources/Textures/Objects/Misc/books.rsi/book_detective.png # Resources/Textures/Objects/Misc/books.rsi/book_engineering.png # Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png # Resources/Textures/Objects/Misc/books.rsi/book_fish.png # Resources/Textures/Objects/Misc/books.rsi/book_hacking.png # Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png # Resources/Textures/Objects/Misc/books.rsi/book_infections.png # Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png # Resources/Textures/Objects/Misc/books.rsi/book_origami.png # Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png # Resources/Textures/Objects/Misc/books.rsi/book_space_law.png # Resources/Textures/Objects/Misc/books.rsi/meta.json		2024-04-02 11:32:48 +03:00
..
Actions	Fix crash on load when no slot key assigned (#26354)	2024-03-23 14:55:19 +11:00
Admin	Fix objects tab not showing nents (#23837)	2024-01-10 01:30:20 -07:00
Alerts	dynamic alert sprites (#25452)	2024-03-28 17:32:56 +11:00
Atmos/GasTank	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
Bwoink	Add option for admins to disable bwoink (#25008)	2024-02-20 23:52:03 -07:00
Character	Wrap objective briefing text (#24244)	2024-01-19 09:25:40 +11:00
Chat	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +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	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05: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	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
Guidebook	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
Hands	Virtual items cleanup (#23912)	2024-01-14 21:18:47 +11:00
Hotbar	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Info	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00
Inventory	Fix some text overflow bugs in HUD (#26615)	2024-03-31 20:07:13 -04:00
MenuBar	Corner Clothing UI (#22883)	2023-12-22 23:32:23 -07:00
Objectives/Controls	Wrap objective briefing text (#24244)	2024-01-19 09:25:40 +11:00
Sandbox	prevent opening debug menus without perms (#25091)	2024-02-10 19:00:52 +11:00
Storage	biggest gridinv update OF ALL TIME (#25834)	2024-03-28 17:31:47 +11:00
Viewport	Revert "Fix chat bubbles (#25643)" (#25645)	2024-02-28 00:51:20 +11:00
Vote	Fix lobby votes (#15041)	2023-04-02 01:00:48 +11:00
ProgressColorSystem.cs	Add a toggle for colorblind friendly progress bar colors (#25318)	2024-03-09 12:43:19 +01:00