diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 8de8e20fb5..59d2123fa3 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -821,7 +821,7 @@ Auto Patrol: []"}, if (src.emagged == 2) projectile = /obj/item/projectile/beam else - projectile = /obj/item/projectile/energy/electrode + projectile = /obj/item/projectile/beam/stun else if(lasercolor == "b") if (src.emagged == 2) projectile = /obj/item/projectile/beam/lastertag/omni diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 59e5ce13e3..8107e23cc5 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -66,7 +66,7 @@ spark_system.attach(src) sleep(10) if(!installation)// if for some reason the turret has no gun (ie, admin spawned) it resorts to basic taser shots - projectile = /obj/item/projectile/energy/electrode//holder for the projectile, here it is being set + projectile = /obj/item/projectile/beam/stun//holder for the projectile, here it is being set eprojectile = /obj/item/projectile/beam//holder for the projectile when emagged, if it is different reqpower = 200 sound = 1 @@ -128,7 +128,7 @@ reqpower = 700 if(/obj/item/weapon/gun/energy/taser) - projectile = /obj/item/projectile/energy/electrode + projectile = /obj/item/projectile/beam/stun eprojectile = projectile iconholder = 1 reqpower = 200 @@ -170,7 +170,7 @@ reqpower = 500 else // Energy gun shots - projectile = /obj/item/projectile/energy/electrode// if it hasn't been emagged, it uses normal taser shots + projectile = /obj/item/projectile/beam/stun// if it hasn't been emagged, it uses normal taser shots eprojectile = /obj/item/projectile/beam//If it has, going to kill mode iconholder = 1 egun = 1 diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 192599073a..41628f279e 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -117,7 +117,7 @@ icon_state = "mecha_taser" energy_drain = 20 equip_cooldown = 8 - projectile = /obj/item/projectile/energy/electrode + projectile = /obj/item/projectile/beam/stun fire_sound = 'sound/weapons/Taser.ogg' diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 654538194c..c3e6cb4397 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -56,7 +56,7 @@ emp_act return 2 //BEGIN BOOK'S TASER NERF. - if(istype(P, /obj/item/projectile/energy/electrode)) + if(istype(P, /obj/item/projectile/beam/stun)) var/datum/organ/external/select_area = get_organ(def_zone) // We're checking the outside, buddy! var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking? // var/deflectchance=90 //Is it a CRITICAL HIT with that taser? diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 488376b88f..7a0dd8545a 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -6,7 +6,7 @@ fire_sound = 'sound/weapons/Taser.ogg' charge_cost = 100 //How much energy is needed to fire. - projectile_type = "/obj/item/projectile/energy/electrode" + projectile_type = "/obj/item/projectile/beam/stun" origin_tech = "combat=3;magnets=2" modifystate = "energystun" @@ -27,7 +27,7 @@ charge_cost = 100 fire_sound = 'sound/weapons/Taser.ogg' user << "\red [src.name] is now set to stun." - projectile_type = "/obj/item/projectile/energy/electrode" + projectile_type = "/obj/item/projectile/beam/stun" modifystate = "energystun" update_icon() diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index cd990a66a7..b4ba69a5a0 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -18,7 +18,7 @@ charge_cost = 100 fire_sound = 'sound/weapons/Taser.ogg' user << "\red [src.name] is now set to stun." - projectile_type = "/obj/item/projectile/energy/electrode" + projectile_type = "/obj/item/projectile/beam/stun" if(0) mode = 1 charge_cost = 100 diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index ffa49d8122..8f752b68ff 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -6,7 +6,7 @@ item_state = null //so the human update icon uses the icon_state instead. fire_sound = 'sound/weapons/Taser.ogg' charge_cost = 100 - projectile_type = "/obj/item/projectile/energy/electrode" + projectile_type = "/obj/item/projectile/beam/stun" cell_type = "/obj/item/weapon/cell/crap" /obj/item/weapon/gun/energy/taser/cyborg @@ -15,7 +15,7 @@ icon_state = "taser" fire_sound = 'sound/weapons/Taser.ogg' charge_cost = 100 - projectile_type = "/obj/item/projectile/energy/electrode" + projectile_type = "/obj/item/projectile/beam/stun" cell_type = "/obj/item/weapon/cell/secborg" var/charge_tick = 0 var/recharge_time = 10 //Time it takes for shots to recharge (in ticks) @@ -33,16 +33,16 @@ charge_tick++ if(charge_tick < recharge_time) return 0 charge_tick = 0 - + if(!power_supply) return 0 //sanity if(power_supply.charge >= power_supply.maxcharge) return 0 // check if we actually need to recharge - + if(isrobot(src.loc)) var/mob/living/silicon/robot/R = src.loc if(R && R.cell) R.cell.use(charge_cost) //Take power from the borg... power_supply.give(charge_cost) //... to recharge the shot - + update_icon() return 1 @@ -51,10 +51,10 @@ name = "stun revolver" desc = "A high-tech revolver that fires stun cartridges. The stun cartridges can be recharged using a conventional energy weapon recharger." icon_state = "stunrevolver" - fire_sound = 'sound/weapons/Gunshot.ogg' + fire_sound = 'sound/weapons/Taser.ogg' origin_tech = "combat=3;materials=3;powerstorage=2" charge_cost = 125 - projectile_type = "/obj/item/projectile/energy/electrode" + projectile_type = "/obj/item/projectile/beam/stun" cell_type = "/obj/item/weapon/cell" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index f9d2ea73f1..9b1df5c30a 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -168,4 +168,11 @@ var/list/beam_master = list() damage = 60 stun = 5 weaken = 5 - stutter = 5 \ No newline at end of file + stutter = 5 + +/obj/item/projectile/beam/stun + name = "stun beam" + icon_state = "stun" + nodamage = 1 + agony = 40 + damage_type = HALLOSS \ No newline at end of file diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index 14e1f5a188..03915794e4 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