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

# Conflicts:
#	SpaceStation14.sln.DotSettings

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

..

AccessLevels

Move access levels to prototypes.

2020-01-19 18:30:09 +01:00

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-22 11:31:18 +02:00

Jobs

Update sec officer armor.

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

Kitchen

moar recipes

2020-05-10 00:38:41 -05:00

LatheRecipes

Fix lathe recipe texture references.

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

MeleeWeaponAnimations

Shitty combat mode & animations. (#367)

2019-09-26 22:32:32 +02:00

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

Fill vending machines (#648)

2020-02-13 17:58:19 +01:00

BarSigns.yml

Bar sign is now unshaded when lit.

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

materials.yml

Added a bunch more textures (#356)

2019-09-24 22:15:26 +02:00