Remie Richards 897e8c5b88 Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work ...

Conflicts:
	code/game/objects/items/weapons/storage/storage.dm

2016-09-02 18:04:18 +01:00

..

detective_work.dm

- I made human/handle_blood() less shitty.

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

evidence.dm

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

2016-09-02 18:04:18 +01: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