From 2fcdcafced09f15abc647d0700f8a55c8d31336c Mon Sep 17 00:00:00 2001 From: tortellinitony Date: Mon, 8 Jan 2018 17:55:18 -0500 Subject: [PATCH 1/2] Makes a hotkey for asay --- code/controllers/subsystem/input.dm | 2 +- code/modules/keybindings/bindings_admin.dm | 3 +++ interface/interface.dm | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 6ffd12264f1..370c53343c6 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -58,7 +58,7 @@ SUBSYSTEM_DEF(input) "North", "East", "South", "West", "Northeast", "Southeast", "Northwest", "Southwest", "Insert", "Delete", "Ctrl", "Alt", - "F1", "F2", "F5", "F6", "F7", "F8", "F12", + "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", ) for(var/i in 1 to oldmode_keys.len) diff --git a/code/modules/keybindings/bindings_admin.dm b/code/modules/keybindings/bindings_admin.dm index 812bb957842..0aae9e0d2d0 100644 --- a/code/modules/keybindings/bindings_admin.dm +++ b/code/modules/keybindings/bindings_admin.dm @@ -1,5 +1,8 @@ /datum/admins/key_down(_key, client/user) switch(_key) + if("F3") + user.asay() + return if("F5") user.admin_ghost() return diff --git a/interface/interface.dm b/interface/interface.dm index 9b87479a337..0994a72a59e 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -78,6 +78,7 @@ var/adminhotkeys = {" Admin: +\tF3 = asay \tF5 = Aghost (admin-ghost) \tF6 = player-panel \tF7 = admin-pm From 5d8ff3164dd40d1be38a1084be7c8fb95f26bde4 Mon Sep 17 00:00:00 2001 From: tortellinitony Date: Mon, 8 Jan 2018 18:07:16 -0500 Subject: [PATCH 2/2] Wrong name --- code/modules/keybindings/bindings_admin.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/keybindings/bindings_admin.dm b/code/modules/keybindings/bindings_admin.dm index 0aae9e0d2d0..cf57ffc6c13 100644 --- a/code/modules/keybindings/bindings_admin.dm +++ b/code/modules/keybindings/bindings_admin.dm @@ -1,7 +1,7 @@ /datum/admins/key_down(_key, client/user) switch(_key) if("F3") - user.asay() + user.cmd_admin_say() return if("F5") user.admin_ghost()