diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm index 342f4af31b71..913a49fd075c 100644 --- a/code/datums/uplink_items/uplink_nuclear.dm +++ b/code/datums/uplink_items/uplink_nuclear.dm @@ -90,6 +90,14 @@ uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) surplus = 0 +/datum/uplink_item/dangerous/bulldog + name = "Bulldog Shotgun" + desc = "Lean and mean: Optimized for people that want to get up close and personal. Extra Ammo sold separately." + reference = "BULD" + item = /obj/item/gun/projectile/automatic/shotgun/bulldog + cost = 15 + uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) + //////////////////////////////////////// // MARK: SUPPORT AND MECHAS //////////////////////////////////////// @@ -223,18 +231,19 @@ /datum/uplink_item/ammo/bulldog_ammobag name = "Bulldog - 12g Ammo Duffel Bag" - desc = "A duffel bag filled with enough 12g ammo to supply an entire team, at a discounted price." + desc = "A duffel bag filled with nine 8 round drum magazines. (6 Slug, 2 Buckshot, 1 Dragon's Breath)" reference = "12ADB" item = /obj/item/storage/backpack/duffel/syndie/shotgun cost = 60 // normally 90 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/ammo/bulldog_XLmagsbag - name = "Bulldog - 12g XL Magazine Duffel Bag" - desc = "A duffel bag containing three 16 round drum magazines(Slug, Buckshot, Dragon's Breath)." + name = "Bulldog - 12g Extra-Large Magazine Duffel Bag" + desc = "A duffel bag containing five XL 16 round drum magazines. (3 Slug, 1 Buckshot, 1 Dragon's Breath)." reference = "12XLDB" item = /obj/item/storage/backpack/duffel/syndie/shotgunXLmags - cost = 60 // normally 90 + // same price for more ammo, but you're likely to lose more ammo if you drop your bulldog. High risk, high reward. + cost = 60 uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) /datum/uplink_item/ammo/smg @@ -613,15 +622,6 @@ // MARK: BUNDLES //////////////////////////////////////// -/datum/uplink_item/bundles_TC/bulldog - name = "Bulldog Bundle" - desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \ - Bulldog shotgun, two 12g buckshot drums, and a pair of Thermal imaging goggles." - reference = "BULB" - item = /obj/item/storage/backpack/duffel/syndie/bulldogbundle - cost = 45 // normally 60 - uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) - /datum/uplink_item/bundles_TC/c20r name = "C-20r Bundle" desc = "Old Faithful: The classic C-20r, bundled with three magazines and a (surplus) suppressor at discount price." diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 72019a5b20ca..812e1f4ca132 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -525,6 +525,8 @@ desc = "A large duffelbag, containing three types of extended drum magazines." /obj/item/storage/backpack/duffel/syndie/shotgunXLmags/populate_contents() + new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) + new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg/buckshot(src) new /obj/item/ammo_box/magazine/m12g/XtrLrg/dragon(src) @@ -564,15 +566,6 @@ new /obj/item/gun/projectile/automatic/c20r(src) new /obj/item/suppressor/specialoffer(src) -/obj/item/storage/backpack/duffel/syndie/bulldogbundle - desc = "A large duffel bag containing a Bulldog, some drums, and a pair of thermal imaging glasses." - -/obj/item/storage/backpack/duffel/syndie/bulldogbundle/populate_contents() - new /obj/item/gun/projectile/automatic/shotgun/bulldog(src) - new /obj/item/ammo_box/magazine/m12g(src) - new /obj/item/ammo_box/magazine/m12g(src) - new /obj/item/clothing/glasses/chameleon/thermal(src) - /obj/item/storage/backpack/duffel/syndie/med/medicalbundle desc = "A large duffel bag containing a tactical medkit, a medical beam gun and a pair of syndicate magboots."