cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-10 10:56:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Taser rework test number one.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -1,12 +1,19 @@
/obj/item/gun/energy/taser
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"
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
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
name = "mounted taser gun"
self_recharge = 1

4
code/modules/projectiles/projectile/beams.dm
View File

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