PsiOmega 659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm

2015-07-26 10:00:12 +02:00

..

Chemistry-Reagents

Makes fire extinguishers effective at putting out mob fires

2015-06-21 00:43:15 -04:00

dispenser

…

reagent_containers

Merge pull request #10135 from Kelenius/ofBorgsAndShakers

2015-07-23 21:41:48 +03:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Moves metabolism to a holder subtype

2015-06-16 16:26:06 -04:00

Chemistry-Machinery.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-26 10:00:12 +02:00

Chemistry-Metabolism.dm

Moves metabolism to a holder subtype

2015-06-16 16:26:06 -04:00

Chemistry-Readme.dm

Adjusts usages of reagent transfer procs

2015-06-10 00:03:08 -04:00

Chemistry-Reagents.dm

Merge pull request #9774 from mwerezak/chem-touch

2015-06-17 10:05:11 +01:00

Chemistry-Recipes.dm

Fixes #10145

2015-07-13 11:01:32 +03:00

reagent_containers.dm

Adjusts usages of reagent transfer procs

2015-06-10 00:03:08 -04:00

reagent_dispenser.dm

Updates fire_act() implementations to work better with lower temperature fires

2015-06-26 00:40:55 -04:00