From 54a6c5a6feea12ecf8ee288fd79c4c00844ea643 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 27 Feb 2020 23:58:49 -0700
Subject: [PATCH 01/14] Typing indicators

---
 code/controllers/subsystem/input.dm           |  39 ++++++++++++++++
 code/modules/keybindings/bindings_living.dm   |   1 -
 code/modules/keybindings/bindings_mob.dm      |  11 +++++
 .../mob/living/carbon/human/species.dm        |   8 ++++
 .../living/carbon/human/typing_indicator.dm   |   2 +
 code/modules/mob/living/say.dm                |   2 +-
 code/modules/mob/mob_defines.dm               |  10 ++++
 code/modules/mob/typing_indicator.dm          |  44 ++++++++++++++++++
 icons/mob/talk.dmi                            | Bin 5497 -> 5491 bytes
 tgstation.dme                                 |   4 +-
 10 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 code/modules/mob/living/carbon/human/typing_indicator.dm
 create mode 100644 code/modules/mob/typing_indicator.dm

diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index 0970b23a16..8a8e0ac7c9 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -8,6 +8,12 @@ SUBSYSTEM_DEF(input)
 
 	var/list/macro_sets
 	var/list/movement_keys
+	/*! Special thing (until we get custom keybinds that also support clientside macros :weary:) that lets us do stuff like look up "which key is say/me bound to". Special format too, the value of a key should be list(key, modifier1, modifier2, ...). "default" unless override.
+	 *  USE get_key_for_macro_id or get_typing_indicator_binds TO ACCESS!
+	 */
+	var/list/macro_set_reverse_lookups
+	/// cache these for speed.
+	var/list/typing_indicator_binds
 
 /datum/controller/subsystem/input/Initialize()
 	setup_default_macro_sets()
@@ -58,6 +64,32 @@ SUBSYSTEM_DEF(input)
 			),
 		)
 
+	macro_set_reverse_lookups = list(
+		"default" = list(
+			"say" = list("T"),
+			"whisper" = list("T", "Ctrl"),
+			"me" = list("M"),
+			"subtle" = list("M", "Ctrl")
+			),
+		"old_default" = list(
+			"say" = list("T", "Ctrl"),
+			),
+		"old_hotkeys" = list(
+			"say" = list("T"),
+			"me" = list("M"),
+			)
+		)
+
+	typing_indicator_binds = list()
+	var/static/list/typing_indicator_verbs = list("me", "say")
+	for(var/check_verb in typing_indicator_verbs)
+		for(var/macro_set in macro_set_reverse_lookups)
+			var/list/keylist = macro_set_reverse_lookups[macro_set][check_verb]
+			if(!keylist)
+				continue
+			var/key = keylist[1]
+			typing_indicator_binds[key] = TRUE
+
 	// Because i'm lazy and don't want to type all these out twice
 	var/list/old_default = default_macro_sets["old_default"]
 
@@ -117,3 +149,10 @@ SUBSYSTEM_DEF(input)
 	for(var/i in 1 to length(clients))
 		var/client/C = clients[i]
 		C.keyLoop()
+
+/datum/controller/subsystem/input/proc/get_key_for_macro_id(macro_id, macroset)
+	return macro_set_reverse_lookups[macroset][macro_id] || macro_set_reverse_lookups["default"][macro_id]
+
+/// Returns an associative list of keys without modifiers like ctrl. You have to do another lookup, this is for the first check to be faster.
+/datum/controller/subsystem/input/proc/get_typing_indicator_binds(macroset)
+	return typing_indicator_binds[macroset]
diff --git a/code/modules/keybindings/bindings_living.dm b/code/modules/keybindings/bindings_living.dm
index ec6c5dd539..b338c5e899 100644
--- a/code/modules/keybindings/bindings_living.dm
+++ b/code/modules/keybindings/bindings_living.dm
@@ -23,5 +23,4 @@
 			lay_down()
 			return
 
-
 	return ..()
\ No newline at end of file
diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index 964ee65047..6d413b4166 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -3,6 +3,17 @@
 // Or we can have NPC's send actual keypresses and detect that by seeing no client
 
 /mob/key_down(_key, client/user)
+	if(SSinput.typing_indicator_binds[_key])
+		var/macroset = winget(user, "mainwindow", "macro")
+		var/list/L = SSinput.macro_set_reverse_lookups[macroset]
+		var/valid = TRUE
+		if(length(L) > 1)
+			for(var/modifier in 2 to length(L))
+				if(!client.keys_held[modifier])
+					valid = FALSE
+					break
+		if(valid)
+			display_typing_indicator()
 	switch(_key)
 		if("Delete", "H")
 			if(!pulling)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index b1bc47ea4a..52e14a43e4 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -106,6 +106,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/whitelist = list() 		//List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
 	var/should_draw_citadel = FALSE
 
+	/// Our default override for typing indicator state
+	var/typing_indicator_state
+
 ///////////
 // PROCS //
 ///////////
@@ -2218,3 +2221,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 /datum/species/proc/start_wagging_tail(mob/living/carbon/human/H)
 
 /datum/species/proc/stop_wagging_tail(mob/living/carbon/human/H)
+
+
+/////// TYPING INDICATORS ///////
+/datum/species/proc/get_typing_indicator_state()
+	return typing_indicator_state
diff --git a/code/modules/mob/living/carbon/human/typing_indicator.dm b/code/modules/mob/living/carbon/human/typing_indicator.dm
new file mode 100644
index 0000000000..6d420c1f7b
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/typing_indicator.dm
@@ -0,0 +1,2 @@
+/mob/living/carbon/human/get_typing_indicator_icon_state()
+	return dna?.species?.get_typing_indicator_state() || ..()
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 35b49cce8e..f90b285d2d 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -354,7 +354,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 
 	if(cultslurring)
 		message = cultslur(message)
-	
+
 	if(clockcultslurring)
 		message = CLOCK_CULT_SLUR(message)
 
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index c45f6eec13..7a3959ed8f 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -128,3 +128,13 @@
 
 	var/flavor_text = ""
 	var/flavor_text_2 = "" //version of the above that only lasts for the current round.
