skull132 9d2dfbd9c0 Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm

2018-05-29 22:49:41 +03:00

..

Chemistry-Reagents

Makes Cyanide More Fun (#4805)

2018-05-28 01:37:57 +02:00

dispenser

Bartender power creep (#4281)

2018-03-16 20:55:32 +01:00

reagent_containers

Merge branch 'master' into development

2018-05-29 22:49:41 +03:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

Chemistry-Logging.dm

…

Chemistry-Machinery.dm

The k'ois nerf to end all k'ois nerfs (#4304)

2018-03-03 00:34:48 +02:00

Chemistry-Metabolism.dm

Mental Medication Overhaul, Smoking, and Breathing Reagents (#4220)

2018-03-25 21:51:27 +03:00

Chemistry-Readme.dm

Mental Medication Overhaul, Smoking, and Breathing Reagents (#4220)

2018-03-25 21:51:27 +03:00

Chemistry-Reagents-Helpers.dm

…

Chemistry-Reagents.dm

Mental Medication Additions (#4648)

2018-05-13 17:39:56 +03:00

Chemistry-Recipes.dm

Fixes Various Food Bugs (#4769)

2018-05-20 18:18:17 +03:00

reagent_containers.dm

Ports some sounds from baystation (#4675)

2018-05-02 00:20:56 +03:00

reagent_dispenser.dm

Bugfix/runtime cleanup (#4249)

2018-02-08 11:59:11 +02:00