Merge pull request #5550 from Citadel-Station-13/upstream-merge-35726

[MIRROR] Reflectors now reset the range of a projectile like before!
This commit is contained in:
deathride58
2018-02-17 20:44:06 +00:00
committed by GitHub
2 changed files with 4 additions and 0 deletions
@@ -72,6 +72,8 @@
/obj/structure/reflector/proc/auto_reflect(obj/item/projectile/P, pdir, turf/ploc, pangle)
P.ignore_source_check = TRUE
P.range = P.decayedRange
P.decayedRange = max(P.decayedRange--, 0)
return -1
/obj/structure/reflector/attackby(obj/item/W, mob/user, params)
+2
View File
@@ -65,6 +65,7 @@
var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb
var/projectile_type = /obj/item/projectile
var/range = 50 //This will de-increment every step. When 0, it will deletze the projectile.
var/decayedRange
var/is_reflectable = FALSE // Can it be reflected or not?
//Effects
var/stun = 0
@@ -85,6 +86,7 @@
/obj/item/projectile/Initialize()
. = ..()
permutated = list()
decayedRange = range
/obj/item/projectile/proc/Range()
range--