phil235 6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff ...

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm

2015-09-19 22:34:30 +02:00

..

detective_work.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

evidence.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

footprints_and_rag.dm

removed extraneous hgibs() call in tanks.dm, turned spaces to tabs in affected files to make remie and everyone else happy

2015-09-11 13:03:33 -07:00

scanner.dm

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

2015-09-19 22:34:30 +02:00