xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not ...

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-09-24 03:14:04 +01:00

..

Chemistry-Reagents

Conflicts 2/3

2015-09-22 16:37:00 -04:00

Chemistry-Recipes

Merge pull request #11709 from bgobandit/fuckyouslimesfuckfuckfuck

2015-09-13 21:59:08 +10:00

reagent_containers

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

Chemistry-Colours.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

Chemistry-Holder.dm

Merge pull request #11603 from Fox-McCloud/stimulantsfix

2015-09-13 17:32:19 +02:00

Chemistry-Machinery.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

Chemistry-Readme.dm

Readds blob smoke reagent effect.

2015-08-15 20:56:56 +02:00

Chemistry-Reagents.dm

Remove comment and bandaid fix

2015-09-17 15:12:00 +12:00

Chemistry-Recipes.dm

Cleans up gold slime moblist code.

2015-08-30 21:45:31 -07:00

reagent_containers.dm

Adds a qdel check for when the beaker spills their reagents on the turf where the beaker itself is present.

2015-09-19 11:21:06 -03:00

reagent_dispenser.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00