+
+	///////TYPING INDICATORS///////
+	/// Set to true if we want to show typing indicators.
+	var/typing_indicator_enabled = FALSE
+	/// Default icon_state of our typing indicator. Currently only supports paths (because anything else is, as of time of typing this, unnecesary.
+	var/typing_indicator_state = /obj/effect/overlay/typing_indicator
+	/// The timer that will remove our indicator for early aborts (like when an user finishes their message)
+	var/typing_indicator_timerid
+	/// Default typing indicator timeout
+	var/typing_indicator_timeout = 30 SECONDS
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
new file mode 100644
index 0000000000..92710e2434
--- /dev/null
+++ b/code/modules/mob/typing_indicator.dm
@@ -0,0 +1,44 @@
+/// state = overlay/image/object/type/whatever add_overlay will accept
+GLOBAL_LIST_EMPTY(typing_indicator_overlays)
+
+/// Fetches the typing indicator we'll use from GLOB.typing_indicator_overlays
+/mob/proc/get_indicator_overlay(state)
+	. = GLOB.typing_indicator_overlays[state]
+	if(.)
+		return
+	// doesn't exist, make it and cache it
+	if(ispath(state))
+		. = GLOB.typing_indicator_overlays[state] = state
+	// We only support paths for now because anything else isn't necessary yet.
+
+/// Gets the state we will use for typing indicators. Defaults to src.typing_indicator_state
+/mob/proc/get_typing_indicator_icon_state()
+	return typing_indicator_state
+
+/*!
+ * Displays typing indicator.
+ * @param timeout_override - Sets how long until this will disappear on its own without the user finishing their message or logging out. Defaults to src.typing_indicator_timeout
+ * @param state_override - Sets the state that we will fetch. Defaults to src.get_typing_indicator_icon_state()
+ * @param force - shows even if src.typing_indcator_enabled is FALSE.
+ */
+/mob/proc/display_typing_indicator(timeout_override = typing_indicator_timeout, state_override = get_typing_indicator_icon_state(), force = FALSE)
+	if(!typing_indicator_enabled || force)
+		return
+	add_overlay(get_indicator_overlay(state_override))
+	addtimer(CALLBACK(src, .proc/clear_typing_indicator, state_override), timeout_override, TIMER_STOPPABLE)
+
+/*!
+ * Removes typing indicator.
+ * @param state_override Sets the state that we will remove. Defaults to src.get_typing_indicator_icon_state()
+ */
+/mob/proc/clear_typing_indicator(state_override = get_typing_indicator_icon_state())
+	deltimer(typing_indicator_timerid)
+	cut_overlay(get_indicator_overlay(state_override))
+
+/// Default typing indicator
+/obj/effect/overlay/typing_indicator
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	icon = 'icons/mob/talk.dmi'
+	icon_state = "default_typing"
+	appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
+	layer = LARGE_MOB_LAYER
diff --git a/icons/mob/talk.dmi b/icons/mob/talk.dmi
index 05fe6f56236377f0227fcb4b11800a2bd837ba17..2e300b5a290ba932ecb8408f5b1f2b41e652b455 100644
GIT binary patch
delta 4148
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
QLcq^iXD_Gf(}>&u1vJCV9{>OV

delta 4153
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

diff --git a/tgstation.dme b/tgstation.dme
index 9ecf1ddd5e..5f14d2285a 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -79,8 +79,8 @@
 #include "code\__DEFINES\obj_flags.dm"
 #include "code\__DEFINES\pinpointers.dm"
 #include "code\__DEFINES\pipe_construction.dm"
-#include "code\__DEFINES\power.dm"
 #include "code\__DEFINES\pool.dm"
+#include "code\__DEFINES\power.dm"
 #include "code\__DEFINES\preferences.dm"
 #include "code\__DEFINES\procpath.dm"
 #include "code\__DEFINES\profile.dm"
@@ -2109,6 +2109,7 @@
 #include "code\modules\mob\say_vr.dm"
 #include "code\modules\mob\status_procs.dm"
 #include "code\modules\mob\transform_procs.dm"
+#include "code\modules\mob\typing_indicator.dm"
 #include "code\modules\mob\update_icons.dm"
 #include "code\modules\mob\camera\camera.dm"
 #include "code\modules\mob\dead\dead.dm"
@@ -2231,6 +2232,7 @@
 #include "code\modules\mob\living\carbon\human\say.dm"
 #include "code\modules\mob\living\carbon\human\species.dm"
 #include "code\modules\mob\living\carbon\human\status_procs.dm"
+#include "code\modules\mob\living\carbon\human\typing_indicator.dm"
 #include "code\modules\mob\living\carbon\human\update_icons.dm"
 #include "code\modules\mob\living\carbon\human\species_types\abductors.dm"
 #include "code\modules\mob\living\carbon\human\species_types\android.dm"

From ed304a8fdc99b39920729c739ce5fe127a8bf831 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 4 Mar 2020 02:42:24 -0700
Subject: [PATCH 02/14] whew!

---
 icons/mob/talk.dmi | Bin 5491 -> 8698 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/mob/talk.dmi b/icons/mob/talk.dmi
index 2e300b5a290ba932ecb8408f5b1f2b41e652b455..0a563210378ee6a14a958cff5a1dc88fe6501434 100644
GIT binary patch
literal 8698
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

literal 5491
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
Ai2wiq


From e243dc689bda5e7a5a78690aa9f599b6b1aceb2a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 4 Mar 2020 03:12:46 -0700
Subject: [PATCH 03/14] index

---
 code/modules/keybindings/bindings_mob.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index 6d413b4166..c3ffa97237 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -8,8 +8,8 @@
 		var/list/L = SSinput.macro_set_reverse_lookups[macroset]
 		var/valid = TRUE
 		if(length(L) > 1)
-			for(var/modifier in 2 to length(L))
-				if(!client.keys_held[modifier])
+			for(var/i in 2 to length(L))
+				if(!client.keys_held[L[i]])
 					valid = FALSE
 					break
 		if(valid)

From 1ae4ef16bc328d5c5cd82ab7f11fb922c9b97458 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 4 Mar 2020 06:03:51 -0700
Subject: [PATCH 04/14] sigh

---
 code/controllers/subsystem/input.dm      |  4 +++-
 code/modules/keybindings/bindings_mob.dm | 20 ++++++++++++++------
 code/modules/mob/typing_indicator.dm     |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index 8a8e0ac7c9..2d80cb7f3c 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -14,6 +14,8 @@ SUBSYSTEM_DEF(input)
 	var/list/macro_set_reverse_lookups
 	/// cache these for speed.
 	var/list/typing_indicator_binds
+	/// same
+	var/static/list/typing_indicator_verbs
 
 /datum/controller/subsystem/input/Initialize()
 	setup_default_macro_sets()
@@ -80,8 +82,8 @@ SUBSYSTEM_DEF(input)
 			)
 		)
 
