Repede b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

Chemistry-Reagents

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-06-02 18:33:44 -04:00

dispenser

…

reagent_containers

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-06-02 18:33:44 -04:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Fixed Chemistry-Holder.dm not being the same as upstream for strange reasons.

2018-02-25 16:04:58 -05:00

Chemistry-Logging.dm

…

Chemistry-Machinery_vr.dm

…

Chemistry-Machinery.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

Chemistry-Metabolism.dm

Ingested reagents act half as quickly, rather than half as well

2018-03-05 19:40:29 -06:00

Chemistry-Readme.dm

…

Chemistry-Reagents_vr.dm

…

Chemistry-Reagents-Helpers.dm

…

Chemistry-Reagents.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-03-23 20:25:18 -04:00

Chemistry-Recipes_vr.dm

Removed shadekin from Slime Vore reaction

2018-05-08 14:29:48 +10:00

Chemistry-Recipes.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-04-20 09:03:58 -04:00

kelshark.dm

Merge pull request #100 from ProbablyCarl/master

2018-04-08 21:47:16 -04:00

reagent_containers.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

reagent_dispenser.dm

Corrects some plane and layer issues

2018-05-20 18:41:21 -05:00