From 3c0931ba7d7c04ab4fd11edd37ad1c3f510f6f5f Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Wed, 30 Sep 2015 01:34:51 +0200
Subject: [PATCH] Better hotkey mode handling

---
 code/modules/mob/living/login.dm               |  1 -
 code/modules/mob/living/silicon/robot/login.dm | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index f7690611e53..9c3cac087a4 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -1,4 +1,3 @@
-
 /mob/living/Login()
 	..()
 	//Mind updates
diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm
index aedd8cf32f4..6d030c026b8 100644
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -1,5 +1,7 @@
 /mob/living/silicon/robot/Login()
 	..()
+	if(client)
+		client.hotkeytype = "Cyborg"
 	regenerate_icons()
 	show_laws(0)
 	if(mind)	ticker.mode.remove_cultist(mind)
@@ -7,15 +9,3 @@
 	if(mind)	ticker.mode.remove_thrall(mind,0)
 	if(mind)	ticker.mode.remove_shadowling(mind)
 	return
-	
-/mob/living/silicon/robot/update_hotkey_mode()
-	if(client)
-		client.hotkeytype = "Cyborg"
-		client.hotkeyon = 1
-	winset(src, null, "mainwindow.macro=borghotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#F0F0F0")
-
-/mob/living/silicon/robot/update_normal_mode()
-	if(client)
-		client.hotkeytype = "Cyborg"
-		client.hotkeyon = 0
-	winset(src, null, "mainwindow.macro=borgmacro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")
\ No newline at end of file