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
..
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +03:00
EscapeMenu.xaml	Guidebook Revival (#13320)	2023-01-16 02:42:22 -06:00
EscapeMenu.xaml.cs	Merge more UI refactor stuff (#11277)	2022-09-14 14:34:48 -07:00
OptionsMenu.xaml	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00
OptionsMenu.xaml.cs	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00