Víctor Aguilera Puerto d89188a742 Merge branch 'master' into 2020-08-19-firelocks ...

# Conflicts:
#	Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
#	Content.Shared/Maps/TurfHelpers.cs
#	SpaceStation14.sln.DotSettings

2020-09-06 00:17:48 +02:00

..

Atmos

Pump enabled animation (#1973)

2020-09-01 00:29:53 +02:00

Lighting

Rework emergency lights (#1830)

2020-08-22 12:06:29 +02:00

Linking/switch.rsi

Implement machine linking (#1784)

2020-08-29 12:33:42 +02:00

Misc

Fix lv426 barsign case sensitivity

2020-09-03 15:40:20 +02:00

Power

Adds the antimatter engine (#1905)

2020-08-29 13:05:44 +02:00

Structures

firelock stuff I guess

2020-08-21 18:29:43 +02:00

Tiles

…