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

..

Clothing

Adds inhands and removes vir and genetics satchels. (#2003)

2020-09-03 23:17:32 +02:00

Constructible

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

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

Effects

Adds random spawners for toys (#1979)

2020-09-02 01:18:18 +02:00

Mobs

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

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

Objects

Boxes (and sterile mask) (#1964)

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

chemistry.yml

Adds Spray Bottles (#1522)

2020-08-08 14:33:36 +02:00

item_base.yml

Wall slams - Damage on high velocity impact. (#1600)

2020-08-07 16:22:32 +02:00

puddle.yml

Fix slippery items not being slippery (#1948)

2020-08-29 13:13:22 +02:00

radiation.yml

Station events (#1518)

2020-08-13 22:52:17 +02:00

stress_test.yml

Re-organizing the prototypes folder (#1384)

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