Morb0 b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png		2023-09-05 00:12:02 +03:00
..
Aliens	argocytes (#19801)	2023-09-03 22:02:00 -04:00
Animals	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-07-01 01:51:55 +03:00
Customization	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
Demons	Behonker and Clown Spider (ready for merge) (#16678)	2023-06-15 12:47:36 +10:00
Effects	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
Ghosts	Use new validate-rsis for workflow (#12997)	2022-12-20 06:31:17 +01:00
Pets	Hamlet error on revival fix. (#17797)	2023-07-03 17:59:29 +10:00
Silicon	[Resprite] Taxibot (#19783)	2023-09-03 10:31:24 -04:00
Species	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12:02 +03:00