From cebbac32e808f560d79da9fa729569bfccbd4938 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Tue, 11 Apr 2017 00:25:29 -0700 Subject: [PATCH] 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"