Umodularize saycode and meat slabs.

code/game/say.dm

@@ -124,8 +124,14 @@ GLOBAL_LIST_INIT(freqtospan, list(
 		return returntext
 	return "[copytext("[freq]", 1, 4)].[copytext("[freq]", 4, 5)]"
 
-/proc/attach_spans(input, list/spans)
-	return "[message_spans_start(spans)][input]</span>"
+/atom/movable/proc/attach_spans(input, list/spans)
+	var/customsayverb = findtext(input, "*")
+	if(customsayverb)
+		input = capitalize(copytext(input, customsayverb+1))
+	if(input)
+		return "[message_spans_start(spans)][input]</span>"
+	else
+		return
 
 /proc/message_spans_start(list/spans)
 	var/output = "<span class='"

code/modules/food_and_drinks/food/snacks/meat.dm

@@ -132,6 +132,28 @@
 	tastes = list("brains" = 1, "meat" = 1)
 	foodtype = RAW | MEAT | TOXIC
 
+/obj/item/reagent_containers/food/snacks/carpmeat/aquatic
+	name = "fillet"
+	desc = "A fillet of one of the local water dwelling species."
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+	icon_state = "ipcmeat"
+	desc = "Gross robot meat."
+	filling_color = "#000000"
+	tastes = list("metal" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
+	desc = "Tastes like chicken, that's because it is!"
+	icon_state = "birdmeat"
+	filling_color = "#BF896B"
+	tastes = list("chicken" = 1)
+
+/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
+	desc = "Tastes sweet... reminds you vaguely of chicken."
+	filling_color = "#6B8E23"
+	tastes = list("brains" = 1, "meat" = 1)
+
+
 
 ////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
 

code/modules/mob/living/say.dm

@@ -216,6 +216,14 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 
 	return 1
 
+/mob/living/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE)
+	. = ..()
+	if(isliving(speaker))
+		var/turf/speakturf = get_turf(speaker)
+		var/turf/sourceturf = get_turf(src)
+		if(istype(speakturf) && istype(sourceturf) && !(speakturf in get_hear(5, sourceturf)))
+			. = "<citspan class='small'>[.]</citspan>" //Don't ask how the fuck this works. It just does.
+
 /mob/living/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
 	. = ..()
 	if(!client)

code/modules/mob/mob.dm

@@ -386,9 +386,6 @@
 	if(I)
 		I.attack_self(src)
 		update_inv_hands()
-	if(!I)//CIT CHANGE - allows "using" empty hands
-		use_that_empty_hand() //CIT CHANGE - ditto
-		update_inv_hands() // CIT CHANGE - ditto.
 
 /mob/verb/memory()
 	set name = "Notes"

code/modules/mob/say.dm

@@ -8,6 +8,13 @@
 	if(message)
 		say(message)
 
+/mob/say_mod(input, message_mode)
+	var/customsayverb = findtext(input, "*")
+	if(customsayverb && message_mode != MODE_WHISPER_CRIT)
+		message_mode = MODE_CUSTOM_SAY
+		return lowertext(copytext(input, 1, customsayverb))
+	else
+		return ..()
 
 /mob/verb/whisper_verb(message as text)
 	set name = "Whisper"

modular_citadel/code/modules/food_and_drinks/snacks/meat.dm

@@ -1,29 +0,0 @@
-/obj/item/reagent_containers/food/snacks/carpmeat/aquatic
-	name = "fillet"
-	desc = "A fillet of one of the local water dwelling species."
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
-	icon = 'modular_citadel/icons/obj/foods.dmi'
-	icon_state = "ipcmeat"
-	desc = "Gross robot meat."
-	filling_color = "#000000"
-	tastes = list("metal" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect
-	desc = "Tastes like chicken, that's... not what it is!"
-	icon = 'modular_citadel/icons/obj/foods.dmi'
-	icon_state = "mothmeat"
-	filling_color = "#BF896B"
-	tastes = list("insects" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
-	desc = "Tastes like chicken, that's because it is!"
-	icon = 'modular_citadel/icons/obj/foods.dmi'
-	icon_state = "birdmeat"
-	filling_color = "#BF896B"
-	tastes = list("chicken" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
-	desc = "Tastes sweet... reminds you vaguely of chicken."
-	filling_color = "#6B8E23"
-	tastes = list("brains" = 1, "meat" = 1)

modular_citadel/code/modules/mob/mob.dm

@@ -1,27 +0,0 @@
-/mob/proc/use_that_empty_hand() //currently unused proc so i can implement 2-handing any item a lot easier in the future.
-	return
-
-/mob/say_mod(input, message_mode)
-	var/customsayverb = findtext(input, "*")
-	if(customsayverb && message_mode != MODE_WHISPER_CRIT)
-		message_mode = MODE_CUSTOM_SAY
-		return lowertext(copytext(input, 1, customsayverb))
-	else
-		return ..()
-
-/atom/movable/proc/attach_spans(input, list/spans)
-	var/customsayverb = findtext(input, "*")
-	if(customsayverb)
-		input = capitalize(copytext(input, customsayverb+1))
-	if(input)
-		return "[message_spans_start(spans)][input]</span>"
-	else
-		return
-
-/mob/living/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE)
-	. = ..()
-	if(istype(speaker, /mob/living))
-		var/turf/speakturf = get_turf(speaker)
-		var/turf/sourceturf = get_turf(src)
-		if(istype(speakturf) && istype(sourceturf) && !(speakturf in get_hear(5, sourceturf)))
-			. = "<citspan class='small'>[.]</citspan>" //Don't ask how the fuck this works. It just does.

tgstation.dme

@@ -3075,7 +3075,6 @@
 #include "modular_citadel\code\modules\custom_loadout\custom_items.dm"
 #include "modular_citadel\code\modules\custom_loadout\load_to_mob.dm"
 #include "modular_citadel\code\modules\custom_loadout\read_from_file.dm"
-#include "modular_citadel\code\modules\food_and_drinks\snacks\meat.dm"
 #include "modular_citadel\code\modules\integrated_electronics\subtypes\manipulation.dm"
 #include "modular_citadel\code\modules\keybindings\bindings_carbon.dm"
 #include "modular_citadel\code\modules\keybindings\bindings_human.dm"
@@ -3089,7 +3088,6 @@
 #include "modular_citadel\code\modules\mentor\mentorsay.dm"
 #include "modular_citadel\code\modules\mining\mining_ruins.dm"
 #include "modular_citadel\code\modules\mob\cit_emotes.dm"
-#include "modular_citadel\code\modules\mob\mob.dm"
 #include "modular_citadel\code\modules\mob\living\damage_procs.dm"
 #include "modular_citadel\code\modules\mob\living\living.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\carbon.dm"