+	typing_indicator_verbs = list("me", "say")
 	typing_indicator_binds = list()
-	var/static/list/typing_indicator_verbs = list("me", "say")
 	for(var/check_verb in typing_indicator_verbs)
 		for(var/macro_set in macro_set_reverse_lookups)
 			var/list/keylist = macro_set_reverse_lookups[macro_set][check_verb]
diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index c3ffa97237..07df11f343 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -3,15 +3,22 @@
 // Or we can have NPC's send actual keypresses and detect that by seeing no client
 
 /mob/key_down(_key, client/user)
+	to_chat(world, "DEBUG: key_down [_key]")
 	if(SSinput.typing_indicator_binds[_key])
 		var/macroset = winget(user, "mainwindow", "macro")
 		var/list/L = SSinput.macro_set_reverse_lookups[macroset]
-		var/valid = TRUE
-		if(length(L) > 1)
-			for(var/i in 2 to length(L))
-				if(!client.keys_held[L[i]])
-					valid = FALSE
-					break
+		to_chat(world, "DEBUG: Looking up list [macroset] = [english_list(L)]")
+		to_chat(world, "DEBUG: Client.keys_held = [english_list(client.keys_held)]")
+		var/valid = FALSE
+		for(var/the_verb in L)
+			if(the_verb in SSinput.typing_indicator_verbs)
+				var/list/keys = L[the_verb]
+				valid = TRUE
+				if(length(keys) > 1)
+					for(var/i in 2 to length(keys))
+						if(!client.keys_held[keys[i]])
+							valid = FALSE
+							break
 		if(valid)
 			display_typing_indicator()
 	switch(_key)
@@ -86,6 +93,7 @@
 	return ..()
 
 /mob/key_up(_key, client/user)
+	to_chat(world, "DEBUG: key_up [_key]")
 	switch(_key)
 		if("Alt")
 			toggle_move_intent()
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 92710e2434..2587839cb8 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -39,6 +39,6 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
 /obj/effect/overlay/typing_indicator
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	icon = 'icons/mob/talk.dmi'
-	icon_state = "default_typing"
+	icon_state = "normal_typing"
 	appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
 	layer = LARGE_MOB_LAYER

From c28a78de3d9c717e7447f91277b77aec9877be4a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 4 Mar 2020 06:41:53 -0700
Subject: [PATCH 05/14] ok

---
 code/modules/keybindings/bindings_mob.dm  | 4 ----
 code/modules/mob/living/living_defines.dm | 2 ++
 code/modules/mob/say.dm                   | 4 +++-
 code/modules/mob/say_vr.dm                | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index 07df11f343..159134508b 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -3,12 +3,9 @@
 // Or we can have NPC's send actual keypresses and detect that by seeing no client
 
 /mob/key_down(_key, client/user)
-	to_chat(world, "DEBUG: key_down [_key]")
 	if(SSinput.typing_indicator_binds[_key])
 		var/macroset = winget(user, "mainwindow", "macro")
 		var/list/L = SSinput.macro_set_reverse_lookups[macroset]
-		to_chat(world, "DEBUG: Looking up list [macroset] = [english_list(L)]")
-		to_chat(world, "DEBUG: Client.keys_held = [english_list(client.keys_held)]")
 		var/valid = FALSE
 		for(var/the_verb in L)
 			if(the_verb in SSinput.typing_indicator_verbs)
@@ -93,7 +90,6 @@
 	return ..()
 
 /mob/key_up(_key, client/user)
-	to_chat(world, "DEBUG: key_up [_key]")
 	switch(_key)
 		if("Alt")
 			toggle_move_intent()
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 7106d003ee..f57edee9d1 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -5,6 +5,8 @@
 	hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,NANITE_HUD,DIAG_NANITE_FULL_HUD,RAD_HUD)
 	pressure_resistance = 10
 
+	typing_indicator_enabled = TRUE
+
 	var/resize = 1 //Badminnery resize
 	var/lastattacker = null
 	var/lastattackerckey = null
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index f348829b71..8b2d9ef0c4 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -2,6 +2,7 @@
 /mob/verb/say_verb(message as text)
 	set name = "Say"
 	set category = "IC"
+	clear_typing_indicator()		// clear it immediately!
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
@@ -19,6 +20,7 @@
 /mob/verb/whisper_verb(message as text)
 	set name = "Whisper"
 	set category = "IC"
+	clear_typing_indicator()		// clear it immediately!
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
@@ -30,7 +32,7 @@
 /mob/verb/me_verb(message as message)
 	set name = "Me"
 	set category = "IC"
-
+	clear_typing_indicator()		// clear it immediately!
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 377bb1c5fc..ec82b41cca 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -23,7 +23,6 @@ proc/get_top_level_mob(var/mob/S)
 	message = null
 	mob_type_blacklist_typecache = list(/mob/living/brain)
 
-
 /datum/emote/living/subtle/proc/check_invalid(mob/user, input)
 	if(stop_bad_mime.Find(input, 1, 1))
 		to_chat(user, "<span class='danger'>Invalid emote.</span>")

From 0d312b8dff347c14bf996a9421889c4ef0658cc8 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 4 Mar 2020 08:02:28 -0700
Subject: [PATCH 06/14] only way

