diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index 34701ed54017..06bb0275a487 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -69,6 +69,22 @@ pellets = 6 variance = 25 +/obj/item/ammo_casing/shotgun/hpbuck + name = "hollow-point buckshot shell" + desc = "A 12 gauge hollow-point buckshot shell." + icon_state = "hpbshell" + projectile_type = /obj/item/projectile/bullet/pellet/shotgun_hpbuckshot + pellets = 6 + variance = 25 + +/obj/item/ammo_casing/shotgun/flechette + name = "flechette shell" + desc = "A 12 gauge flechette shell." + icon_state = "flshell" + projectile_type = /obj/item/projectile/bullet/pellet/shotgun_flechette + pellets = 6 + variance = 15 + /obj/item/ammo_casing/shotgun/clownshot name = "buckshot shell..?" desc = "This feels a little light for a buckshot shell." diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm index 268b6dbc0b00..cf76c460f093 100644 --- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm @@ -34,3 +34,13 @@ name = "shotgun magazine (12g meteor slugs)" icon_state = "m12gbc" ammo_type = /obj/item/ammo_casing/shotgun/meteorslug + +/obj/item/ammo_box/magazine/m12g/flechette + name = "shotgun magazine (12g flechette)" + icon_state = "m12gb" + ammo_type = /obj/item/ammo_casing/shotgun/flechette + +/obj/item/ammo_box/magazine/m12g/hpbuck + name = "shotgun magazine (12g hollow-point buckshot)" + icon_state = "m12gb" + ammo_type = /obj/item/ammo_casing/shotgun/hpbuck diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index b37d4cbd8f59..8b38bf93471a 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -75,7 +75,20 @@ wound_bonus = 5 bare_wound_bonus = 5 wound_falloff_tile = -2.5 // low damage + additional dropoff will already curb wounding potential anything past point blank - + +/obj/item/projectile/bullet/pellet/shotgun_flechette + name = "flechette pellet" + damage = 15 + wound_bonus = -5 + bare_wound_bonus = -15 + armour_penetration = 40 + +/obj/item/projectile/bullet/pellet/shotgun_hpbuckshot + name = "hollow-point pellet" + damage = 25 + bare_wound_bonus = 5 + armour_penetration = -40 + /obj/item/projectile/bullet/pellet/shotgun_clownshot name = "clownshot pellet" damage = 0 diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 742060b4a433..3594c319a7d8 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -767,6 +767,16 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 3 item = /obj/item/ammo_box/magazine/m12g/slug +/datum/uplink_item/ammo/shotgun/hpbuck + name = "12g Hollow-Point Buckshot Drum" + desc = "An alternative 8-round hollow-point buckshot magazine for use with the Bulldog shotgun. For when you really need to put people in the dirt." + item = /obj/item/ammo_box/magazine/m12g/hpbuck + +/datum/uplink_item/ammo/shotgun/flechette + name = "12g Flechette Drum" + desc = "An alternative 8-round flechette magazine for use with the Bulldog shotgun. Hope they didnt want to use that armor..." + item = /obj/item/ammo_box/magazine/m12g/flechette + /datum/uplink_item/ammo/revolver name = ".357 Speed Loader" desc = "A speed loader that contains seven additional .357 Magnum rounds; usable with the Syndicate revolver. \ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 7324b1d28f31..b55e42efc50f 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