Minor Projectile Reflection Refactor (#1926)

This commit is contained in:
CitadelStationBot
2017-07-07 12:33:59 -05:00
committed by kevinz000
parent be5ad79fa2
commit 5dd25bda95
4 changed files with 4 additions and 1 deletions
@@ -49,7 +49,7 @@
return 0
if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself
if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
if(P.is_reflectable)
if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
visible_message("<span class='danger'>The [P.name] gets reflected by [src]!</span>", \
"<span class='userdanger'>The [P.name] gets reflected by [src]!</span>")
+1
View File
@@ -40,6 +40,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 delete the projectile.
var/is_reflectable = FALSE // Can it be reflected or not?
//Effects
var/stun = 0
var/knockdown = 0
@@ -13,6 +13,7 @@
light_color = LIGHT_COLOR_RED
ricochets_max = 50 //Honk!
ricochet_chance = 80
is_reflectable = TRUE
/obj/item/projectile/beam/laser
@@ -4,6 +4,7 @@
damage = 0
damage_type = BURN
flag = "energy"
is_reflectable = TRUE
/obj/item/projectile/energy/chameleon
nodamage = TRUE