---
 code/modules/keybindings/bindings_mob.dm | 2 ++
 code/modules/mob/say.dm                  | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index 159134508b..6c7b3031c5 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -19,6 +19,8 @@
 		if(valid)
 			display_typing_indicator()
 	switch(_key)
+		if("Escape")
+			clear_typing_indicator()
 		if("Delete", "H")
 			if(!pulling)
 				to_chat(src, "<span class='notice'>You are not pulling anything.</span>")
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 8b2d9ef0c4..ac5924f6d8 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -3,11 +3,12 @@
 	set name = "Say"
 	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
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
-	if(message)
-		say(message)
+	say(message)
 
 /mob/say_mod(input, message_mode)
 	var/customsayverb = findtext(input, "*")
@@ -21,6 +22,8 @@
 	set name = "Whisper"
 	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
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
@@ -33,6 +36,8 @@
 	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
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return

From d1f161fe0f56973ecce55df22e2fa1c35395728c Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:42:01 -0700
Subject: [PATCH 07/14] changes

---
 code/controllers/subsystem/input.dm           | 10 ++++----
 code/modules/keybindings/bindings_mob.dm      |  2 +-
 .../mob/living/carbon/human/species.dm        |  5 ----
 .../living/carbon/human/typing_indicator.dm   |  2 +-
 code/modules/mob/say.dm                       | 23 +++++++++++++++++--
 code/modules/mob/typing_indicator.dm          | 23 ++++++++++---------
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index 2d80cb7f3c..add2682b35 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -68,17 +68,17 @@ SUBSYSTEM_DEF(input)
 
 	macro_set_reverse_lookups = list(
 		"default" = list(
-			"say" = list("T"),
+			"say_keybind" = list("T"),
 			"whisper" = list("T", "Ctrl"),
-			"me" = list("M"),
+			"me_keybind" = list("M"),
 			"subtle" = list("M", "Ctrl")
 			),
 		"old_default" = list(
-			"say" = list("T", "Ctrl"),
+			"say_keybind" = list("T", "Ctrl"),
 			),
 		"old_hotkeys" = list(
-			"say" = list("T"),
-			"me" = list("M"),
+			"say_keybind" = list("T"),
+			"me_keybind" = list("M"),
 			)
 		)
 
diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index 6c7b3031c5..50770c130a 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -19,7 +19,7 @@
 		if(valid)
 			display_typing_indicator()
 	switch(_key)
-		if("Escape")
+		if("Escape")			//escape breaks out of clientside verb text input without executing at all, meaning we can't hook the verb to do this for us.
 			clear_typing_indicator()
 		if("Delete", "H")
 			if(!pulling)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 52e14a43e4..e3123dddd4 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -2221,8 +2221,3 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 /datum/species/proc/start_wagging_tail(mob/living/carbon/human/H)
 
 /datum/species/proc/stop_wagging_tail(mob/living/carbon/human/H)
-
-
-/////// TYPING INDICATORS ///////
-/datum/species/proc/get_typing_indicator_state()
-	return typing_indicator_state
diff --git a/code/modules/mob/living/carbon/human/typing_indicator.dm b/code/modules/mob/living/carbon/human/typing_indicator.dm
index 6d420c1f7b..16ed95790a 100644
--- a/code/modules/mob/living/carbon/human/typing_indicator.dm
+++ b/code/modules/mob/living/carbon/human/typing_indicator.dm
@@ -1,2 +1,2 @@
 /mob/living/carbon/human/get_typing_indicator_icon_state()
-	return dna?.species?.get_typing_indicator_state() || ..()
+	return dna?.species?.typing_indicator_state || ..()
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index ac5924f6d8..bca634ada9 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -1,7 +1,17 @@
 //Speech verbs.
-/mob/verb/say_verb(message as text)
+// the _keybind verbs uses "as text" versus "as text|null" to force a popup when pressed by a keybind.
+/mob/verb/say_keybind(message as text)
+	set name = "say_keybind"
+	set hidden = TRUE
+	set category = "IC"
+	return say_verb(message)
+
+/mob/verb/say_verb(message as text|null)
 	set name = "Say"
 	set category = "IC"
+	display_typing_indicator()
+	if(!length(message))
+		message = input(usr, "Say something!", "Say") as text|null
 	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
 		return
@@ -32,9 +42,18 @@
 /mob/proc/whisper(message, datum/language/language=null)
 	say(message, language) //only living mobs actually whisper, everything else just talks
 
-/mob/verb/me_verb(message as message)
+/mob/verb/me_keybind(message as message)
+	set name = "me_keybind"
+	set hidden = TRUE
+	set category = "IC"
+	return me_verb(message)
+
+/mob/verb/me_verb(message as message|null)
 	set name = "Me"
 	set category = "IC"
+	display_typing_indicator()
+	if(!length(message))
+		message = input(usr, "What do you want to emote?" , "Emote") as message|null
 	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
 		return
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 2587839cb8..7ca9eb72e9 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -15,24 +15,25 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
 /mob/proc/get_typing_indicator_icon_state()
 	return typing_indicator_state
 
-/*!
- * Displays typing indicator.
- * @param timeout_override - Sets how long until this will disappear on its own without the user finishing their message or logging out. Defaults to src.typing_indicator_timeout
- * @param state_override - Sets the state that we will fetch. Defaults to src.get_typing_indicator_icon_state()
- * @param force - shows even if src.typing_indcator_enabled is FALSE.
- */
+/**
+  * Displays typing indicator.
+  * @param timeout_override - Sets how long until this will disappear on its own without the user finishing their message or logging out. Defaults to src.typing_indicator_timeout
+  * @param state_override - Sets the state that we will fetch. Defaults to src.get_typing_indicator_icon_state()
+  * @param force - shows even if src.typing_indcator_enabled is FALSE.
+  */
 /mob/proc/display_typing_indicator(timeout_override = typing_indicator_timeout, state_override = get_typing_indicator_icon_state(), force = FALSE)
