diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 65cfa8f227a..6b94a2fc3c5 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -46,6 +46,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/ammo_casing/shotgun/beanbag(), \ new /obj/item/weapon/storage/box/blanks(), \ new /obj/item/ammo_casing/shotgun(), \ + new /obj/item/ammo_casing/shotgun/incendiary(), \ new /obj/item/ammo_box/c38(), \ new /obj/item/ammo_box/a357(), \ new /obj/item/clothing/ears/earmuffs/tribblemuffs(), \ diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index fd13ac64c84..e35de1108bd 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -200,7 +200,7 @@ name = "\improper FNX-66 Carbine" icon_state = "mecha_carbine" equip_cooldown = 5 - projectile = /obj/item/projectile/bullet/incendiary + projectile = /obj/item/projectile/bullet/incendiary/mech projectiles = 24 projectile_energy_cost = 15 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index b18011a869d..0a21dfd5847 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -102,11 +102,19 @@ m_amt = 2500 +/obj/item/ammo_casing/shotgun/incendiary + name = "incendiary shell" + desc = "An incendiary shell" + icon_state = "ishell" + projectile_type = /obj/item/projectile/bullet/incendiary/shell + m_amt = 12500 + + /obj/item/ammo_casing/shotgun/dart - name = "shotgun darts" - desc = "A dart for use in shotguns." - icon_state = "dart" - projectile_type = "/obj/item/projectile/energy/dart" + name = "shotgun dart" + 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 m_amt = 12500 obj/item/ammo_casing/shotgun/dart/New() @@ -134,4 +142,4 @@ obj/item/ammo_casing/shotgun/dart/New() projectile_type = /obj/item/projectile/bullet //select_name = "kinetic" //e_cost = 500 - //fire_sound = 'sound/weapons/Gunshot4.ogg' + //fire_sound = 'sound/weapons/Gunshot4.ogg' \ No newline at end of file diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index dc234b1ece9..233fa50d11f 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -98,8 +98,6 @@ /obj/item/projectile/bullet/incendiary - name = "incendiary bullet" - damage = 20 /obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0) if(istype(target, /mob/living/carbon)) @@ -107,6 +105,13 @@ M.adjust_fire_stacks(1) M.IgniteMob() +/obj/item/projectile/bullet/incendiary/shell + damage = 20 + +/obj/item/projectile/bullet/incendiary/mech + damage = 5 + + /* /obj/item/projectile/bullet/dart name = "dart" diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 856485c6327..c1d4c34e4c7 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