From 49e47d00bb0c311fd8aeae9f24443ae2969b8423 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Wed, 29 Aug 2018 18:57:35 +0100 Subject: [PATCH] adds multi lens immolation gun --- code/modules/projectiles/ammunition/energy.dm | 12 ++++++++++++ code/modules/projectiles/guns/energy/laser.dm | 8 ++++++++ code/modules/projectiles/projectile/beams.dm | 8 ++++++++ 3 files changed, 28 insertions(+) diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index 7a9441ae46c..2f0f80447e0 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -67,6 +67,18 @@ fire_sound = 'sound/weapons/laser3.ogg' e_cost = 125 +/obj/item/ammo_casing/energy/immolator/strong + projectile_type = /obj/item/projectile/beam/immolator/strong + e_cost = 650 + select_name = "precise" + +/obj/item/ammo_casing/energy/immolator/scatter + projectile_type = /obj/item/projectile/beam/immolator/weak + e_cost = 650 + pellets = 8 + variance = 20 + select_name = "scatter" + /obj/item/ammo_casing/energy/electrode projectile_type = /obj/item/projectile/energy/electrode select_name = "stun" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 4be1f36cb22..7e25d8d270d 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -125,6 +125,14 @@ origin_tech = "combat=4;magnets=4;powerstorage=3" shaded_charge = 1 +/obj/item/gun/energy/immolator/multi + name = "multi lens immolator cannon" + desc = "A large laser cannon, similar to the Immolator Laser, with togglable firemodes. It is frequently used by military-like forces through Nanotrasen." + ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter) + origin_tech = "combat=5;magnets=5;powerstorage=4" + shaded_charge = TRUE + cell_type = /obj/item/stock_parts/cell/upgraded/plus + ////////Laser Tag//////////////////// /obj/item/gun/energy/laser/bluetag diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 761fb50179c..1edcc6f20da 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -119,6 +119,14 @@ /obj/item/projectile/beam/immolator name = "immolation beam" +/obj/item/projectile/beam/immolator/strong + name = "heavy immolation beam" + damage = 45 + +/obj/item/projectile/beam/immolator/weak + name = "light immolation beam" + damage = 8 + /obj/item/projectile/beam/immolator/on_hit(var/atom/target, var/blocked = 0) . = ..() if(istype(target, /mob/living/carbon))