-	if(!typing_indicator_enabled || force)
+	if(!typing_indicator_enabled && !force)
 		return
 	add_overlay(get_indicator_overlay(state_override))
 	addtimer(CALLBACK(src, .proc/clear_typing_indicator, state_override), timeout_override, TIMER_STOPPABLE)
 
-/*!
- * Removes typing indicator.
- * @param state_override Sets the state that we will remove. Defaults to src.get_typing_indicator_icon_state()
- */
+/**
+  * Removes typing indicator.
+  * @param state_override Sets the state that we will remove. Defaults to src.get_typing_indicator_icon_state()
+  */
 /mob/proc/clear_typing_indicator(state_override = get_typing_indicator_icon_state())
 	deltimer(typing_indicator_timerid)
+	typing_indicator_timerid = null
 	cut_overlay(get_indicator_overlay(state_override))
 
 /// Default typing indicator

From 8d1e36e0769415c27538e01ae01f36bd9d51793a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:49:47 -0700
Subject: [PATCH 08/14] k

---
 code/__DEFINES/mobs.dm               | 2 ++
 code/modules/mob/mob_defines.dm      | 2 --
 code/modules/mob/typing_indicator.dm | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index dc67de3150..f70f8c55bc 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -277,3 +277,5 @@
 
 #define PULL_PRONE_SLOWDOWN 0.6
 #define HUMAN_CARRY_SLOWDOWN 0
+
+#define TYPING_INDICATOR_TIMEOUT 10 SECONDS
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 7a3959ed8f..8cda504149 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -136,5 +136,3 @@
 	var/typing_indicator_state = /obj/effect/overlay/typing_indicator
 	/// The timer that will remove our indicator for early aborts (like when an user finishes their message)
 	var/typing_indicator_timerid
-	/// Default typing indicator timeout
-	var/typing_indicator_timeout = 30 SECONDS
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 7ca9eb72e9..b8a68b336a 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -21,11 +21,12 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
   * @param state_override - Sets the state that we will fetch. Defaults to src.get_typing_indicator_icon_state()
   * @param force - shows even if src.typing_indcator_enabled is FALSE.
   */
-/mob/proc/display_typing_indicator(timeout_override = typing_indicator_timeout, state_override = get_typing_indicator_icon_state(), force = FALSE)
-	if(!typing_indicator_enabled && !force)
+/mob/proc/display_typing_indicator(timeout_override = TYPING_INDICATOR_TIMEOUT, state_override = get_typing_indicator_icon_state(), force = FALSE)
+	if((!typing_indicator_enabled && !force) || typing_indicator_timerid)
 		return
+	typing_indicator_timerid = addtimer(CALLBACK(src, .proc/clear_typing_indicator, state_override), timeout_override, TIMER_STOPPABLE)
+	var/overlay = get_indicator_overlay(state_override)
 	add_overlay(get_indicator_overlay(state_override))
