Tigercat2000 58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ...

Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm

2016-08-10 14:16:42 -07:00

..

newchem

Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2016-08-10 14:16:42 -07:00

oldchem

Makes holy water stutters non-op

2016-08-05 00:38:31 +02:00

reagent_containers

Merge pull request #5154 from Fox-McCloud/more-reagent-stuff

2016-07-26 14:24:26 -04:00

Chemistry-Colours.dm

Fix advanced disease mixing (stupid fucking reagent code)

2016-03-30 10:55:22 -07:00

Chemistry-Holder.dm

More Reagent Cleanup

2016-07-22 05:49:45 -04:00

Chemistry-Machinery.dm

spans and \the

2016-07-22 19:07:23 -04:00

Chemistry-Readme.dm

More Reagent Cleanup

2016-07-22 05:49:45 -04:00

pandemic.dm

More Reagent Cleanup

2016-07-22 05:49:45 -04:00

reagent_containers.dm

spans and \the

2016-07-22 19:07:23 -04:00

reagent_dispenser.dm

oof

2016-07-22 19:16:24 -04:00