diff --git a/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm b/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm index 3bae8b0d9f24..02c2b05eb442 100644 --- a/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm +++ b/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm @@ -221,6 +221,13 @@ contains = list(/obj/item/ammo_box/darkpack/c12g/silver) crate_name = "ammo crate" +/datum/supply_pack/weapons/ammo12g/incendiary + name = "Ammo (12g, Dragon's Breath)" + desc = "Contains a box of 12g incendiary shells." + cost = 4000 + contains = list(/obj/item/ammo_box/darkpack/c12g/buck/incendiary) + crate_name = "ammo crate" + /datum/supply_pack/weapons/ammo545 name = "Ammo (5.45)" desc = "Contains a box of 5.45 ammunition." diff --git a/modular_darkpack/modules/weapons/code/ammo_boxes.dm b/modular_darkpack/modules/weapons/code/ammo_boxes.dm index 33657551a5e0..0c62e532c17a 100644 --- a/modular_darkpack/modules/weapons/code/ammo_boxes.dm +++ b/modular_darkpack/modules/weapons/code/ammo_boxes.dm @@ -140,6 +140,11 @@ // icon_state = "s12box_buck" // ammo_type = /obj/item/ammo_casing/vampire/c12g/buck/silver +/obj/item/ammo_box/darkpack/c12g/buck/incendiary + name = "ammo box (12g, Dragon's Breath)" + icon_state = "12box_dragon" + ammo_type = /obj/item/ammo_casing/vampire/c12g/buck/incendiary + // Crossbow Bolt /obj/item/ammo_box/darkpack/arrows name = "ammo box (arrows)" diff --git a/modular_darkpack/modules/weapons/code/ammo_casings.dm b/modular_darkpack/modules/weapons/code/ammo_casings.dm index c587d7d06bd2..c9bb7597a31e 100644 --- a/modular_darkpack/modules/weapons/code/ammo_casings.dm +++ b/modular_darkpack/modules/weapons/code/ammo_casings.dm @@ -145,6 +145,15 @@ icon_state = "12i" base_icon_state = "12i" +/obj/item/ammo_casing/vampire/c12g/buck/incendiary + name = "12g dragon's breath shell casing" + desc = "An incendiary 12g shell casing." + projectile_type = /obj/projectile/bullet/darkpack/dragonsbreath + pellets = 8 + variance = 25 + icon_state = "12d" + base_icon_state = "12d" + // Crossbow Bolt /obj/item/ammo_casing/caseless/bolt name = "bolt" diff --git a/modular_darkpack/modules/weapons/code/projectiles.dm b/modular_darkpack/modules/weapons/code/projectiles.dm index 08fd44d46643..37c523064266 100644 --- a/modular_darkpack/modules/weapons/code/projectiles.dm +++ b/modular_darkpack/modules/weapons/code/projectiles.dm @@ -167,6 +167,24 @@ var/mob/living/carbon/M = target M.Stun(4) +/obj/projectile/bullet/darkpack/dragonsbreath + name = "12g shotgun incendiary pellet" + damage = 6 + damage_type = BURN + range = 22 //range of where you can see + one screen after + armour_penetration = 0 + exposed_wound_bonus = 0 + wound_bonus = 0 + var/fire_stacks = 1 // 1 stack per pellet but we have 9 pellets so it adds up + +/obj/projectile/bullet/darkpack/dragonsbreath/on_hit(atom/target, blocked = 0, pierce_hit) + . = ..() + do_sparks(2, TRUE, src) + if(iscarbon(target)) + var/mob/living/carbon/M = target + M.adjust_fire_stacks(fire_stacks) + M.ignite_mob() + // Crossbow Bolt /obj/projectile/bullet/crossbow_bolt name = "bolt" diff --git a/modular_darkpack/modules/weapons/icons/ammo.dmi b/modular_darkpack/modules/weapons/icons/ammo.dmi index 0827ad63c68b..28132b5fe282 100644 Binary files a/modular_darkpack/modules/weapons/icons/ammo.dmi and b/modular_darkpack/modules/weapons/icons/ammo.dmi differ diff --git a/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi b/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi index a7c023e1559b..98f6856146e6 100644 Binary files a/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi and b/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi differ