Ion Beam Redux

This commit is contained in:
Heroman3003
2023-04-22 15:41:25 +10:00
committed by CHOMPStation2
parent 95d6752941
commit 317fc95a7e
9 changed files with 95 additions and 0 deletions

View File

@@ -49,20 +49,63 @@
tracer_type = /obj/effect/projectile/tracer/laser_blue
impact_type = /obj/effect/projectile/impact/laser_blue
/obj/item/projectile/beam/weaklaser/ion
damage_type = ELECTROMAG
light_color = "#00CCFF"
muzzle_type = /obj/effect/projectile/muzzle/laser_em
tracer_type = /obj/effect/projectile/tracer/laser_em
impact_type = /obj/effect/projectile/impact/laser_em
/obj/item/projectile/beam/smalllaser
damage = 25
hud_state = "laser"
/obj/item/projectile/beam/smalllaser/ion
damage_type = ELECTROMAG
light_color = "#00CCFF"
muzzle_type = /obj/effect/projectile/muzzle/laser_em
tracer_type = /obj/effect/projectile/tracer/laser_em
impact_type = /obj/effect/projectile/impact/laser_em
/obj/item/projectile/beam/burstlaser
damage = 30
armor_penetration = 10
hud_state = "laser"
/obj/item/projectile/beam/burstlaser/ion
damage_type = ELECTROMAG
light_color = "#00CCFF"
muzzle_type = /obj/effect/projectile/muzzle/laser_em
tracer_type = /obj/effect/projectile/tracer/laser_em
impact_type = /obj/effect/projectile/impact/laser_em
/obj/item/projectile/beam/midlaser
damage = 40
armor_penetration = 10
hud_state = "laser"
<<<<<<< HEAD
=======
/obj/item/projectile/beam/midlaser/ion
damage_type = ELECTROMAG
light_color = "#00CCFF"
muzzle_type = /obj/effect/projectile/muzzle/laser_em
tracer_type = /obj/effect/projectile/tracer/laser_em
impact_type = /obj/effect/projectile/impact/laser_em
/obj/item/projectile/beam/mininglaser
name = "pulsating laser"
damage = 10
armor_penetration = 20
fire_sound = 'sound/weapons/eluger.ogg'
excavation_amount = 100
muzzle_type = /obj/effect/projectile/muzzle/emitter
tracer_type = /obj/effect/projectile/tracer/emitter
impact_type = /obj/effect/projectile/impact/emitter
>>>>>>> da8a583936... Merge pull request #14812 from KillianKirilenko/kk-ionbeams
/obj/item/projectile/beam/heavylaser
name = "heavy laser"
icon_state = "heavylaser"
@@ -90,6 +133,13 @@
tracer_type = /obj/effect/projectile/tracer/emitter
impact_type = /obj/effect/projectile/impact/emitter
/obj/item/projectile/beam/heavylaser/ion
damage_type = ELECTROMAG
light_color = "#00CCFF"
muzzle_type = /obj/effect/projectile/muzzle/laser_em
tracer_type = /obj/effect/projectile/tracer/laser_em
impact_type = /obj/effect/projectile/impact/laser_em
/obj/item/projectile/beam/heavylaser/cannon
damage = 80
armor_penetration = 50