phil235 bd20c313b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor ...

Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm

2016-06-04 17:41:43 +02:00

..

detective_work.dm

- I made human/handle_blood() less shitty.

2016-06-04 17:33:16 +02:00

evidence.dm

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

footprints_and_rag.dm

- I made human/handle_blood() less shitty.

2016-06-04 17:33:16 +02:00

scanner.dm

Origin tech changes and some fixes

2016-05-17 20:57:01 +03:00