zumorica d2d6c2cecd Merge branch 'master' into 2020-04-28-tool-component ...

# Conflicts:
#	SpaceStation14.sln.DotSettings

2020-05-22 11:31:18 +02:00

..

Buildings

Merge branch 'master' into 2020-04-28-tool-component

2020-05-22 11:31:18 +02:00

Effects

Some YAML cleanup (#840)

2020-04-22 17:50:55 +02:00

Fluids

Add puddles / reagent spills (#743)

2020-04-21 20:23:12 +02:00

Items

Merge branch 'master' into 2020-04-28-tool-component

2020-05-22 11:31:18 +02:00

Markers

Some YAML cleanup (#840)

2020-04-22 17:50:55 +02:00

Mobs

Merge pull request #911 from Zumorica/2020-05-13-stuns

2020-05-21 19:48:19 +02:00

Weapons

Clean up entity prototypes so that they don't define components twice (#866)

2020-05-02 23:19:20 +02:00

chemistry.yml

Some YAML cleanup (#840)

2020-04-22 17:50:55 +02:00

janitor.yml

Clean up entity prototypes so that they don't define components twice (#866)

2020-05-02 23:19:20 +02:00

kitchen.yml

Microwave interface.

2020-05-01 23:34:04 -05:00

potted_plants.yml

Rename newly added YAML files to respect naming guidelines (#845)

2020-04-24 15:01:30 +02:00

research.yml

Some YAML cleanup (#840)

2020-04-22 17:50:55 +02:00

water_tank.yml

Fix water tank texture casing.

2020-05-21 23:20:06 +02:00