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

..

light.dm

Fixes Conflicts, Also Structural Code Stuff

2015-08-08 20:16:53 -05:00

tile_mineral.dm

Materials - final solution

2015-09-22 00:18:37 +03:00

tile_types.dm

Replaced refactored is_hot() to be an atom proc.

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