From 25fe463eb2a0c2fa16f57754e75775b7ee19d2f7 Mon Sep 17 00:00:00 2001 From: MrStonedOne Date: Mon, 31 Mar 2014 22:04:33 -0700 Subject: [PATCH] Ensures re-humaned cyborgs get normal macros. --- code/modules/mob/living/silicon/robot/login.dm | 4 ++++ code/modules/mob/login.dm | 2 ++ 2 files changed, 6 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm index dc539bf2297..2ee3d634b05 100644 --- a/code/modules/mob/living/silicon/robot/login.dm +++ b/code/modules/mob/living/silicon/robot/login.dm @@ -1,7 +1,11 @@ + + /mob/living/silicon/robot/Login() ..() regenerate_icons() show_laws(0) if(mind) ticker.mode.remove_revolutionary(mind) + winset(src, null, "mainwindow.macro=borgmacro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5") + return \ No newline at end of file diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 5d7d3c7f81f..4dfaf4be75d 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -47,4 +47,6 @@ if(isobj(loc)) var/obj/Loc=loc Loc.on_log() + //set macro to normal incase it was overriden (like cyborg currently does) + winset(src, null, "mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")