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

Conflicts:
	code/modules/clothing/head/misc.dm
This commit is contained in:
Cheridan
2014-01-02 10:00:58 -06:00
24 changed files with 572 additions and 582 deletions
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/personal
desc = "It's a secure locker for personell. The first card swiped gains control."
desc = "It's a secure locker for personnel. The first card swiped gains control."
name = "personal closet"
req_access = list(access_all_personal_lockers)
var/registered_name = null