Merge pull request #12808 from FreeStylaLT/reflecting_on_reflections

Fixes reflectors and a Projectile angle bug
This commit is contained in:
Crazy Lemon
2019-12-16 18:36:49 -08:00
committed by GitHub
3 changed files with 7 additions and 3 deletions
+5 -1
View File
@@ -12,9 +12,9 @@
/obj/structure/reflector/bullet_act(obj/item/projectile/P)
var/turf/reflector_turf = get_turf(src)
var/turf/reflect_turf
var/new_dir = get_reflection(dir, P.dir)
if(!istype(P, /obj/item/projectile/beam))
return ..()
var/new_dir = get_reflection(dir, P.dir)
if(new_dir)
reflect_turf = get_step(reflect_turf, new_dir)
else
@@ -30,6 +30,10 @@
P.current = reflector_turf
P.yo = reflect_turf.y - reflector_turf.y
P.xo = reflect_turf.x - reflector_turf.x
P.ignore_source_check = TRUE //If shot by a laser, will now hit the mob that fired it
var/reflect_angle = dir2angle(new_dir)
P.setAngle(reflect_angle)
new_dir = 0
return -1