shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
kevinz000
2020-04-24 23:39:08 -07:00
parent 62fd71c50e
commit abb7f199df
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click.dm
+1 -4
View File
@@ -69,9 +69,6 @@
return
next_click = world.time + world.tick_lag
// Hide typing indicator if we click
clear_typing_indicator()
if(check_click_intercept(params,A))
return
@@ -80,7 +77,7 @@
if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
return
var/list/modifiers = params2list(params)
if(modifiers["shift"] && modifiers["middle"])
ShiftMiddleClickOn(A)
code/controllers/subsystem/input.dm
+9 -9
View File
@@ -33,11 +33,11 @@ SUBSYSTEM_DEF(input)
"Tab" = "\".winset \\\"input.focus=true?map.focus=true input.background-color=[COLOR_INPUT_DISABLED]:input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
"O" = "ooc",
"Ctrl+O" = "looc",
"T" = "Say",
"Ctrl+T" = "SayWithIndicator",
"T" = "say",
"Ctrl+T" = "say_indicator",
"Y" = "whisper",
"M" = "Me",
"Ctrl+M" = "MeWithIndicator",
"M" = "me",
"Ctrl+M" = "me_indicator",
"5" = "subtle",
"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
"Any" = "\"KeyDown \[\[*\]\]\"",
@@ -45,17 +45,17 @@ SUBSYSTEM_DEF(input)
),
"old_default" = list(
"Tab" = "\".winset \\\"mainwindow.macro=old_hotkeys map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"",
"Ctrl+T" = "Say",
"Ctrl+T" = "say",
"Ctrl+O" = "ooc",
),
"old_hotkeys" = list(
"Tab" = "\".winset \\\"mainwindow.macro=old_default input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
"O" = "ooc",
"L" = "looc",
"T" = "Say",
"Ctrl+T" = "SayWithIndicator",
"M" = "Me",
"Ctrl+M" = "MeWithIndicator",
"T" = "say",
"Ctrl+T" = "say_indicator",
"M" = "me",
"Ctrl+M" = "me_indicator",
"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
"Any" = "\"KeyDown \[\[*\]\]\"",
"Any+UP" = "\"KeyUp \[\[*\]\]\"",
code/modules/mob/say.dm
+7 -7
View File
@@ -1,11 +1,11 @@
//Speech verbs.
// the _keybind verbs uses "as text" versus "as text|null" to force a popup when pressed by a keybind.
/mob/verb/say_typing_indicator()
set name = "SayWithIndicator"
set name = "say_indicator"
set hidden = TRUE
set category = "IC"
display_typing_indicator()
var/message = input(usr, "", "Say") as text|null
var/message = input(usr, "", "say") as text|null
// If they don't type anything just drop the message.
clear_typing_indicator() // clear it immediately!
if(!length(message))
@@ -13,7 +13,7 @@
return say_verb(message)
/mob/verb/say_verb(message as text)
set name = "Say"
set name = "say"
set category = "IC"
if(!length(message))
return
@@ -24,11 +24,11 @@
say(message)
/mob/verb/me_typing_indicator()
set name = "MeWithIndicator"
set name = "me_indicator"
set hidden = TRUE
set category = "IC"
display_typing_indicator()
var/message = input(usr, "", "Me") as message|null
var/message = input(usr, "", "me") as message|null
// If they don't type anything just drop the message.
clear_typing_indicator() // clear it immediately!
if(!length(message))
@@ -36,9 +36,8 @@
return me_verb(message)
/mob/verb/me_verb(message as message)
set name = "Me"
set name = "me"
set category = "IC"
clear_typing_indicator() // clear it immediately!
if(!length(message))
return
if(GLOB.say_disabled) //This is here to try to identify lag problems
@@ -46,6 +45,7 @@
return
message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
clear_typing_indicator() // clear it immediately!
usr.emote("me",1,message,TRUE)