diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 4d585cef1d9..10622e79bdf 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -697,6 +697,15 @@ for(var/I in 1 to 7) new /obj/item/ammo_casing/shotgun/tranquilizer(src) +/obj/item/storage/box/holy + name = "ammunition box (Holy Water darts)" + desc = "A small box capable of holding seven shotgun shells." + icon_state = "hshell_box" + +/obj/item/storage/box/holy/populate_contents() + for(var/I in 1 to 7) + new /obj/item/ammo_casing/shotgun/holy(src) + //////////////// /* Donk Boxes */ //////////////// diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 9f5814416b1..1f3d72d994d 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -306,6 +306,15 @@ muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL materials = list(MAT_METAL=250) +/obj/item/ammo_casing/shotgun/holy + name = "holy water darts" + desc = "A 12 gauge dart shell loaded with holy water." + icon_state = "hshell" + projectile_type = /obj/item/projectile/bullet/dart/syringe/holy + muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL + muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL + materials = list(MAT_METAL=250) + /obj/item/ammo_casing/shotgun/confetti name = "confettishot" desc = "A 12 gauge shell loaded with... confetti?" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 1910e9fbe27..7e3a23c9597 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -269,6 +269,12 @@ ..() reagents.add_reagent("haloperidol", 15) +/obj/item/projectile/bullet/dart/syringe/holy + +/obj/item/projectile/bullet/dart/syringe/holy/New() + ..() + reagents.add_reagent("holywater", 10) + /obj/item/projectile/bullet/neurotoxin name = "neurotoxin spit" icon_state = "neurotoxin" diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm index 50dd605976f..cd580d87dc2 100644 --- a/code/modules/supply/supply_packs/pack_security.dm +++ b/code/modules/supply/supply_packs/pack_security.dm @@ -283,6 +283,13 @@ cost = 400 containername = "tranquilizer shell crate" +/datum/supply_packs/security/armory/holyammo + name = "Holy Water Shell Crate" + contains = list(/obj/item/storage/box/holy, + /obj/item/storage/box/holy) + cost = 400 + containername = "holy water shell crate" + /datum/supply_packs/security/armory/disablersmg name = "WT-450 Disabler SMG Crate" contains = list(/obj/item/gun/energy/disabler/smg, diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index a291de4b714..05c38bf7276 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/boxes.dmi b/icons/obj/boxes.dmi index cd55ba5067c..30e866ecc84 100644 Binary files a/icons/obj/boxes.dmi and b/icons/obj/boxes.dmi differ