Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync

This commit is contained in:
deathride58
2018-07-05 00:17:44 -04:00
18 changed files with 99 additions and 25 deletions
@@ -20,6 +20,7 @@
new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/suit/captunic(src)
new /obj/item/clothing/under/rank/captain/femformal(src) //citadel edit
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/cartridge/captain(src)
new /obj/item/storage/box/silver_ids(src)