From cebbac32e808f560d79da9fa729569bfccbd4938 Mon Sep 17 00:00:00 2001
From: LorenLuke <LukeLLL@aol.com>
Date: Tue, 11 Apr 2017 00:25:29 -0700
Subject: [PATCH 1/3] Allows usage of ctrl+numpad for target zone selecting.

---
 code/modules/mob/mob.dm | 44 +++++++++++++++++++++++++++++++++++++++++
 interface/skin.dmf      | 28 ++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 57ad0859e1..3e0bbcd9ff 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1017,3 +1017,47 @@ mob/proc/yank_out_object()
 /mob/proc/is_muzzled()
 	return 0
 
+
+/client/proc/check_has_body_select()
+	return mob && mob.hud_used && istype(mob.zone_sel, /obj/screen/zone_sel)
+
+/client/verb/body_toggle_head()
+	set name = "body-toggle-head"
+	set hidden = 1
+	toggle_zone_sel(list(BP_HEAD,BP_EYES,BP_MOUTH))
+
+/client/verb/body_r_arm()
+	set name = "body-r-arm"
+	set hidden = 1
+	toggle_zone_sel(list(BP_R_ARM,BP_R_HAND))
+
+/client/verb/body_l_arm()
+	set name = "body-l-arm"
+	set hidden = 1
+	toggle_zone_sel(list(BP_L_ARM,BP_L_HAND))
+
+/client/verb/body_chest()
+	set name = "body-chest"
+	set hidden = 1
+	toggle_zone_sel(list(BP_CHEST))
+
+/client/verb/body_groin()
+	set name = "body-groin"
+	set hidden = 1
+	toggle_zone_sel(list(BP_GROIN))
+
+/client/verb/body_r_leg()
+	set name = "body-r-leg"
+	set hidden = 1
+	toggle_zone_sel(list(BP_R_LEG,BP_R_FOOT))
+
+/client/verb/body_l_leg()
+	set name = "body-l-leg"
+	set hidden = 1
+	toggle_zone_sel(list(BP_L_LEG,BP_L_FOOT))
+
+/client/proc/toggle_zone_sel(list/zones)
+	if(!check_has_body_select())
+		return
+	var/obj/screen/zone_sel/selector = mob.zone_sel
+	selector.set_selected_zone(next_in_list(mob.zone_sel.selecting,zones))
\ No newline at end of file
diff --git a/interface/skin.dmf b/interface/skin.dmf
index be23750148..2440677224 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -409,6 +409,34 @@ macro "macro"
 		name = "CTRL+Z"
 		command = "Activate-Held-Object"
 		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD1"
+		command = "body-r-leg"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD2"
+		command = "body-groin"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD3"
+		command = "body-l-leg"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD4"
+		command = "body-r-arm"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD5"
+		command = "body-chest"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD6"
+		command = "body-l-arm"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD8"
+		command = "body-toggle-head"
+		is-disabled = false
 	elem 
 		name = "F1"
 		command = "adminhelp"

From 69a8d84344667992e3baa400c9863d02d10a748f Mon Sep 17 00:00:00 2001
From: LorenLuke <LukeLLL@aol.com>
Date: Tue, 11 Apr 2017 00:39:21 -0700
Subject: [PATCH 2/3] Fixes a few errors.

---
 code/_onclick/hud/screen_objects.dm | 6 ++++++
 code/modules/mob/mob.dm             | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 3f6758c6ad..e55323fb3a 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -162,6 +162,12 @@
 		update_icon()
 	return 1
 
+/obj/screen/zone_sel/proc/set_selected_zone(bodypart)
+	var/old_selecting = selecting
+	selecting = bodypart
+	if(old_selecting != selecting)
+		update_icon()
+
 /obj/screen/zone_sel/update_icon()
 	overlays.Cut()
 	overlays += image('icons/mob/zone_sel.dmi', "[selecting]")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 3e0bbcd9ff..714bde7096 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1024,7 +1024,7 @@ mob/proc/yank_out_object()
 /client/verb/body_toggle_head()
 	set name = "body-toggle-head"
 	set hidden = 1
