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

..

Commands

Escape pods (#14809)

2023-03-23 19:54:41 -06:00

Components

Fix thrusters, add new max velocity calculation (#19688)

2023-09-04 11:33:47 -08:00

Events

Give nukies the ability to declare war for a TC boost (#19291)

2023-08-29 23:56:20 -08:00

Systems

Merge remote-tracking branch 'upstream/master' into upstream-sync

2023-09-05 00:12:02 +03:00

DockingConfig.cs

Fix some docking configs (#17012)

2023-06-01 10:48:44 +10:00