diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index bfb2c491b1..df0fd7278e 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -283,12 +283,21 @@ desc = "A dart for use in shotguns. Can be injected with up to 30 units of any chemical." icon_state = "cshell" projectile_type = /obj/item/projectile/bullet/dart + var/reagent_amount = 30 + var/reagent_react = TRUE + +/obj/item/ammo_casing/shotgun/dart/noreact + name = "cryostasis shotgun dart" + desc = "A dart for use in shotguns, using similar technolgoy as cryostatis beakers to keep internal reagents from reacting. Can be injected with up to 10 units of any chemical." + icon_state = "cnrshell" + reagent_amount = 10 + reagent_react = FALSE /obj/item/ammo_casing/shotgun/dart/Initialize() . = ..() container_type |= OPENCONTAINER - create_reagents(30) - reagents.set_reacting(TRUE) + create_reagents(reagent_amount) + reagents.set_reacting(reagent_react) /obj/item/ammo_casing/shotgun/dart/attackby() return diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 4bc084e81b..c3f9f91430 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -251,3 +251,13 @@ build_path = /obj/item/gun/energy/kinetic_accelerator/crossbow/large category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/datum/design/cryostatis_shotgun_dart + name = "Cryostatis Shotgun Dart" + desc = "A shotgun dart designed with similar internals to that of a cryostatis beaker, allowing reagents to not react when inside." + id = "shotgundartcryostatis" + build_type = PROTOLATHE + materials = list(MAT_METAL = 3500) + build_path = /obj/item/ammo_casing/shotgun/dart/noreact + category = list("Ammo") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 479a79e250..cba6bf8676 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -514,7 +514,7 @@ display_name = "Medical Weaponry" description = "Weapons using medical technology." prereq_ids = list("adv_biotech", "adv_weaponry") - design_ids = list("rapidsyringe") + design_ids = list("rapidsyringe", "shotgundartcryostatis") research_cost = 2500 export_price = 5000 diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 4f38022f88..79f1d67c20 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