Skip to content

Commit

Permalink
UPP storage solutions
Browse files Browse the repository at this point in the history
- Type 6 Fragmentation Grenades now come packed 5 at a time in wooden boxes
- Type 23 8g shotgun shells- buck and slug- come in shotgun boxes
  • Loading branch information
AmoryBlaine committed Aug 22, 2024
1 parent d1f826e commit 79096c2
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 0 deletions.
9 changes: 9 additions & 0 deletions code/modules/projectiles/ammo_boxes/grenade_packets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

var/list/grenade_packets = list(
/obj/item/storage/box/packet/high_explosive,
/obj/item/storage/box/packet/high_explosive/upp,
/obj/item/storage/box/packet/baton_slug,
/obj/item/storage/box/packet/flare,
/obj/item/storage/box/packet/hornet,
Expand All @@ -43,8 +44,16 @@ var/list/grenade_packets = list(
name = "\improper HEDP grenade packet"
desc = "It contains three HEDP high explosive grenades."
icon_state = "hedp_packet"
storage_slots = 5
content_type = /obj/item/explosive/grenade/high_explosive

/obj/item/storage/box/packet/high_explosive/upp
name = "\improper Type 6 fragmentation grenade packet"
desc = "It contains three Type 6 fragmentation grenades."
icon_state = "woodbox"

content_type = /obj/item/explosive/grenade/high_explosive/upp

/obj/item/storage/box/packet/baton_slug
name = "\improper HIRR baton slug packet"
desc = "It contains three HIRR (High Impact Rubber Rounds) Baton Slugs."
Expand Down
20 changes: 20 additions & 0 deletions code/modules/projectiles/magazines/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,26 @@ var/list/shotgun_boxes_12g = list(
desc = "A box filled with buckshot spread shotgun shells, USCM special type. 12 Gauge."
icon_state = "special"
default_ammo = /datum/ammo/bullet/shotgun/buckshot/special

/obj/item/ammo_magazine/shotgun/buckshot/heavy
name = "box of heavy buckshot shells"
desc = "A box filled with buckshot spread shotgun shells. 8 Gauge."
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi'
icon_state = "heavy_buckshot"
default_ammo = /datum/ammo/bullet/shotgun/heavy/buckshot
transfer_handful_amount = 4
max_rounds = 24
caliber = "8g"

/obj/item/ammo_magazine/shotgun/slug/heavy
name = "box of heavy slug shells"
desc = "A box filled with slug shotgun shells. 8 Gauge."
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi'
icon_state = "heavy_slug"
default_ammo = /datum/ammo/bullet/shotgun/heavy/slug
transfer_handful_amount = 4
max_rounds = 24
caliber = "8g"
//-------------------------------------------------------

/*
Expand Down
Binary file modified icons/obj/items/weapons/grenade.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi
Binary file not shown.

0 comments on commit 79096c2

Please sign in to comment.