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

# Conflicts:
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	vorestation.dme

2018-02-28 22:06:46 -05:00

..

Chemistry-Reagents

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

2018-02-28 22:06:46 -05:00

dispenser

Take two. New drinks (#4259)

2017-12-09 16:25:06 -06:00

reagent_containers

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

2018-02-28 22:06:46 -05: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

Makes More Machines Movable (#4801)

2018-02-12 14:01:14 -06:00

Chemistry-Metabolism.dm

…

Chemistry-Readme.dm

…

Chemistry-Reagents_vr.dm

Advanced NIF Repair Tool

2018-01-08 17:14:56 -05:00

Chemistry-Reagents-Helpers.dm

…

Chemistry-Reagents.dm

All my changes so far.

2018-02-02 04:57:01 -05:00

Chemistry-Recipes_vr.dm

more sanity checks and sensible syntax

2018-02-20 23:22:04 +00:00

Chemistry-Recipes.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

2018-02-17 00:35:29 -05:00

kelshark.dm

…

reagent_containers.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

reagent_dispenser.dm

Fixes High Cap water tanks, lets drones move tanks again.

2017-12-04 17:43:57 -06:00