diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index d687702af5..315b342ea7 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -427,3 +427,21 @@ var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = INFINITY STR.max_items = 100 + +/obj/item/storage/bag/ammo + name = "ammo pouch" + desc = "A pouch for your ammo that goes in your pocket." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "ammopouch" + slot_flags = ITEM_SLOT_POCKET + w_class = WEIGHT_CLASS_BULKY + resistance_flags = FLAMMABLE + +/obj/item/storage/bag/ammo/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.max_combined_w_class = 30 + STR.max_items = 3 + STR.display_numerical_stacking = FALSE + STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing)) \ No newline at end of file diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index dab8cad5b6..c181d6fb74 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -71,7 +71,8 @@ /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/neck/necklace/dope, /obj/item/vending_refill/donksoft, - /obj/item/circuitboard/computer/arcade/amputation) + /obj/item/circuitboard/computer/arcade/amputation, + /obj/item/storage/bag/ammo) crate_name = "crate" /datum/supply_pack/costumes_toys/foamforce diff --git a/code/modules/uplink/uplink_items/uplink_devices.dm b/code/modules/uplink/uplink_items/uplink_devices.dm index 2d20fd0b7b..df6373b8de 100644 --- a/code/modules/uplink/uplink_items/uplink_devices.dm +++ b/code/modules/uplink/uplink_items/uplink_devices.dm @@ -100,6 +100,12 @@ cost = 1 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) +/datum/uplink_item/device_tools/ammo_pouch + name = "Ammo Pouch" + desc = "A small yet large enough pouch that can fit in your pocket, and has room for three magazines." + item = /obj/item/storage/bag/ammo + cost = 1 + /datum/uplink_item/device_tools/fakenucleardisk name = "Decoy Nuclear Authentication Disk" desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \ diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 284e957864..a5624d5938 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -15,13 +15,15 @@ /obj/item/secbat = 5) contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, - /obj/item/ssword_kit = 1) + /obj/item/ssword_kit = 1, + /obj/item/storage/bag/ammo = 1) premium = list(/obj/item/coin/antagtoken = 1, /obj/item/clothing/head/helmet/blueshirt = 1, /obj/item/clothing/suit/armor/vest/blueshirt = 1, /obj/item/clothing/under/rank/security/officer/blueshirt = 1, /obj/item/clothing/gloves/tackler = 5, - /obj/item/ssword_kit = 1) + /obj/item/ssword_kit = 1, + /obj/item/storage/bag/ammo = 2) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/security diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index c95e6e5cb7..c5b2b3fc42 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