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

..

AccessLevels

…

Atmospherics

Adds tritium fire reaction and water vapor, fix gas reactions (#1623)

2020-08-08 19:16:24 +02:00

Body

Feature/1754 kill player on body parts missing (#2014)

2020-09-03 20:35:39 +02:00

Catalog

Boxes (and sterile mask) (#1964)

2020-09-03 23:13:45 +02:00

Damage

Tweaks damage types and classes (#1969)

2020-08-31 19:11:22 +02:00

Entities

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

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

Reagents

Adds atmos (#1389)

2020-08-02 20:08:20 +02:00

Recipes

Extinguisher cabinet (#1976)

2020-09-02 01:41:35 +02:00

Roles

Boxes (and sterile mask) (#1964)

2020-09-03 23:13:45 +02:00

Shaders

…

SoundCollections

Fix squeaking sounds.

2020-08-20 22:43:59 +02:00

Tiles

…

bar_signs.yml

Adds cyber sylph's

2020-08-23 14:48:20 -07:00

materials.yml

…

melee_weapon_animations.yml

…

technologies.yml

…