diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 2bcdfdd6894..f916998e26b 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -129,10 +129,6 @@ eprojectile = /obj/item/projectile/beam eshot_sound = 'sound/weapons/Laser.ogg' - if(/obj/item/weapon/gun/energy/stunrevolver) - eprojectile = /obj/item/projectile/beam - eshot_sound = 'sound/weapons/Laser.ogg' - if(/obj/item/weapon/gun/energy/gun) eprojectile = /obj/item/projectile/beam //If it has, going to kill mode eshot_sound = 'sound/weapons/Laser.ogg' diff --git a/code/modules/examine/descriptions/weapons.dm b/code/modules/examine/descriptions/weapons.dm index 785beed0042..90929d31e08 100644 --- a/code/modules/examine/descriptions/weapons.dm +++ b/code/modules/examine/descriptions/weapons.dm @@ -31,10 +31,6 @@ then click where you want to fire. To recharge this weapon, use a weapon recharger. \ To switch between insta-stun and disabler beams, click the weapon in your hand. This weapon can only fire through glass if it is set to disabler beams." -/obj/item/weapon/gun/energy/stunrevolver - description_info = "This is an energy weapon. To fire the weapon, have your gun mode set to 'fire', \ - then click where you want to fire. To recharge this weapon, use a weapon recharger." - /obj/item/weapon/gun/energy/nuclear description_info = "This is an energy weapon. To fire the weapon, have your gun mode set to 'fire', \ then click where you want to fire. Most energy weapons can fire through windows harmlessly. To switch between stun and lethal, click the weapon \ diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index c24bb897414..37d22ba5ff7 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -25,16 +25,30 @@ self_recharge = 1 recharge_time = 10 //Time it takes for shots to recharge (in ticks) -/obj/item/weapon/gun/energy/stunrevolver - name = "stun revolver" - desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder. Holds twice as much ammo as a standard taser." +/obj/item/weapon/gun/energy/shock_revolver + name = "tesla revolver" + desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers." icon_state = "stunrevolver" - fire_sound = "sound/weapons/gunshot.ogg" - projectile_type = "/obj/item/projectile/energy/electrode" - cell_type = "/obj/item/weapon/stock_parts/cell" - fire_delay = 15 + item_state = "gun" + fire_sound = 'sound/weapons/gunshot.ogg' + projectile_type = "/obj/item/projectile/energy/shock_revolver" + charge_cost = 2000 + can_flashlight = 0 +/obj/item/projectile/energy/shock_revolver + name = "shock bolt" + icon_state = "purple_laser" + var/chain +/obj/item/projectile/energy/shock_revolver/OnFired() + spawn(1) + chain = Beam(firer, icon_state="purple_lightning", icon = 'icons/effects/effects.dmi',time=1000, maxdistance = 30) + +/obj/item/projectile/energy/shock_revolver/on_hit(atom/target) + . = ..() + if(isliving(target)) + tesla_zap(src, 3, 10000) + qdel(chain) /obj/item/weapon/gun/energy/crossbow name = "mini energy-crossbow" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 1dd4857ddc7..d12ae88985e 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -125,48 +125,6 @@ locked = 1 category = list("Weapons") -/datum/design/smg - name = "Nanotrasen Saber SMG" - desc = "A prototype weapon made using lightweight materials on a traditional frame, designed to fire standard 9mm rounds." - id = "smg" - req_tech = list("combat" = 4, "materials" = 3) - build_type = PROTOLATHE - materials = list(MAT_METAL = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000) - build_path = /obj/item/weapon/gun/projectile/automatic/proto - locked = 1 - category = list("Weapons") - -/datum/design/mag_smg - name = "Saber Submachine Gun Magazine (9mm)" - desc = "A 30-round magazine for the Saber submachine gun." - id = "mag_smg" - req_tech = list("combat" = 4, "materials" = 3) - build_type = PROTOLATHE - materials = list(MAT_METAL = 2000) - build_path = /obj/item/ammo_box/magazine/smgm9mm - category = list("Weapons") - -/datum/design/mag_smg/ap_mag - name = "Saber Submachine Gun Magazine (9mmAP)" - desc = "A 30-round armour piercing magazine for the Saber submachine gun. Deals slightly less damage but bypasses most armor." - id = "mag_smg_ap" - materials = list(MAT_METAL = 3000, MAT_SILVER = 100) - build_path = /obj/item/ammo_box/magazine/smgm9mm/ap - -/datum/design/mag_smg/incin_mag - name = "Saber Submachine Gun Magazine (9mmIC)" - desc = "A 30-round incendiary round magazine for the Saber submachine gun. Deals significantly less damage but sets the target on fire." - id = "mag_smg_ic" - materials = list(MAT_METAL = 3000, MAT_SILVER = 100, MAT_GLASS = 400) - build_path = /obj/item/ammo_box/magazine/smgm9mm/fire - -/datum/design/mag_smg/incin_tox - name = "Saber Submachine Gun Magazine (9mmTX)" - desc = "A 30-round uranium tipped round magazine for the Saber submachine gun. Deals toxin damage, but less overall damage." - id = "mag_smg_tx" - materials = list(MAT_METAL = 3000, MAT_GLASS = 200, MAT_URANIUM = 1000) - build_path = /obj/item/ammo_box/magazine/smgm9mm/toxin - //WT550 Mags /datum/design/mag_oldsmg @@ -221,13 +179,13 @@ category = list("Weapons") /datum/design/stunrevolver - name = "Stun Revolver" - desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder. The stun cartridges can be recharged using a conventional energy weapon recharger." + name = "Tesla Revolver" + desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers." id = "stunrevolver" - req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2) + req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 5) build_type = PROTOLATHE - materials = list(MAT_METAL = 4000, MAT_GLASS = 1000) - build_path = /obj/item/weapon/gun/energy/stunrevolver + materials = list(MAT_METAL = 10000, MAT_GLASS = 10000, MAT_SILVER = 10000) + build_path = /obj/item/weapon/gun/energy/shock_revolver locked = 1 category = list("Weapons") diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 1345d8172d7..45e4265c292 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