skull132 41b616baca Merge branch 'master' into development ...

# Conflicts:
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	html/changelogs/.all_changelog.yml

2017-01-07 13:55:12 +02:00

..

Chemistry-Reagents

Miscellaneous bugfixes (#1385)

2017-01-04 03:14:07 +02:00

dispenser

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

reagent_containers

Vaurca Update Dec2016 (#1289)

2016-12-25 01:11:09 +02:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Fixes #1216, #1359 (#1366)

2017-01-02 00:44:19 +02:00

Chemistry-Logging.dm

…

Chemistry-Machinery.dm

Temperature tweaks (#1277)

2016-12-24 18:37:27 +02:00

Chemistry-Metabolism.dm

Diona Overhaul - SEP2016 (#442)

2016-09-09 23:55:48 +03:00

Chemistry-Readme.dm

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

Chemistry-Reagents.dm

Final merge

2016-11-12 00:10:21 +02:00

Chemistry-Recipes.dm

Merge branch 'master' into development

2017-01-07 13:55:12 +02:00

reagent_containers.dm

Baymerge fixes (#12)

2016-11-19 11:56:49 +02:00

reagent_dispenser.dm

Air alarm cleanup + Object Descriptions (#1354)

2016-12-31 04:19:02 +02:00