From 1f070cd60aeda88de5d7228780f6829faefc2fec Mon Sep 17 00:00:00 2001
From: Hubblenaut <aschnelle@web.de>
Date: Wed, 10 Dec 2014 18:04:13 +0100
Subject: [PATCH] Fixes Hotkey

---
 interface/interface.dm | 3 +--
 interface/skin.dmf     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/interface/interface.dm b/interface/interface.dm
index 47b8067875..9cf97cfd98 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -46,8 +46,7 @@ Hotkey-Mode: (hotkey-mode must be on)
 \te = equip
 \tr = throw
 \tt = say
-\ty = emote
-\tx = swap-hand
+\tx = swap-hand (or y)
 \tz = activate held object
 \tf = cycle-intents-left
 \tg = cycle-intents-right
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 7d8485e6ec..f8fc765e3e 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -367,7 +367,7 @@ macro "hotkeymode"
 		is-disabled = false
 	elem 
 		name = "Y"
-		command = "me"
+		command = "Activate-Held-Object"
 		is-disabled = false
 	elem 
 		name = "CTRL+Y"