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

..

Cleanable

clean up more non useful comments

2015-09-17 12:23:44 +12:00

cleanable.dm

Replaced refactored is_hot() to be an atom proc.

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

contraband.dm

Removes the shitty red faction poster and replaces it with two new posters.

2015-09-20 20:07:29 +02:00

crayon.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

decal.dm

…

misc.dm

…

remains.dm

…