From 070ee9b86adb6ae4bd3a852b240cb2519b7e7aa5 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Mon, 22 May 2017 07:44:10 -0500
Subject: [PATCH 1/2] Fixes shooting out of view windows

---
 code/_onclick/click.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index ad4a84529b..39926cd2fd 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -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))
@@ -446,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

From 34f82efdd70ecc6e3a0e4ac5047ab8af87731456 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 24 May 2017 08:30:23 -0500
Subject: [PATCH 2/2] mind over matter

---
 code/_onclick/click.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 685723127d..a8e2681dc9 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -326,8 +326,8 @@
 /mob/living/carbon/human/CtrlClick(mob/user)
 	if(ishuman(user) && Adjacent(user))
 		var/mob/living/carbon/human/H = user
-		H.dna.species.grab(H, src, H.martial_art)
-		H.next_click = world.time + CLICK_CD_MELEE
+		H.dna.species.grab(H, src, H.mind.martial_art)
+		H.changeNext_move(CLICK_CD_MELEE)
 	else
 		..()
 /*