fixes

2020-04-11 05:11:42 -07:00
parent 234687c5c8
commit 41f359db83
3 changed files with 21 additions and 19 deletions
@@ -22,6 +22,23 @@
 		if ("V")
 			lay_down()
 			return
+		if("Insert")
+			if(client.keys_held["Ctrl"])
+				keybind_toggle_active_blocking()
+				return
+			else
+				keybind_parry()
+				return
+		if("G")
+			keybind_parry()
+			return
+		if("F")
+			keybind_start_active_blocking()
+	return ..()

-
-	return ..()
+/mob/living/key_up(_key, client/user)
+	switch(_key)
+		if("F")
+			keybind_stop_active_blocking()
+			return
+	return ..()
@@ -10,18 +10,6 @@
 			else
 				stop_pulling()
 			return
-		if("Insert")
-			if(client.keys_held["Ctrl"])
-				keybind_toggle_active_blocking()
-				return
-			else
-				keybind_parry()
-				return
-		if("G")
-			keybind_parry()
-			return
-		if("F")
-			keybind_start_active_blocking()
 		if("X", "Northeast") // Northeast is Page-up
 			swap_hand()
 			return
@@ -97,7 +85,4 @@
 		if("Alt")
 			toggle_move_intent()
 			return
-		if("F")
-			keybind_stop_active_blocking()
-			return
 	return ..()