-	addtimer(CALLBACK(src, .proc/clear_typing_indicator, state_override), timeout_override, TIMER_STOPPABLE)
 
 /**
   * Removes typing indicator.

From 76541ff57ad4f34c82d65900aaa1c132100f8705 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 5 Mar 2020 00:16:22 -0700
Subject: [PATCH 09/14] getting worse

---
 code/controllers/subsystem/input.dm  | 12 ++++++------
 code/modules/mob/typing_indicator.dm |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index add2682b35..ac27d43775 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -41,9 +41,9 @@ 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",
+			"T" = "say_keybind",
 			"Ctrl+T" = "whisper",
-			"M" = "me",
+			"M" = "me_keybind",
 			"Ctrl+M" = "subtle",
 			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
 			"Any" = "\"KeyDown \[\[*\]\]\"",
@@ -51,15 +51,15 @@ 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_keybind",
 			"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",
-			"M" = "me",
+			"T" = "say_keybind",
+			"M" = "me_keybind",
 			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
 			"Any" = "\"KeyDown \[\[*\]\]\"",
 			"Any+UP" = "\"KeyUp \[\[*\]\]\"",
@@ -82,7 +82,7 @@ SUBSYSTEM_DEF(input)
 			)
 		)
 
-	typing_indicator_verbs = list("me", "say")
+	typing_indicator_verbs = list("me", "say", "say_keybind", "me_keybind")
 	typing_indicator_binds = list()
 	for(var/check_verb in typing_indicator_verbs)
 		for(var/macro_set in macro_set_reverse_lookups)
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index b8a68b336a..4ecf930aee 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -25,7 +25,6 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
 	if((!typing_indicator_enabled && !force) || typing_indicator_timerid)
 		return
 	typing_indicator_timerid = addtimer(CALLBACK(src, .proc/clear_typing_indicator, state_override), timeout_override, TIMER_STOPPABLE)
-	var/overlay = get_indicator_overlay(state_override)
 	add_overlay(get_indicator_overlay(state_override))
 
 /**

From 032b973d827cc434efaea69e86ca4ddb09d97c29 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 5 Mar 2020 00:51:05 -0700
Subject: [PATCH 10/14] wow that's a lot of effort

---
 code/__DEFINES/layers.dm                   |  5 +-
 code/__DEFINES/mobs.dm                     |  2 +-
 code/_onclick/click.dm                     |  3 +
 code/modules/mob/living/living_movement.dm |  2 +
 code/modules/mob/mob_defines.dm            |  2 +
 code/modules/mob/say.dm                    | 69 ++++++++++++++--------
 code/modules/mob/typing_indicator.dm       | 20 ++++---
 7 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index e0a22667ac..78d1264f66 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -67,8 +67,9 @@
 #define SPACEVINE_LAYER 4.8
 #define SPACEVINE_MOB_LAYER 4.9
 //#define FLY_LAYER 5 //For easy recordkeeping; this is a byond define
-#define GASFIRE_LAYER 5.05
-#define RIPPLE_LAYER 5.1
+#define ABOVE_FLY_LAYER 5.1
+#define GASFIRE_LAYER 5.2
+#define RIPPLE_LAYER 5.3
 
 #define GHOST_LAYER 6
 #define LOW_LANDMARK_LAYER 9
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index f70f8c55bc..c7f19e600f 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -278,4 +278,4 @@
 #define PULL_PRONE_SLOWDOWN 0.6
 #define HUMAN_CARRY_SLOWDOWN 0
 
-#define TYPING_INDICATOR_TIMEOUT 10 SECONDS
+#define TYPING_INDICATOR_TIMEOUT 30 SECONDS
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index e8a57bb257..a728d13deb 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -69,6 +69,9 @@
 		return
 	next_click = world.time + world.tick_lag
 
+	// Hide typing indicator if we click
+	hide_typing_indicator_auto()
+
 	if(check_click_intercept(params,A))
 		return
 
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index e0ea6350d7..271b18f86f 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -1,6 +1,8 @@
 /mob/living/Moved()
 	. = ..()
 	update_turf_movespeed(loc)
+	//Hide typing indicator if we move.
+	hide_typing_indicator_auto()
 
 /mob/living/CanPass(atom/movable/mover, turf/target)
 	if((mover.pass_flags & PASSMOB))
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 8cda504149..4ce11b4f86 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -136,3 +136,5 @@
 	var/typing_indicator_state = /obj/effect/overlay/typing_indicator
 	/// The timer that will remove our indicator for early aborts (like when an user finishes their message)
 	var/typing_indicator_timerid
+	/// Current state of our typing indicator. Used for cut overlay, DO NOT RUNTIME ASSIGN OTHER THAN FROM SHOW/CLEAR. Used to absolutely ensure we do not get stuck overlays.
+	var/typing_indicator_current
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index bca634ada9..95e504aece 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -4,14 +4,23 @@
 	set name = "say_keybind"
 	set hidden = TRUE
 	set category = "IC"
-	return say_verb(message)
+	// If they don't type anything just drop the message.
+	clear_typing_indicator()		// clear it immediately!
+	if(!length(message))
+		return
+	return do_sayverb(message)
 
 /mob/verb/say_verb(message as text|null)
 	set name = "Say"
 	set category = "IC"
 	display_typing_indicator()
 	if(!length(message))
-		message = input(usr, "Say something!", "Say") as text|null
+		// We don't use input because that can't be broken out of with ESC key.
+		winset(src, null, "command=\"say_keybind\"")
+	else
+		return do_sayverb(message)
+
+/mob/proc/do_sayverb(message)
 	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
 		return
@@ -20,6 +29,38 @@
 		return
 	say(message)
 
+/mob/verb/me_keybind(message as message)
+	set name = "me_keybind"
+	set hidden = TRUE
+	set category = "IC"
+	// If they don't type anything just drop the message.
+	clear_typing_indicator()		// clear it immediately!
+	if(!length(message))
+		return
+	return do_meverb(message)
+
+/mob/verb/me_verb(message as message|null)
+	set name = "Me"
+	set category = "IC"
+	display_typing_indicator()
+	if(!length(message))
+		// Do not use input because it can't be broken out of with ESC key.
+		winset(src, null, "command=\"me_keybind\"")
+	else
+		return do_meverb(message)
+
+/mob/proc/do_meverb(message)
+	clear_typing_indicator()		// clear it immediately!
+	if(!length(message))
+		return
+	if(GLOB.say_disabled)	//This is here to try to identify lag problems
+		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
+		return
+
+	message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
+
+	usr.emote("me",1,message,TRUE)
+
 /mob/say_mod(input, message_mode)
 	var/customsayverb = findtext(input, "*")
 	if(customsayverb && message_mode != MODE_WHISPER_CRIT)
@@ -31,7 +72,6 @@
 /mob/verb/whisper_verb(message as text)
 	set name = "Whisper"
 	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
@@ -42,29 +82,6 @@
 /mob/proc/whisper(message, datum/language/language=null)
 	say(message, language) //only living mobs actually whisper, everything else just talks
 
-/mob/verb/me_keybind(message as message)
-	set name = "me_keybind"
-	set hidden = TRUE
-	set category = "IC"
-	return me_verb(message)
-
-/mob/verb/me_verb(message as message|null)
-	set name = "Me"
-	set category = "IC"
-	display_typing_indicator()
-	if(!length(message))
-		message = input(usr, "What do you want to emote?" , "Emote") as message|null
-	clear_typing_indicator()		// clear it immediately!
-	if(!length(message))
-		return
-	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
-		return
-
-	message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
-
-	usr.emote("me",1,message,TRUE)
-
 /mob/proc/say_dead(var/message)
 	var/name = real_name
 	var/alt_name = ""
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 4ecf930aee..f28cbe4385 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -22,19 +22,21 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
   * @param force - shows even if src.typing_indcator_enabled is FALSE.
   */
 /mob/proc/display_typing_indicator(timeout_override = TYPING_INDICATOR_TIMEOUT, state_override = get_typing_indicator_icon_state(), force = FALSE)
-	if((!typing_indicator_enabled && !force) || typing_indicator_timerid)
+	if((!typing_indicator_enabled && !force) || typing_indicator_current)
 		return
-	typing_indicator_timerid = addtimer(CALLBACK(src, .proc/clear_typing_indicator, state_override), timeout_override, TIMER_STOPPABLE)
-	add_overlay(get_indicator_overlay(state_override))
+	typing_indicator_current = state_override
+	add_overlay(state_override)
+	typing_indicator_timerid = addtimer(CALLBACK(src, .proc/clear_typing_indicator), timeout_override, TIMER_STOPPABLE)
 
 /**
   * Removes typing indicator.
-  * @param state_override Sets the state that we will remove. Defaults to src.get_typing_indicator_icon_state()
   */
-/mob/proc/clear_typing_indicator(state_override = get_typing_indicator_icon_state())
-	deltimer(typing_indicator_timerid)
-	typing_indicator_timerid = null
-	cut_overlay(get_indicator_overlay(state_override))
+/mob/proc/clear_typing_indicator()
+	cut_overlay(typing_indicator_current)
+	typing_indicator_current = null
+	if(typing_indicator_timerid)
+		deltimer(typing_indicator_timerid)
+		typing_indicator_timerid = null
 
 /// Default typing indicator
 /obj/effect/overlay/typing_indicator
