Taser rework test number one.

This commit is contained in:
Captain277
2021-02-18 23:14:45 -08:00
parent 07650b6447
commit e74f24ee4d
2 changed files with 12 additions and 5 deletions

View File

@@ -1,12 +1,19 @@
/obj/item/gun/energy/taser /obj/item/gun/energy/taser
name = "taser gun" name = "taser gun"
desc = "The NT Mk30 NL is a small gun used for non-lethal takedowns. Produced by NT, it's actually a licensed version of a W-T design." desc = "The NT Mk31 NL is a small gun used for non-lethal takedowns. An NT exclusive iteration of the Mk30 WT design, the Mk31 features a variable output mechanism which draws from a singular power source, allowing for versatile firing solutions without increased weight."
icon_state = "taser" icon_state = "taser"
item_state = null //so the human update icon uses the icon_state instead. item_state = null //so the human update icon uses the icon_state instead.
projectile_type = /obj/item/projectile/beam/stun
charge_cost = 240
fire_delay = 4 fire_delay = 4
projectile_type = /obj/item/projectile/energy/electrode
modifystate = "taser"
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/energy/electrode, modifystate="taser", charge_cost = 240),
list(mode_name="disable", projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="taserblue", charge_cost = 160),
)
/obj/item/gun/energy/taser/mounted /obj/item/gun/energy/taser/mounted
name = "mounted taser gun" name = "mounted taser gun"
self_recharge = 1 self_recharge = 1

View File

@@ -220,12 +220,12 @@
/obj/item/projectile/beam/stun/weak /obj/item/projectile/beam/stun/weak
name = "weak stun beam" name = "weak stun beam"
icon_state = "stun" icon_state = "lightning"
agony = 25 agony = 25
/obj/item/projectile/beam/stun/med /obj/item/projectile/beam/stun/med
name = "stun beam" name = "stun beam"
icon_state = "stun" icon_state = "lightning"
agony = 30 agony = 30
/obj/item/projectile/beam/stun/disabler /obj/item/projectile/beam/stun/disabler