From f43a861d6e84346af50ed23378257eec2dec7bd8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 21 May 2017 22:27:50 -0500 Subject: [PATCH 1/2] Plasma cutters will mine further but will go less distance in open air --- code/modules/projectiles/projectile/special.dm | 9 ++++++--- code/modules/projectiles/projectile/special.dm.rej | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 code/modules/projectiles/projectile/special.dm.rej diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index f5df46cb7b..b25d23fa95 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -215,24 +215,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 diff --git a/code/modules/projectiles/projectile/special.dm.rej b/code/modules/projectiles/projectile/special.dm.rej new file mode 100644 index 0000000000..2af063669d --- /dev/null +++ b/code/modules/projectiles/projectile/special.dm.rej @@ -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() + . = ..() From e675b3beccea3783a4adc19f82a25726738e08a7 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 22 May 2017 17:35:40 -0500 Subject: [PATCH 2/2] var/mine_range --- code/modules/projectiles/projectile/special.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 49c83f70ed..57b339178f 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -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() . = ..()