@@ -42,4 +44,4 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
 	icon = 'icons/mob/talk.dmi'
 	icon_state = "normal_typing"
 	appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
-	layer = LARGE_MOB_LAYER
+	layer = ABOVE_FLY_LAYER

From e027d22fd887a3248c12c024c55955bead017379 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 5 Mar 2020 00:53:18 -0700
Subject: [PATCH 11/14] eh ok

---
 code/__DEFINES/mobs.dm                     | 2 +-
 code/_onclick/click.dm                     | 2 +-
 code/modules/mob/living/living_movement.dm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index c7f19e600f..f70f8c55bc 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -278,4 +278,4 @@
 #define PULL_PRONE_SLOWDOWN 0.6
 #define HUMAN_CARRY_SLOWDOWN 0
 
-#define TYPING_INDICATOR_TIMEOUT 30 SECONDS
+#define TYPING_INDICATOR_TIMEOUT 10 SECONDS
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index a728d13deb..a6c0792a5d 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -70,7 +70,7 @@
 	next_click = world.time + world.tick_lag
 
 	// Hide typing indicator if we click
-	hide_typing_indicator_auto()
+	clear_typing_indicator()
 
 	if(check_click_intercept(params,A))
 		return
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 271b18f86f..a9c80740a1 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -2,7 +2,7 @@
 	. = ..()
 	update_turf_movespeed(loc)
 	//Hide typing indicator if we move.
-	hide_typing_indicator_auto()
+	clear_typing_indicator()
 
 /mob/living/CanPass(atom/movable/mover, turf/target)
 	if((mover.pass_flags & PASSMOB))

From 62fd71c50edb2f7cfda5732b78a7677b68f3a365 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 24 Apr 2020 23:31:34 -0700
Subject: [PATCH 12/14] kay

---
 code/controllers/subsystem/input.dm      | 59 +++++-------------------
 code/modules/keybindings/bindings_mob.dm | 17 -------
 code/modules/mob/say.dm                  | 38 ++++++---------
 interface/skin.dmf                       |  6 +--
 tgstation.dme                            |  1 +
 5 files changed, 28 insertions(+), 93 deletions(-)

diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index ac27d43775..c6c03e2cbd 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -8,14 +8,6 @@ SUBSYSTEM_DEF(input)
 
 	var/list/macro_sets
 	var/list/movement_keys
-	/*! Special thing (until we get custom keybinds that also support clientside macros :weary:) that lets us do stuff like look up "which key is say/me bound to". Special format too, the value of a key should be list(key, modifier1, modifier2, ...). "default" unless override.
-	 *  USE get_key_for_macro_id or get_typing_indicator_binds TO ACCESS!
-	 */
-	var/list/macro_set_reverse_lookups
-	/// cache these for speed.
-	var/list/typing_indicator_binds
-	/// same
-	var/static/list/typing_indicator_verbs
 
 /datum/controller/subsystem/input/Initialize()
 	setup_default_macro_sets()
@@ -41,57 +33,35 @@ 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_keybind",
-			"Ctrl+T" = "whisper",
-			"M" = "me_keybind",
-			"Ctrl+M" = "subtle",
+			"T" = "Say",
+			"Ctrl+T" = "SayWithIndicator",
+			"Y" = "whisper",
+			"M" = "Me",
+			"Ctrl+M" = "MeWithIndicator",
+			"5" = "subtle",
 			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
 			"Any" = "\"KeyDown \[\[*\]\]\"",
 			"Any+UP" = "\"KeyUp \[\[*\]\]\"",
 			),
 		"old_default" = list(
 			"Tab" = "\".winset \\\"mainwindow.macro=old_hotkeys map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"",
-			"Ctrl+T" = "say_keybind",
+			"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_keybind",
-			"M" = "me_keybind",
+			"T" = "Say",
+			"Ctrl+T" = "SayWithIndicator",
+			"M" = "Me",
+			"Ctrl+M" = "MeWithIndicator",
 			"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
 			"Any" = "\"KeyDown \[\[*\]\]\"",
 			"Any+UP" = "\"KeyUp \[\[*\]\]\"",
 			),
 		)
 
-	macro_set_reverse_lookups = list(
-		"default" = list(
-			"say_keybind" = list("T"),
-			"whisper" = list("T", "Ctrl"),
-			"me_keybind" = list("M"),
-			"subtle" = list("M", "Ctrl")
-			),
-		"old_default" = list(
-			"say_keybind" = list("T", "Ctrl"),
-			),
-		"old_hotkeys" = list(
-			"say_keybind" = list("T"),
-			"me_keybind" = list("M"),
-			)
-		)
-
-	typing_indicator_verbs = list("me", "say", "say_keybind", "me_keybind")
-	typing_indicator_binds = list()
-	for(var/check_verb in typing_indicator_verbs)
-		for(var/macro_set in macro_set_reverse_lookups)
-			var/list/keylist = macro_set_reverse_lookups[macro_set][check_verb]
-			if(!keylist)
-				continue
-			var/key = keylist[1]
-			typing_indicator_binds[key] = TRUE
-
 	// Because i'm lazy and don't want to type all these out twice
 	var/list/old_default = default_macro_sets["old_default"]
 
@@ -151,10 +121,3 @@ SUBSYSTEM_DEF(input)
 	for(var/i in 1 to length(clients))
 		var/client/C = clients[i]
 		C.keyLoop()
-
-/datum/controller/subsystem/input/proc/get_key_for_macro_id(macro_id, macroset)
-	return macro_set_reverse_lookups[macroset][macro_id] || macro_set_reverse_lookups["default"][macro_id]
-
-/// Returns an associative list of keys without modifiers like ctrl. You have to do another lookup, this is for the first check to be faster.
-/datum/controller/subsystem/input/proc/get_typing_indicator_binds(macroset)
-	return typing_indicator_binds[macroset]
diff --git a/code/modules/keybindings/bindings_mob.dm b/code/modules/keybindings/bindings_mob.dm
index cacb382d6a..36b4775c34 100644
--- a/code/modules/keybindings/bindings_mob.dm
+++ b/code/modules/keybindings/bindings_mob.dm
@@ -3,24 +3,7 @@
 // Or we can have NPC's send actual keypresses and detect that by seeing no client
 
 /mob/key_down(_key, client/user)
