Laser Rebalance (TEST-MERGE) (#1701)

This PR reduces the damage of most normal lasers by 25%, down to 30 per shot. Pistols are reduced slightly more, to 25 per shot.
In addition it also strips or reduces armor penetration in most cases.
This commit is contained in:
NanakoAC
2017-02-11 13:39:26 +00:00
committed by skull132
parent decf210cf0
commit 11550748f7
3 changed files with 43 additions and 6 deletions
@@ -126,5 +126,5 @@
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="epistolstun", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="epistolkill", fire_sound='sound/weapons/Laser.ogg')
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pistol, modifystate="epistolkill", fire_sound='sound/weapons/Laser.ogg')
)
+6 -5
View File
@@ -1,8 +1,11 @@
/obj/item/projectile/beam/pistol
damage = 25
/obj/item/projectile/beam
name = "laser"
icon_state = "laser"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 40
damage = 30
damage_type = BURN
check_armour = "laser"
eyeblur = 4
@@ -25,14 +28,13 @@
eyeblur = 2
/obj/item/projectile/beam/midlaser
damage = 40
damage = 30
armor_penetration = 10
/obj/item/projectile/beam/heavylaser
name = "heavy laser"
icon_state = "heavylaser"
damage = 60
armor_penetration = 30
muzzle_type = /obj/effect/projectile/laser_heavy/muzzle
tracer_type = /obj/effect/projectile/laser_heavy/tracer
@@ -42,7 +44,7 @@
name = "xray beam"
icon_state = "xray"
damage = 25
armor_penetration = 50
armor_penetration = 30
muzzle_type = /obj/effect/projectile/xray/muzzle
tracer_type = /obj/effect/projectile/xray/tracer
@@ -52,7 +54,6 @@
name = "pulse"
icon_state = "u_laser"
damage = 50
armor_penetration = 30
muzzle_type = /obj/effect/projectile/laser_pulse/muzzle
tracer_type = /obj/effect/projectile/laser_pulse/tracer