Merge pull request #1517 from Citadel-Station-13/upstream-merge-28113

[MIRROR] Adds F.R.A.M.E. cartridge
This commit is contained in:
LetterJay
2017-06-12 12:33:04 -05:00
committed by GitHub
10 changed files with 173 additions and 115 deletions
@@ -87,7 +87,7 @@
new /obj/item/device/doorCharge(src)
new /obj/item/device/camera_bug(src)
new /obj/item/device/sbeacondrop/powersink(src)
new /obj/item/weapon/cartridge/syndicate(src)
new /obj/item/weapon/cartridge/virus/syndicate(src)
new /obj/item/weapon/storage/toolbox/syndicate(src) //To actually get to those places
new /obj/item/pizzabox/bomb