PsiOmega 3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm

2015-08-15 10:52:17 +02:00

..

evidence.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

footprints_and_rag.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

forensics.dm

Added update_prints helper

2015-01-28 00:36:22 +03:00

scanner.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

scanning_console.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00