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
..
acidifier.rsi	Acidifier Effect Sprite (#22425)	2023-12-14 20:56:42 -05:00
arcs.rsi	Polish melee effects (#11653)	2022-11-08 14:28:49 -06:00
atmospherics.rsi	Make the atmospherics meta not bad (#23737)	2024-01-09 13:18:30 +03:00
chempuff.rsi	Swept commits JSON genocide. (#2991)	2021-01-13 23:04:38 +11:00
chemsmoke.rsi	Add Smoke and Foam chemical reaction effects. (#2913)	2021-02-03 15:26:46 +01:00
clicktest.rsi	Fix a bunch of invalid rsi files (#13104)	2022-12-20 09:36:59 +01:00
crayondecals.rsi	Add capitalism (#6617)	2022-03-03 21:11:35 +11:00
creampie.rsi	Arachnid RE-REWORK (#19138)	2023-09-04 13:02:54 -07:00
electricity.rsi	diagonal window glass and pirate shuttle improvements (#21174)	2023-11-05 19:38:02 -07:00
emp.rsi	Add emp grenade (#14393)	2023-03-06 11:05:12 -08:00
explosion.rsi	Fix a bunch of invalid rsi files (#13104)	2022-12-20 09:36:59 +01:00
extinguisherSpray.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
fire.rsi	Cleaned up all produce meta.jsons (#3943)	2021-05-08 09:09:35 +00:00
fire_greyscale.rsi	Explosion refactor (#5230)	2022-03-31 21:39:26 -05:00
foam.rsi	New foam sprites (edge sprites) (#21308)	2023-10-29 10:13:41 -04:00
hearts.rsi	Animals make hearts when you pet them (#20859)	2023-10-13 09:34:18 -08:00
LightMasks	nuke lights code change (#19315)	2023-09-04 17:14:10 +03:00
lightning.rsi	Beam Component and Lightning Component (#10196)	2022-09-16 01:49:01 +10:00
mobspawn.rsi	Rock Anom effects (#23633)	2024-01-06 23:44:04 -07:00
optionsvisualizertest.rsi	Add new "OptionsVisualizer" (#25128)	2024-02-17 15:52:11 -05:00
portal.rsi	More artifact content (#22574)	2023-12-31 21:19:03 -05:00
rcd.rsi	Improved RCDs (#22799)	2024-03-30 23:29:47 -05:00
rockspawn.rsi	Rock Anom effects (#23633)	2024-01-06 23:44:04 -07:00
sparks.rsi	ninja 2 electric boogaloo (#15534)	2023-09-10 16:20:27 +10:00
speech.rsi	Add idle state to vox typing indicator	2024-02-17 12:44:41 +03:00
spookysmoke.rsi	Shadow anomaly respects "reduced motion" (#25355)	2024-02-17 22:26:19 -05:00
ssd.rsi	SSD Indicator (#19701)	2023-09-11 15:52:56 +10:00
text.rsi	Add cyrillic support for brig timers (#1706)	2024-01-15 01:32:02 +03:00
weather.rsi	Weather effects (#12528)	2023-01-17 20:26:52 +11:00