From 52398aa0cf9bc89811755ef3b7da64e4de1e64a4 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 5 Feb 2018 17:53:12 -0600 Subject: [PATCH] Adds Phase Pistols --- .../projectiles/guns/energy/special.dm | 10 ++++++++++ code/modules/projectiles/projectile/energy.dm | 8 +++++++- icons/obj/gun.dmi | Bin 84173 -> 84942 bytes .../southern_cross/structures/closets/misc.dm | 12 ++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 84697e668d..70138487e3 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -25,6 +25,16 @@ charge_cost = 480 projectile_type = /obj/item/projectile/ion +/obj/item/weapon/gun/energy/phasegun + name = "phase pistol" + desc = "The NT Mk26 EW Apollo is an energy handgun, specifically designed for use against wildlife." + icon_state = "phase" + item_state = "taser" //I don't have an in-hand sprite, taser will be fine + slot_flags = SLOT_BELT|SLOT_HOLSTER + charge_cost = 300 + projectile_type = /obj/item/projectile/energy/phase + + /obj/item/weapon/gun/energy/decloner name = "biological demolecularisor" desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements." diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index d3bc093cac..8138146163 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -195,4 +195,10 @@ light_color = "#0000FF" embed_chance = 0 - muzzle_type = /obj/effect/projectile/pulse/muzzle \ No newline at end of file + muzzle_type = /obj/effect/projectile/pulse/muzzle + +/obj/item/projectile/energy/phase + kill_count = 4 + damage = 5 + SA_bonus_damage = 55 // 60 total on animals. + SA_vulnerability = SA_ANIMAL \ No newline at end of file diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index a9c1789bf4eede81136696a9307a0fecb85a87e9..2ea4f3c31cad1a1f952a92ad4071842f3191fcf3 100644 GIT binary patch delta 6250 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 diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index d3a8e34f53..77ecb795f3 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -26,6 +26,18 @@ new /obj/item/weapon/gun/projectile/shotgun/pump/rifle(src) return +/obj/structure/closet/secure_closet/guncabinet/phase + name = "phase pistol cabinet" + req_one_access = list(access_explorer,access_brig) + +/obj/structure/closet/secure_closet/guncabinet/phase/New() + ..() + new /obj/item/weapon/gun/energy/phasegun(src) + new /obj/item/weapon/gun/energy/phasegun(src) + // One spare cell per gun + new /obj/item/weapon/cell/device/weapon(src) + new /obj/item/weapon/cell/device/weapon(src) + //Explorer Lockers /obj/structure/closet/secure_closet/explorer