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
..
bananiumhorn.rsi	Adds Bananium (#14663)	2023-04-29 15:38:09 +10:00
bikehorn.rsi
candy_bucket.rsi	Candy Bucket for Halloween (#21257)	2023-10-31 11:54:41 -04:00
caps.rsi
clownrecorder.rsi	Adds the clown recorder (Clown fix) (#15074)	2023-04-06 20:06:52 -06:00
cluwnehorn.rsi	Cluwne smite (#13367)	2023-03-06 11:09:24 -08:00
crayons.rsi	Crayon boxes get white crayons (#22553)	2023-12-15 19:20:39 -08:00
Darts	add content (#22518)	2023-12-15 02:55:57 -07:00
dice.rsi	Change range of 10-sided dice (#22833)	2023-12-21 19:53:17 -07:00
ducky.rsi
figurines.rsi	Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551)	2023-11-12 16:41:45 -07:00
glue.rsi	Add open/closed/fill states and sprites (#24600)	2024-02-04 12:13:47 -08:00
goldbikehorn.rsi	Golden honker glow (#24230)	2024-01-18 10:26:28 -05:00
immovable_rod.rsi
Instruments	Update Blood Red Phone Sprite (#23964)	2024-01-12 00:42:49 -07:00
mech_figurines.rsi	Collectible figurines! (#17993)	2023-07-16 01:07:47 -06:00
mrchips.rsi	Toy Box filled with toys (ready for merge) (#16252)	2023-06-03 13:31:47 +10:00
mrdips.rsi	Toy Box filled with toys (ready for merge) (#16252)	2023-06-03 13:31:47 +10:00
newton_cradle.rsi	Newton cradle (#22914)	2024-02-01 22:41:19 +11:00
pai.rsi	Potato battery update + potato AI (#21142)	2023-10-26 00:52:49 +11:00
pequeno.rsi	among pequeno (#11115)	2022-09-10 19:08:16 -05:00
rubber_hammer.rsi	Toy Box filled with toys (ready for merge) (#16252)	2023-06-03 13:31:47 +10:00
sharkplush.rsi	Make Shark Plush Janitor-Bucketable (#20123)	2023-09-14 00:17:44 -07:00
spraycans.rsi	Revert Paint (#26593)	2024-03-31 16:12:52 +11:00
Tabletop	refactor checkerboard (#18359)	2023-09-03 16:16:09 +10:00
toy_sword.rsi	Resprites energy sword and double energy sword (#22797)	2023-12-20 23:32:11 -07:00
toys.rsi	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-17 14:01:54 +03:00
whistle.rsi	Whistle for security (second try) (#23945)	2024-01-12 01:05:28 -07:00
whoopie.rsi	Toy Box filled with toys (ready for merge) (#16252)	2023-06-03 13:31:47 +10:00