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

# Conflicts:
#	Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
#	Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
#	SpaceStation14.sln.DotSettings

2020-08-28 14:35:45 +02:00

..

Clothing

More Mobs | Space Carp, Monkey, Gorilla etc. (#1502)

2020-08-16 16:20:36 -07:00

Constructible

Merge branch 'master' into 2020-08-19-firelocks

2020-08-28 14:35:45 +02:00

Effects

Add a fire extinguisher (#1685)

2020-08-18 17:45:49 +02:00

Fluids

…

Interface

Handcuff system (#1831)

2020-08-25 14:54:23 +02:00

Mobs

Bodysystem and damagesystem rework (#1544)

2020-08-16 16:42:42 -07:00

Objects

Handcuff system (#1831)

2020-08-25 14:54:23 +02:00

Shaders

…

emergency_mask.png

…