diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm index 01687ae1007..52a4d7fa96b 100644 --- a/code/modules/projectiles/ammunition/energy_lens.dm +++ b/code/modules/projectiles/ammunition/energy_lens.dm @@ -41,6 +41,13 @@ variance = 25 select_name = "scatter" +/obj/item/ammo_casing/energy/laser/eshotgun + projectile_type = /obj/item/projectile/beam/scatter/eshotgun + pellets = 6 + variance = 25 + select_name = "kill" + delay = 1 SECONDS + /obj/item/ammo_casing/energy/laser/heavy projectile_type = /obj/item/projectile/beam/laser/heavylaser select_name = "anti-vehicle" @@ -185,6 +192,17 @@ randomspread = 1 delay = 0 +/obj/item/ammo_casing/energy/disabler/eshotgun + projectile_type = /obj/item/projectile/beam/disabler/pellet + muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE + select_name = "disable" + e_cost = 75 + fire_sound = 'sound/weapons/taser2.ogg' + harmful = FALSE + delay = 1 SECONDS + pellets = 6 + variance = 25 + /// seperate balancing for cyborg, again /obj/item/ammo_casing/energy/disabler/cyborg e_cost = 250 diff --git a/code/modules/projectiles/guns/energy/energy.dm b/code/modules/projectiles/guns/energy/energy.dm index 1be5eb58402..fe3d00217d7 100644 --- a/code/modules/projectiles/guns/energy/energy.dm +++ b/code/modules/projectiles/guns/energy/energy.dm @@ -6,6 +6,7 @@ * 5. PDW-9 PISTOL * 6. HYBRID TURRET GUN * 7. ADVANCED ENERGY GUN +* 8. ENERGY SHOTGUN */ ////////////////////////////// // MARK: ENERGY GUN @@ -230,3 +231,35 @@ . += "" . += "Nonetheless, Nanotrasen Marketing is very pleased with the current product, and hopes that it can soon be sold on the galactic market to customers that wish to employ energy weapons \ free from the logistical constraints of recharging stations." + +////////////////////////////// +// MARK: ENERGY SHOTGUN +////////////////////////////// +/obj/item/gun/energy/gun/shotgun + name = "ES-9 Energy Scatterbeam" + desc = "A hybrid fire energy shotgun manufactured by Shellguard Munitions Co. The pump changes the modes between 'disable' and 'kill'." + icon_state = "eshotgun" + item_state = null + origin_tech = "combat=5;magnets=5" + w_class = WEIGHT_CLASS_BULKY + slot_flags = ITEM_SLOT_BACK + var/fail_tick = 0 + ammo_x_offset = 1 + ammo_type = list(/obj/item/ammo_casing/energy/disabler/eshotgun, /obj/item/ammo_casing/energy/laser/eshotgun) + var/pump_time = 1 SECONDS + COOLDOWN_DECLARE(pump_cooldown) + +/obj/item/gun/energy/gun/shotgun/select_fire(mob/living/user) + . = ..() + if(!COOLDOWN_FINISHED(src, pump_cooldown)) + return + playsound(user, 'sound/weapons/gun_interactions/shotgunpump.ogg', 60, TRUE) + COOLDOWN_START(src, pump_cooldown, pump_time) + +/obj/item/gun/energy/gun/shotgun/examine_more(mob/user) + ..() + . = list() + . += "The ES-9 is a larger and heavier version of Shellguard Munitions' EG-7 Energy Gun. Featuring a heavier power core and a set of prisms for splitting the primary beam into multiple shots, this energy weapon emulates the common shotgun." + . += "" + . += "This scatter-beam technology allows for more energy output per trigger pull, however the increased heat on the focusing lens has resulted in a decreased fire rate compared to the standard fare. \ + It is a Nanotrasen officer's best friend, allowing them to stop crime one trigger pull at a time." diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 59e51c611ac..918661349b5 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -77,6 +77,12 @@ icon_state = "scatterlaser" damage = 5 +/obj/item/projectile/beam/scatter/eshotgun + damage = 6 + tile_dropoff = 0.5 + tile_dropoff_s = 0.5 + range = 8 + /obj/item/projectile/beam/xray name = "xray beam" icon_state = "xray" @@ -105,6 +111,12 @@ armour_penetration_flat = -10 light_color = LIGHT_COLOR_BLUE +/obj/item/projectile/beam/disabler/pellet + name = "split disabler beam" + damage = 10 + light_color = LIGHT_COLOR_BLUE + range = 8 + /obj/item/projectile/beam/pulse name = "pulse" icon_state = "u_laser" diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm index e86d9792de8..46f24048564 100644 --- a/code/modules/supply/supply_packs/pack_security.dm +++ b/code/modules/supply/supply_packs/pack_security.dm @@ -218,6 +218,14 @@ containertype = /obj/structure/closet/crate/secure/plasma containername = "energy gun crate" +/datum/supply_packs/security/armory/eshotguns + name = "Energy Shotguns Crate" + contains = list(/obj/item/gun/energy/gun/shotgun, + /obj/item/gun/energy/gun/shotgun) + cost = 500 + containertype = /obj/structure/closet/crate/secure/plasma + containername = "energy shotgun crate" + /// costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person /datum/supply_packs/security/armory/epistol name = "Energy Pistol Crate" diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index 62f205c4d82..ff338e63b95 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index 53969c71c10..4f5a3a51d66 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 5eebe0312c5..39d8fb26edf 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