From cbb4471e673aaf0012cda3880c1a0c23aa6db18e Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 11 Jun 2019 10:02:06 +0200 Subject: [PATCH] Beam type that changes damage type Beam type that on_hit() changes randomly between 6 damage types. Possible types: HALLOSS , BURN , BRUTE , CLONE , OXY , TOX Damage is standard beam 40. Resistance checked is laser Not tied to a weapon currently. (unused) --- .../projectiles/projectile/beams_vr.dm | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/code/modules/projectiles/projectile/beams_vr.dm b/code/modules/projectiles/projectile/beams_vr.dm index 5ba1fa56b2..283dfe90f6 100644 --- a/code/modules/projectiles/projectile/beams_vr.dm +++ b/code/modules/projectiles/projectile/beams_vr.dm @@ -1,15 +1,15 @@ /obj/item/projectile/beam/disable - name = "disabler beam" - icon_state = "omnilaser" - nodamage = 1 - taser_effect = 1 - agony = 100 //One shot stuns for the time being until adjustments are fully made. - damage_type = HALLOSS - light_color = "#00CECE" + name = "disabler beam" + icon_state = "omnilaser" + nodamage = 1 + taser_effect = 1 + agony = 100 //One shot stuns for the time being until adjustments are fully made. + damage_type = HALLOSS + light_color = "#00CECE" - muzzle_type = /obj/effect/projectile/laser_omni/muzzle - tracer_type = /obj/effect/projectile/laser_omni/tracer - impact_type = /obj/effect/projectile/laser_omni/impact + muzzle_type = /obj/effect/projectile/laser_omni/muzzle + tracer_type = /obj/effect/projectile/laser_omni/tracer + impact_type = /obj/effect/projectile/laser_omni/impact /obj/item/projectile/beam/stun agony = 35 @@ -41,3 +41,17 @@ muzzle_type = /obj/effect/projectile/laser_blue/muzzle tracer_type = /obj/effect/projectile/laser_blue/tracer impact_type = /obj/effect/projectile/laser_blue/impact + +//CHOMPEDIT Randomized beam, random dam type +/obj/item/projectile/beam/chaosrng + name = "unstable beam" + icon_state = "omnilaser" + + damage_type = HALLOSS + + var/list/damtypes =(HALLOSS , BURN , BRUTE , CLONE , OXY , TOX) +/obj/item/projectile/beam/chaosrng/on_hit(var/atom/hit) + ..() + damage_type = pick(damtypes) +//CHOMPEDIT End. +