Merge branch 'master' into xantholne-berets02

This commit is contained in:
Unknown
2019-11-25 20:16:15 -07:00
521 changed files with 3130 additions and 1877 deletions
@@ -63,6 +63,7 @@
new /obj/item/door_remote/civillian(src)
new /obj/item/circuitboard/machine/techfab/department/service(src)
new /obj/item/storage/photo_album/HoP(src)
new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
new /obj/item/clothing/head/hopcap/beret/white(src)
/obj/structure/closet/secure_closet/hos
@@ -98,6 +99,7 @@
new /obj/item/pinpointer/nuke(src)
new /obj/item/circuitboard/machine/techfab/department/security(src)
new /obj/item/storage/photo_album/HoS(src)
new /obj/item/clothing/suit/hooded/wintercoat/hos(src)
/obj/structure/closet/secure_closet/warden
name = "\proper warden's locker"
req_access = list(ACCESS_ARMORY)