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
@@ -34,6 +34,7 @@
new /obj/item/storage/photo_album/CE(src)
new /obj/item/storage/lockbox/medal/engineering(src)
new /obj/item/construction/rcd/loaded/upgraded(src)
new /obj/item/clothing/suit/hooded/wintercoat/ce(src)
new /obj/item/clothing/head/beret/ce/white(src)
/obj/structure/closet/secure_closet/engineering_electrical