From 0c65359f421eab6ba5683447e90061bc0554aa3e Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Sun, 22 Nov 2020 00:00:24 +0000
Subject: [PATCH] functionality

---
 .../keybindings/keybind/communication.dm      | 39 +++++++++++++++++++
 code/modules/keybindings/keybind/mob.dm       | 22 -----------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/code/modules/keybindings/keybind/communication.dm b/code/modules/keybindings/keybind/communication.dm
index d46d6523d7..d93125710e 100644
--- a/code/modules/keybindings/keybind/communication.dm
+++ b/code/modules/keybindings/keybind/communication.dm
@@ -6,12 +6,51 @@
 	name = "Say"
 	full_name = "IC Say"
 
+/datum/keybinding/client/communication/say/down(client/user)
+	var/mob/M = user.mob
+	var/speech = input(user, "", "say")
+	M.say_verb(speech)
+
 /datum/keybinding/client/communication/ooc
 	hotkey_keys = list("O")
 	name = "OOC"
 	full_name = "Out Of Character Say (OOC)"
 
+/datum/keybinding/client/communication/ooc/down(client/user)
+	var/speech = input(user, "", "OOC")
+	user.ooc(speech)
+	return TRUE
+
 /datum/keybinding/client/communication/me
 	hotkey_keys = list("M")
 	name = "Me"
 	full_name = "Custom Emote (/Me)"
+
+/datum/keybinding/client/communication/me/down(client/user)
+	var/mob/M = user.mob
+	var/emote = input(user, "", "Me")
+	M.me_verb(emote)
+	return TRUE
+
+//indicators
+/datum/keybinding/mob/say_with_indicator
+	hotkey_keys = list("CtrlT")
+	classic_keys = list()
+	name = "say_with_indicator"
+	full_name = "Say with Typing Indicator"
+
+/datum/keybinding/mob/say_with_indicator/down(client/user)
+	var/mob/M = user.mob
+	M.say_typing_indicator()
+	return TRUE
+
+/datum/keybinding/mob/me_with_indicator
+	hotkey_keys = list("CtrlM")
+	classic_keys = list()
+	name = "me_with_indicator"
+	full_name = "Me (emote) with Typing Indicator"
+
+/datum/keybinding/mob/me_with_indicator/down(client/user)
+	var/mob/M = user.mob
+	M.me_typing_indicator()
+	return TRUE
\ No newline at end of file
diff --git a/code/modules/keybindings/keybind/mob.dm b/code/modules/keybindings/keybind/mob.dm
index c19fd62dee..6d88b53714 100644
--- a/code/modules/keybindings/keybind/mob.dm
+++ b/code/modules/keybindings/keybind/mob.dm
@@ -77,28 +77,6 @@
 		user.mob.dropItemToGround(I)
 	return TRUE
 
-/datum/keybinding/mob/say_with_indicator
-	hotkey_keys = list("CtrlT")
-	classic_keys = list()
-	name = "say_with_indicator"
-	full_name = "Say with Typing Indicator"
-
-/datum/keybinding/mob/say_with_indicator/down(client/user)
-	var/mob/M = user.mob
-	M.say_typing_indicator()
-	return TRUE
-
-/datum/keybinding/mob/me_with_indicator
-	hotkey_keys = list("CtrlM")
-	classic_keys = list()
-	name = "me_with_indicator"
-	full_name = "Me (emote) with Typing Indicator"
-
-/datum/keybinding/mob/me_with_indicator/down(client/user)
-	var/mob/M = user.mob
-	M.me_typing_indicator()
-	return TRUE
-
 /datum/keybinding/living/subtle
 	hotkey_keys = list("5")
 	classic_keys = list()