Merge pull request #3504 from Citadel-Station-13/upstream-merge-31848

[MIRROR] Lets you press Ctrl+H (or just H in hotkey mode) to stop pulling

interface/interface.dm

@@ -116,6 +116,7 @@ Hotkey-Mode: (hotkey-mode must be on)
 \tt = say
 \to = OOC
 \tb = resist
+\t<B></B>h = stop pulling
 \tx = swap-hand
 \tz = activate held object (or y)
 \tf = cycle-intents-left
@@ -138,6 +139,7 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+e = equip
 \tCtrl+r = throw
 \tCtrl+b = resist
+\tCtrl+h = stop pulling
 \tCtrl+o = OOC
 \tCtrl+x = swap-hand
 \tCtrl+z = activate held object (or Ctrl+y)
@@ -149,7 +151,7 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+4 = harm-intent
 \tCtrl+'+/-' OR
 \tShift+Mousewheel = Ghost zoom in/out
-\tDEL = pull
+\tDEL = stop pulling
 \tINS = cycle-intents-right
 \tHOME = drop
 \tPGUP = swap-hand
@@ -171,9 +173,9 @@ Hotkey-Mode: (hotkey-mode must be on)
 \td = right
 \tw = up
 \tq = unequip active module
+\t<B></B>h = stop pulling
 \tm = me
 \tt = say
-\t<B></B>h = talk-wheel
 \to = OOC
 \tx = cycle active modules
 \tb = resist
@@ -195,7 +197,7 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+q = unequip active module
 \tCtrl+x = cycle active modules
 \tCtrl+b = resist
-\tCtrl+h = talk-wheel
+\tCtrl+h = stop pulling
 \tCtrl+o = OOC
 \tCtrl+z = activate held object (or Ctrl+y)
 \tCtrl+f = cycle-intents-left
@@ -204,7 +206,7 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+2 = activate module 2
 \tCtrl+3 = activate module 3
 \tCtrl+4 = toggle intents
-\tDEL = pull
+\tDEL = stop pulling
 \tINS = toggle intents
 \tPGUP = cycle active modules
 \tPGDN = activate held object

interface/skin.dmf

@@ -63,6 +63,10 @@ macro "default"
 		name = "DELETE"
 		command = "delete-key-pressed"
 		is-disabled = false
+	elem
+		name = "CTRL+H"
+		command = "delete-key-pressed"
+		is-disabled = false
 	elem 
 		name = "CTRL+1"
 		command = "a-intent help"
@@ -285,6 +289,10 @@ macro "hotkeys"
 		name = "DELETE"
 		command = "delete-key-pressed"
 		is-disabled = false
+	elem
+		name = "H"
+		command = "delete-key-pressed"
+		is-disabled = false
 	elem 
 		name = "1"
 		command = "a-intent help"
@@ -583,6 +591,10 @@ macro "robot-default"
 		name = "DELETE"
 		command = "delete-key-pressed"
 		is-disabled = false
+	elem
+		name = "CTRL+H"
+		command = "delete-key-pressed"
+		is-disabled = false
 	elem 
 		name = "CTRL+1"
 		command = "toggle-module 1"
@@ -777,6 +789,10 @@ macro "robot-hotkeys"
 		name = "DELETE"
 		command = "delete-key-pressed"
 		is-disabled = false
+	elem
+		name = "H"
+		command = "delete-key-pressed"
+		is-disabled = false
 	elem 
 		name = "1"
 		command = "toggle-module 1"