From 8c83d4d51df3b9a93f27d3ef8fc441169df7b836 Mon Sep 17 00:00:00 2001
From: sabiram <lollol>
Date: Thu, 13 Nov 2014 18:32:10 -0500
Subject: [PATCH] Adds 'me' hotkey, updates hotkeys-help

It bothered me that there was no hotkey for emote that wasn't on the
function row. Y is now me. Activate-held-item is now only Z instead of Z
and Y.

The hotkeys-help verb in OOC tab is changed to include the changes
above, and the previously unmentioned function row hotkeys that are
pertinent to players. (Admin verbs are unmentioned)
---
 interface/interface.dm | 7 ++++++-
 interface/skin.dmf     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/interface/interface.dm b/interface/interface.dm
index 9dd939142b..47b8067875 100644
--- a/interface/interface.dm
+++ b/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
diff --git a/interface/skin.dmf b/interface/skin.dmf
index c83c988676..b8f5706a48 100644
--- a/interface/skin.dmf
+++ b/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"