From 1c5f33b0fd9ec148fdfbed1f8789eae7c73f7171 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 7 Feb 2021 17:35:16 +0100
Subject: [PATCH] [MIRROR] Makes keybinding conflict messages use smaller spans
(#3176)
* Make keybinding conflict spans less loud (#56707)
Each time new keybindings are added, we receive a message at the
beginning of each round telling us about keybindings we've set that
conflict with what the new ones default to. This is desirable. However,
it could take up less space while still drawing the eye.
* Makes keybinding conflict messages use smaller spans
Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
---
code/modules/client/preferences_savefile.dm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index bcaa1e545c7..53ef512b46b 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -126,12 +126,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
addtimer(CALLBACK(src, .proc/announce_conflict, notadded), 5 SECONDS)
/datum/preferences/proc/announce_conflict(list/notadded)
- to_chat(parent, "KEYBINDING CONFLICT!!!\n\
- There are new keybindings that have defaults bound to keys you already set, They will default to Unbound. You can bind them in Setup Character or Game Preferences\n\
- Or you can click here to go straight to the keybindings page")
+ to_chat(parent, "KEYBINDING CONFLICT\n\
+ There are new keybindings that default to keys you've already bound. These will be unbound.")
for(var/item in notadded)
var/datum/keybinding/conflicted = item
- to_chat(parent, "[conflicted.category]: [conflicted.full_name] needs updating")
+ to_chat(parent, "[conflicted.category]: [conflicted.full_name] needs updating")
LAZYADD(key_bindings["Unbound"], conflicted.name) // set it to unbound to prevent this from opening up again in the future