Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPP shotgun shell boxes #7640

Merged
merged 5 commits into from
Dec 2, 2024
Merged

UPP shotgun shell boxes #7640

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dfacdf0
init
Blundir Nov 20, 2024
adb2b78
Update boxes_and_lids.dmi
Blundir Nov 22, 2024
ae2e9b6
upd
Blundir Nov 22, 2024
0afa798
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into m…
Blundir Dec 2, 2024
9afd998
fix
Blundir Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions code/datums/supply_packs/black_market.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
Expand Down
48 changes: 48 additions & 0 deletions code/modules/projectiles/ammo_boxes/handful_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-----------------------
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/magazines/shotguns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
))

Expand Down
Binary file modified icons/obj/items/weapons/guns/ammo_boxes/boxes_and_lids.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/ammo_boxes/handfuls.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/ammo_boxes/text.dmi
View file
Open in desktop
Binary file not shown.
Loading