Merge branch 'master' into punch-bundle

This commit is contained in:
kiwedespars
2020-04-19 16:50:01 -07:00
committed by GitHub
1014 changed files with 182479 additions and 42577 deletions
@@ -404,6 +404,12 @@
new /obj/item/gun/ballistic/revolver(src)
new /obj/item/ammo_box/a357(src)
/obj/item/storage/box/syndie_kit/pistol
/obj/item/storage/box/syndie_kit/pistol/PopulateContents()
new /obj/item/gun/ballistic/automatic/pistol(src)
new /obj/item/ammo_box/magazine/m10mm(src)
/obj/item/storage/box/syndie_kit/contract_kit
name = "contractor kit"
desc = "Supplied to Syndicate contractors in active mission areas."
@@ -494,7 +500,7 @@
new item1(src) // Create three, non repeat items from the list.
new item2(src)
new item3(src)
new /obj/item/paper/contractor_guide(src) //Paper guide
new /obj/item/paper/contractor_guide(src) //Paper guide
/obj/item/storage/box/syndie_kit/northstar
@@ -503,4 +509,4 @@
new /obj/item/clothing/accessory/padding(src)
new /obj/item/clothing/under/chameleon(src)
new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src)
new /obj/item/lighter(src)
new /obj/item/lighter(src)