From ca55e5f8b066d1552731102fa3527fdb01a600ee Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 14 Nov 2019 16:36:55 -0700
Subject: [PATCH] Merge pull request #9804 from Ghommie/Ghommie-cit351

Unmodularize keybindings.
---
 code/modules/keybindings/bindings_carbon.dm         |  3 +++
 code/modules/keybindings/bindings_human.dm          | 12 +++++++++++-
 code/modules/keybindings/bindings_robot.dm          | 12 +++++++++++-
 .../code/modules/keybindings/bindings_carbon.dm     |  6 ------
 .../code/modules/keybindings/bindings_human.dm      | 13 -------------
 .../code/modules/keybindings/bindings_robot.dm      | 13 -------------
 tgstation.dme                                       |  3 ---
 7 files changed, 25 insertions(+), 37 deletions(-)
 delete mode 100644 modular_citadel/code/modules/keybindings/bindings_carbon.dm
 delete mode 100644 modular_citadel/code/modules/keybindings/bindings_human.dm
 delete mode 100644 modular_citadel/code/modules/keybindings/bindings_robot.dm

diff --git a/code/modules/keybindings/bindings_carbon.dm b/code/modules/keybindings/bindings_carbon.dm
index d17f10e9..a982273c 100644
--- a/code/modules/keybindings/bindings_carbon.dm
+++ b/code/modules/keybindings/bindings_carbon.dm
@@ -15,4 +15,7 @@
 		if("4")
 			a_intent_change("harm")
 			return
+		if("C")
+			toggle_combat_mode()
+			return
 	return ..()
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_human.dm b/code/modules/keybindings/bindings_human.dm
index 5d02d9ae..38870c38 100644
--- a/code/modules/keybindings/bindings_human.dm
+++ b/code/modules/keybindings/bindings_human.dm
@@ -1,4 +1,7 @@
 /mob/living/carbon/human/key_down(_key, client/user)
+	if("Shift")
+		sprint_hotkey(TRUE)
+		return
 	if(client.keys_held["Shift"])
 		switch(_key)
 			if("E") // Put held thing in belt or take out most recent thing from belt
@@ -56,4 +59,11 @@
 					return
 				stored.attack_hand(src) // take out thing from backpack
 				return
-	return ..()
\ No newline at end of file
+	return ..()
+
+/mob/living/carbon/human/key_up(_key, client/user)
+	switch(_key)
+		if("Shift")
+			sprint_hotkey(FALSE)
+			return
+	return ..()
diff --git a/code/modules/keybindings/bindings_robot.dm b/code/modules/keybindings/bindings_robot.dm
index 2354f33c..29fb36fa 100644
--- a/code/modules/keybindings/bindings_robot.dm
+++ b/code/modules/keybindings/bindings_robot.dm
@@ -9,4 +9,14 @@
 		if("Q")
 			uneq_active()
 			return
-	return ..()
\ No newline at end of file
+		if("Shift")
+			sprint_hotkey(TRUE)
+			return
+	return ..()
+
+/mob/living/silicon/robot/key_up(_key, client/user)
+	switch(_key)
+		if("Shift")
+			sprint_hotkey(FALSE)
+			return
+	return ..()
diff --git a/modular_citadel/code/modules/keybindings/bindings_carbon.dm b/modular_citadel/code/modules/keybindings/bindings_carbon.dm
deleted file mode 100644
index d49cbcf4..00000000
--- a/modular_citadel/code/modules/keybindings/bindings_carbon.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/mob/living/carbon/key_down(_key, client/user)
-	switch(_key)
-		if("C")
-			toggle_combat_mode()
-			return
-	return ..()
diff --git a/modular_citadel/code/modules/keybindings/bindings_human.dm b/modular_citadel/code/modules/keybindings/bindings_human.dm
deleted file mode 100644
index ffe88bd4..00000000
--- a/modular_citadel/code/modules/keybindings/bindings_human.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/mob/living/carbon/human/key_down(_key, client/user)
-	switch(_key)
-		if("Shift")
-			sprint_hotkey(TRUE)
-			return
-	return ..()
-
-/mob/living/carbon/human/key_up(_key, client/user)
-	switch(_key)
-		if("Shift")
-			sprint_hotkey(FALSE)
-			return
-	return ..()
diff --git a/modular_citadel/code/modules/keybindings/bindings_robot.dm b/modular_citadel/code/modules/keybindings/bindings_robot.dm
deleted file mode 100644
index d3b6248f..00000000
--- a/modular_citadel/code/modules/keybindings/bindings_robot.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-/mob/living/silicon/robot/key_down(_key, client/user)
-	switch(_key)
-		if("Shift")
-			sprint_hotkey(TRUE)
-			return
-	return ..()
-
-/mob/living/silicon/robot/key_up(_key, client/user)
-	switch(_key)
-		if("Shift")
-			sprint_hotkey(FALSE)
-			return
-	return ..()
diff --git a/tgstation.dme b/tgstation.dme
index 0c4aed70..f53f9053 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3192,9 +3192,6 @@
 #include "modular_citadel\code\modules\food_and_drinks\snacks\meat.dm"
 #include "modular_citadel\code\modules\integrated_electronics\subtypes\manipulation.dm"
 #include "modular_citadel\code\modules\jobs\dresscode_values.dm"
-#include "modular_citadel\code\modules\keybindings\bindings_carbon.dm"
-#include "modular_citadel\code\modules\keybindings\bindings_human.dm"
-#include "modular_citadel\code\modules\keybindings\bindings_robot.dm"
 #include "modular_citadel\code\modules\mentor\follow.dm"
 #include "modular_citadel\code\modules\mentor\mentor.dm"
 #include "modular_citadel\code\modules\mentor\mentor_memo.dm"