Merge pull request #1083 from Citadel-Station-13/upstream-merge-27474

[MIRROR] Plasma cutters will mine further but will go less distance in open air
This commit is contained in:
LetterJay
2017-05-22 17:46:02 -05:00
committed by GitHub
2 changed files with 17 additions and 3 deletions
@@ -203,6 +203,7 @@
range = 3.5 //works as 4, but doubles to 7
dismemberment = 20
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
var/mine_range = 3 //mines this many additional tiles
/obj/item/projectile/plasma/Initialize()
. = ..()
@@ -215,24 +216,27 @@
if(pressure < 60)
name = "full strength [name]"
damage *= 4
range *= 2
/obj/item/projectile/plasma/on_hit(atom/target)
. = ..()
if(ismineralturf(target))
var/turf/closed/mineral/M = target
M.gets_drilled(firer)
Range()
if(mine_range)
mine_range--
range++
if(range > 0)
return -1
/obj/item/projectile/plasma/adv
damage = 7
range = 5
mine_range = 5
/obj/item/projectile/plasma/adv/mech
damage = 10
range = 6
range = 9
mine_range = 3
/obj/item/projectile/plasma/turret
//Between normal and advanced for damage, made a beam so not the turret does not destroy glass
@@ -0,0 +1,10 @@
diff a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm (rejected hunks)
@@ -203,7 +203,7 @@
range = 4
dismemberment = 20
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
- var/mine_range = 4 //mines this many additional tiles
+ var/mine_range = 3 //mines this many additional tiles
/obj/item/projectile/plasma/Initialize()
. = ..()