Merge pull request #7024 from sabiram/dev

Adds 'me' hotkey, updates hotkeys-help

interface/interface.dm

@@ -46,8 +46,9 @@ Hotkey-Mode: (hotkey-mode must be on)
 \te = equip
 \tr = throw
 \tt = say
+\ty = emote
 \tx = swap-hand
-\tz = activate held object (or y)
+\tz = activate held object
 \tf = cycle-intents-left
 \tg = cycle-intents-right
 \t1 = help-intent
@@ -73,6 +74,10 @@ Any-Mode: (hotkey doesn't need to be on)
 \tCtrl+2 = disarm-intent
 \tCtrl+3 = grab-intent
 \tCtrl+4 = harm-intent
+\tF1 = adminhelp
+\tF2 = ooc
+\tF3 = say
+\tF4 = emote
 \tDEL = pull
 \tINS = cycle-intents-right
 \tHOME = drop

interface/skin.dmf

@@ -367,7 +367,7 @@ macro "hotkeymode"
 		is-disabled = false
 	elem 
 		name = "Y"
-		command = "Activate-Held-Object"
+		command = "me"
 		is-disabled = false
 	elem 
 		name = "CTRL+Y"