Merge branch 'master' into development

This commit is contained in:
skull132
2018-08-11 21:41:05 +03:00
43 changed files with 3026 additions and 4592 deletions
@@ -256,7 +256,7 @@
/datum/gear/suit/secjacketwarden
display_name = "navy security jacket (Warden)"
path = /obj/item/clothing/suit/security/navyofficer
path = /obj/item/clothing/suit/security/navywarden
allowed_roles = list("Head of Security", "Warden")
/datum/gear/suit/secjackethos