diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index aeede447e0f9..dc630e4cb2a9 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -739,6 +739,24 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted contains = list(/obj/item/ammo_box/magazine/lever_action/training) containertype = /obj/structure/largecrate/black_market +/datum/supply_packs/contraband/ammo/uppshot + name = "shotgun shell box crate (Type 23, x100 8g slug shells)" + dollar_cost = 115 + contains = list(/obj/item/ammo_box/magazine/shotgun/upp) + containertype = /obj/structure/largecrate/black_market + +/datum/supply_packs/contraband/ammo/uppshot/buck + name = "shotgun shell box crate (Type 23, x100 8g buckshot shells)" + dollar_cost = 115 + contains = list(/obj/item/ammo_box/magazine/shotgun/upp/buckshot) + containertype = /obj/structure/largecrate/black_market + +/datum/supply_packs/contraband/ammo/uppshot/flech + name = "shotgun shell box crate (Type 23, x100 8g flechette shells)" + dollar_cost = 115 + contains = list(/obj/item/ammo_box/magazine/shotgun/upp/flechette) + containertype = /obj/structure/largecrate/black_market + /datum/supply_packs/contraband/ammo/m16 name = "Magazine box (M16, 12x regular mags)" dollar_cost = 100 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index b2a23549c65f..2c857881f2d7 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -358,6 +358,12 @@ GLOBAL_LIST_INIT_TYPED(cardboard_recipes, /datum/stack_recipe, list ( \ null, \ new/datum/stack_recipe("empty magazine box (S&W .38)", /obj/item/ammo_box/magazine/snw/empty), \ null, \ + new/datum/stack_recipe("empty Type 23 shotgun shell box (8g Beanbag)", /obj/item/ammo_box/magazine/shotgun/upp/beanbag/empty), \ + new/datum/stack_recipe("empty Type 23 shotgun shell box (8g Buckshot)", /obj/item/ammo_box/magazine/shotgun/upp/buckshot/empty), \ + new/datum/stack_recipe("empty Type 23 shotgun shell box (8g Flechette)", /obj/item/ammo_box/magazine/shotgun/upp/flechette/empty), \ + new/datum/stack_recipe("empty Type 23 shotgun shell box (8g Incendiary)", /obj/item/ammo_box/magazine/shotgun/upp/incendiary/empty), \ + new/datum/stack_recipe("empty Type 23 shotgun shell box (8g Slugs)", /obj/item/ammo_box/magazine/shotgun/upp/empty), \ + null, \ new/datum/stack_recipe("empty magazine box (NSG 23)", /obj/item/ammo_box/magazine/nsg23/empty), \ new/datum/stack_recipe("empty magazine box (NSG 23 AP)", /obj/item/ammo_box/magazine/nsg23/ap/empty), \ new/datum/stack_recipe("empty magazine box (NSG 23 EX)", /obj/item/ammo_box/magazine/nsg23/ex/empty), \ diff --git a/code/modules/projectiles/ammo_boxes/handful_boxes.dm b/code/modules/projectiles/ammo_boxes/handful_boxes.dm index 3e9300c8b5c2..b73909e4008a 100644 --- a/code/modules/projectiles/ammo_boxes/handful_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/handful_boxes.dm @@ -67,6 +67,54 @@ /obj/item/ammo_box/magazine/shotgun/beanbag/empty empty = TRUE +//-----------------------TYPE 23 SHELL BOXES----------------------- + +/obj/item/ammo_box/magazine/shotgun/upp + name = "\improper Type 23 shotgun shell box (Slugs 8g x 100)" + icon_state = "base_slug_upp" + overlay_gun_type = "_type23" + overlay_content = "_upp_slug" + magazine_type = /obj/item/ammo_magazine/handful/shotgun/heavy/slug + +/obj/item/ammo_box/magazine/shotgun/upp/empty + empty = TRUE + +/obj/item/ammo_box/magazine/shotgun/upp/buckshot + name = "\improper Type 23 shotgun shell box (Buckshot 8g x 100)" + icon_state = "base_buck_upp" + overlay_content = "_upp_buck" + magazine_type = /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot + +/obj/item/ammo_box/magazine/shotgun/upp/buckshot/empty + empty = TRUE + +/obj/item/ammo_box/magazine/shotgun/upp/flechette + name = "\improper Type 23 shotgun shell box (Flechette 8g x 100)" + icon_state = "base_flech_upp" + overlay_content = "_upp_flech" + magazine_type = /obj/item/ammo_magazine/handful/shotgun/heavy/flechette + +/obj/item/ammo_box/magazine/shotgun/upp/flechette/empty + empty = TRUE + +/obj/item/ammo_box/magazine/shotgun/upp/incendiary + name = "\improper Type 23 shotgun shell box (Dragon's breath 8g x 100)" + icon_state = "base_inc_upp" + overlay_content = "_upp_incen" + magazine_type = /obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath + +/obj/item/ammo_box/magazine/shotgun/upp/incendiary/empty + empty = TRUE + +/obj/item/ammo_box/magazine/shotgun/upp/beanbag + name = "\improper Type 23 shotgun shell box (Beanbag 8g x 100)" + icon_state = "base_bean_upp" + overlay_content = "_upp_bean" + magazine_type = /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag + can_explode = FALSE + +/obj/item/ammo_box/magazine/shotgun/upp/beanbag/empty + empty = TRUE //-----------------------16 GAUGE SHOTGUN SHELL BOXES----------------------- diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm index 61070690e9ac..053c1d99c163 100644 --- a/code/modules/projectiles/magazines/shotguns.dm +++ b/code/modules/projectiles/magazines/shotguns.dm @@ -175,6 +175,7 @@ GLOBAL_LIST_INIT(shotgun_handfuls_8g, list( /obj/item/ammo_magazine/handful/shotgun/heavy/slug, /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, /obj/item/ammo_magazine/handful/shotgun/heavy/flechette, + /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, /obj/item/ammo_magazine/handful/shotgun/heavy/dragonsbreath )) diff --git a/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi b/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi index 1152bf3ed569..981dd6df9290 100644 Binary files a/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi b/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi index b1b181c182eb..b8eb47a15c87 100644 Binary files a/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi index 130b9a2d70d3..b51561de2655 100644 Binary files a/icons/obj/items/weapons/guns/ammo_boxes/text.dmi and b/icons/obj/items/weapons/guns/ammo_boxes/text.dmi differ