-	if(SSinput.typing_indicator_binds[_key])
-		var/macroset = winget(user, "mainwindow", "macro")
-		var/list/L = SSinput.macro_set_reverse_lookups[macroset]
-		var/valid = FALSE
-		for(var/the_verb in L)
-			if(the_verb in SSinput.typing_indicator_verbs)
-				var/list/keys = L[the_verb]
-				valid = TRUE
-				if(length(keys) > 1)
-					for(var/i in 2 to length(keys))
-						if(!client.keys_held[keys[i]])
-							valid = FALSE
-							break
-		if(valid)
-			display_typing_indicator()
 	switch(_key)
-		if("Escape")			//escape breaks out of clientside verb text input without executing at all, meaning we can't hook the verb to do this for us.
-			clear_typing_indicator()
 		if("Delete", "H")
 			if(!pulling)
 				to_chat(src, "<span class='notice'>You are not pulling anything.</span>")
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 95e504aece..9679417ed8 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -1,55 +1,43 @@
 //Speech verbs.
 // the _keybind verbs uses "as text" versus "as text|null" to force a popup when pressed by a keybind.
-/mob/verb/say_keybind(message as text)
-	set name = "say_keybind"
+/mob/verb/say_typing_indicator()
+	set name = "SayWithIndicator"
 	set hidden = TRUE
 	set category = "IC"
+	display_typing_indicator()
+	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))
 		return
-	return do_sayverb(message)
+	return say_verb(message)
 
-/mob/verb/say_verb(message as text|null)
+/mob/verb/say_verb(message as text)
 	set name = "Say"
 	set category = "IC"
-	display_typing_indicator()
-	if(!length(message))
-		// We don't use input because that can't be broken out of with ESC key.
-		winset(src, null, "command=\"say_keybind\"")
-	else
-		return do_sayverb(message)
-
-/mob/proc/do_sayverb(message)
-	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
 		return
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
 		to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
 		return
+	clear_typing_indicator()		// clear it immediately!
 	say(message)
 
-/mob/verb/me_keybind(message as message)
-	set name = "me_keybind"
+/mob/verb/me_typing_indicator()
+	set name = "MeWithIndicator"
 	set hidden = TRUE
 	set category = "IC"
+	display_typing_indicator()
+	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))
 		return
-	return do_meverb(message)
+	return me_verb(message)
 
-/mob/verb/me_verb(message as message|null)
+/mob/verb/me_verb(message as message)
 	set name = "Me"
 	set category = "IC"
-	display_typing_indicator()
-	if(!length(message))
-		// Do not use input because it can't be broken out of with ESC key.
-		winset(src, null, "command=\"me_keybind\"")
-	else
-		return do_meverb(message)
-
-/mob/proc/do_meverb(message)
 	clear_typing_indicator()		// clear it immediately!
 	if(!length(message))
 		return
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 5f8e1ad125..f27b0bcf48 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1,5 +1,6 @@
 macro "default"
 
+
 menu "menu"
 	elem 
 		name = "&File"
@@ -268,14 +269,13 @@ window "statwindow"
 		is-default = true
 		saved-params = ""
 
-		window "preferences_window"
+window "preferences_window"
 	elem "preferences_window"
 		type = MAIN
 		pos = 372,0
 		size = 1280x1000
 		anchor1 = none
 		anchor2 = none
-		background-color = none
 		is-visible = false
 		saved-params = "pos;size;is-minimized;is-maximized"
 		statusbar = false
@@ -285,7 +285,6 @@ window "statwindow"
 		size = 960x1000
 		anchor1 = 0,0
 		anchor2 = 75,100
-		background-color = none
 		saved-params = ""
 	elem "character_preview_map"
 		type = MAP
@@ -295,3 +294,4 @@ window "statwindow"
 		anchor2 = 100,100
 		right-click = true
 		saved-params = "zoom;letterbox;zoom-mode"
+
diff --git a/tgstation.dme b/tgstation.dme
index 107a704c4b..0f54c8cb5d 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3253,6 +3253,7 @@
 #include "interface\interface.dm"
 #include "interface\menu.dm"
 #include "interface\stylesheet.dm"
+#include "interface\skin.dmf"
 #include "modular_citadel\code\__HELPERS\list2list.dm"
 #include "modular_citadel\code\__HELPERS\lists.dm"
 #include "modular_citadel\code\__HELPERS\mobs.dm"

From abb7f199dff94f741ec86b62ba19ba3193f077af Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 24 Apr 2020 23:39:08 -0700
Subject: [PATCH 13/14] tweaks

---
 code/_onclick/click.dm              |  5 +----
 code/controllers/subsystem/input.dm | 18 +++++++++---------
 code/modules/mob/say.dm             | 14 +++++++-------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 99907af47a..738d72c6bf 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -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)
diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm
index c6c03e2cbd..1f8a03b3e7 100644
--- a/code/controllers/subsystem/input.dm
+++ b/code/controllers/subsystem/input.dm
@@ -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 \[\[*\]\]\"",
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 9679417ed8..ac89fc2445 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -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)
 

From 47b97629db020ae1d85c321265226d12642e5c81 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 1 May 2020 04:30:44 -0700
Subject: [PATCH 14/14] Update mobs.dm

---
 code/__DEFINES/mobs.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 38eb3cc533..bcd00e174c 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -290,7 +290,7 @@
 
 #define PULL_PRONE_SLOWDOWN 0.6
 
-#define TYPING_INDICATOR_TIMEOUT 10 SECONDS
+#define TYPING_INDICATOR_TIMEOUT 5 MINUTES
 
 #define FIREMAN_CARRY_SLOWDOWN 0
 #define PIGGYBACK_CARRY_SLOWDOWN 1