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

# Conflicts:
#	Content.Server/GameObjects/Components/AnchorableComponent.cs
#	Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
#	Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs
#	Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
#	Content.Server/GameObjects/Components/WiresComponent.cs
#	Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
#	Resources/Prototypes/Entities/Items/tools.yml

2020-05-23 12:02:34 +02:00

..

AccessLevels

…

BodySystem

Body System Part 1 POGGERS!!! (#855)

2020-05-13 21:48:49 +02:00

Cargo

Some YAML cleanup (#840)

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

Construction

Wood chairs, wood tables, bar stools, more sprites from Eris.

2020-04-23 00:15:38 +02:00

Entities

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

2020-05-23 12:02:34 +02:00

Jobs

Update sec officer armor.

2020-04-23 17:09:24 +02:00

Kitchen

spagetti

2020-05-22 16:21:20 -05:00

LatheRecipes

Fix lathe recipe texture references.

2020-05-02 16:09:46 +02:00

MeleeWeaponAnimations

…

Reactions

Chemistry revamp and bartending features

2020-04-08 15:53:15 +05:00

Reagents

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

2020-05-11 12:24:43 +02:00

Shaders

Some YAML cleanup (#840)

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

SoundCollections

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

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

Technologies

Some YAML cleanup (#840)

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

Tiles

Imports wooden flooring from Eris.

2020-04-22 17:49:42 +02:00

VendingMachines

…

BarSigns.yml

Bar sign is now unshaded when lit.

2020-04-24 21:55:39 +02:00

materials.yml

…