Merge pull request #1107 from Citadel-Station-13/upstream-merge-27495

[MIRROR] Fixes shooting out of view windows
This commit is contained in:
LetterJay
2017-05-24 10:30:09 -05:00
committed by GitHub
+3 -4
View File
@@ -92,7 +92,7 @@
if(next_move > world.time) // in the year 2000...
return
if(A.IsObscured())
if(!modifiers["catcher"] && A.IsObscured())
return
if(istype(loc,/obj/mecha))
@@ -325,8 +325,6 @@
/mob/living/carbon/human/CtrlClick(mob/user)
if(ishuman(user) && Adjacent(user))
if(world.time < user.next_move)
return FALSE
var/mob/living/carbon/human/H = user
H.dna.species.grab(H, src, H.mind.martial_art)
H.changeNext_move(CLICK_CD_MELEE)
@@ -448,6 +446,7 @@
C.swap_hand()
else
var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr))
params += "&catcher=1"
if(T)
T.Click(location, control, params)
. = 1
@@ -466,4 +465,4 @@
view = -1
else
view = 1
add_view_range(view)
add_view_range(view)