-	toggle_zone_sel(list(BP_HEAD,BP_EYES,BP_MOUTH))
+	toggle_zone_sel(list(BP_HEAD, O_EYES, O_MOUTH))
 
 /client/verb/body_r_arm()
 	set name = "body-r-arm"
@@ -1039,7 +1039,7 @@ mob/proc/yank_out_object()
 /client/verb/body_chest()
 	set name = "body-chest"
 	set hidden = 1
-	toggle_zone_sel(list(BP_CHEST))
+	toggle_zone_sel(list(BP_TORSO))
 
 /client/verb/body_groin()
 	set name = "body-groin"

From e60c5523966dfab0bfd32a1cbba1c74e065e9c0a Mon Sep 17 00:00:00 2001
From: LorenLuke <LukeLLL@aol.com>
Date: Wed, 12 Apr 2017 03:11:43 -0700
Subject: [PATCH 3/3] Adds ability to not just chat-mode.

---
 interface/skin.dmf | 84 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/interface/skin.dmf b/interface/skin.dmf
index 2440677224..7c92a788c1 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -215,6 +215,34 @@ macro "borghotkeymode"
 		name = "CTRL+Z"
 		command = "Activate-Held-Object"
 		is-disabled = false
+	elem 
+		name = "NUMPAD1"
+		command = "body-r-leg"
+		is-disabled = false
+	elem 
+		name = "NUMPAD2"
+		command = "body-groin"
+		is-disabled = false
+	elem 
+		name = "NUMPAD3"
+		command = "body-l-leg"
+		is-disabled = false
+	elem 
+		name = "NUMPAD4"
+		command = "body-r-arm"
+		is-disabled = false
+	elem 
+		name = "NUMPAD5"
+		command = "body-chest"
+		is-disabled = false
+	elem 
+		name = "NUMPAD6"
+		command = "body-l-arm"
+		is-disabled = false
+	elem 
+		name = "NUMPAD8"
+		command = "body-toggle-head"
+		is-disabled = false
 	elem 
 		name = "F1"
 		command = "adminhelp"
@@ -719,6 +747,34 @@ macro "hotkeymode"
 		name = "CTRL+Z"
 		command = "Activate-Held-Object"
 		is-disabled = false
+	elem 
+		name = "NUMPAD1"
+		command = "body-r-leg"
+		is-disabled = false
+	elem 
+		name = "NUMPAD2"
+		command = "body-groin"
+		is-disabled = false
+	elem 
+		name = "NUMPAD3"
+		command = "body-l-leg"
+		is-disabled = false
+	elem 
+		name = "NUMPAD4"
+		command = "body-r-arm"
+		is-disabled = false
+	elem 
+		name = "NUMPAD5"
+		command = "body-chest"
+		is-disabled = false
+	elem 
+		name = "NUMPAD6"
+		command = "body-l-arm"
+		is-disabled = false
+	elem 
+		name = "NUMPAD8"
+		command = "body-toggle-head"
+		is-disabled = false
 	elem 
 		name = "F1"
 		command = "adminhelp"
@@ -909,6 +965,34 @@ macro "borgmacro"
 		name = "CTRL+Z"
 		command = "Activate-Held-Object"
 		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD1"
+		command = "body-r-leg"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD2"
+		command = "body-groin"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD3"
+		command = "body-l-leg"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD4"
+		command = "body-r-arm"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD5"
+		command = "body-chest"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD6"
+		command = "body-l-arm"
+		is-disabled = false
+	elem 
+		name = "CTRL+NUMPAD8"
+		command = "body-head-toggle"
+		is-disabled = false
 	elem 
 		name = "F1"
 		command = "adminhelp"