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

..

AccessLevels

Rename ID Card permission to HoP.

2020-05-31 21:24:15 +02:00

Atmospherics

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

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

Body

Bodysystem and damagesystem rework (#1544)

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

Catalog

Removes USA and Soviet vending machines (#1641)

2020-08-11 01:56:17 +02:00

Damage

Bodysystem and damagesystem rework (#1544)

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

Entities

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

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

Reagents

Adds atmos (#1389)

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

Recipes

Add the trash man (#1367)

2020-07-30 23:45:28 +02:00

Roles

Give maintenance access to jobs that didn't have it.

2020-08-23 14:58:28 +02:00

Shaders

Re-organizing the Resources folder. Part 1. (#1234)

2020-07-07 19:19:00 +02:00

SoundCollections

Fix squeaking sounds.

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

Tiles

Re-organizing the prototypes folder (#1384)

2020-07-20 12:26:16 +02:00

bar_signs.yml

Re-organizing the prototypes folder (#1384)

2020-07-20 12:26:16 +02:00

materials.yml

Lots of new inhands, adds phoron (#1220)

2020-06-25 13:51:58 +02:00

melee_weapon_animations.yml

Re-organizing the prototypes folder (#1384)

2020-07-20 12:26:16 +02:00

technologies.yml

Re-organizing the prototypes folder (#1384)

2020-07-20 12:26:16 +02:00