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 02:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citrp/master' into init_2-real

Browse Source
This commit is contained in:
silicons
2021-02-25 03:24:11 -07:00
parent d7acafbee3 9fb46aacec
commit e9acf212fb
74 changed files with 3923 additions and 1505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,6 +228,33 @@
icon_state = "stun"
agony = 30
//Disabler Beams - It didn't feel right just to recolor Stun beams. We have uses for them still.
/obj/item/projectile/beam/disabler
name = "disabler beam"
icon_state = "lightning"
fire_sound = 'sound/weapons/Taser.ogg'
nodamage = 1
taser_effect = 1
agony = 30
damage_type = HALLOSS
light_color = "#FFFFFF"
combustion = FALSE
muzzle_type = /obj/effect/projectile/muzzle/lightning
tracer_type = /obj/effect/projectile/tracer/lightning
impact_type = /obj/effect/projectile/impact/lightning
/obj/item/projectile/beam/disabler/weak
name = "weak disabler beam"
icon_state = "lightning"
agony = 25
/obj/item/projectile/beam/disabler/strong
name = "strong disabler beam"
icon_state = "lightning"
agony = 40
/obj/item/projectile/beam/stun/disabler
muzzle_type = /obj/effect/projectile/muzzle/laser_omni
tracer_type = /obj/effect/projectile/tracer/laser_omni