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

Conflicts:
	code/modules/admin/admin_verbs.dm

2014-10-05 13:48:11 +02:00

..

keycard authentication.dm

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

security levels.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00