From 6c9f37790b813bbe317c7b523507b8b6563c6dda Mon Sep 17 00:00:00 2001
From: Fermi <phasondragon@googlemail.com>
Date: Sat, 13 Jul 2019 20:02:27 +0100
Subject: [PATCH] Fixing bugs from merge conflicts.

---
 code/modules/surgery/organs/tongue.dm         |  4 +-
 .../code/modules/reagents/objects/clothes.dm  | 48 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 539d70f8ad..2d6e2fa592 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -241,8 +241,10 @@
 	icon_state = "tonguefluffy"
 	taste_sensitivity = 10 // extra sensitive and inquisitive uwu
 	maxHealth = 35 //Sensitive tongue!
+	modifies_speech = TRUE
 
-/obj/item/organ/tongue/fluffy/TongueSpeech(var/message)
+/obj/item/organ/tongue/fluffy/handle_speech(datum/source, list/speech_args)
+	var/message = speech_args[SPEECH_MESSAGE]
 	if(copytext(message, 1, 2) != "*")
 		message = replacetext(message, "ne", "nye")
 		message = replacetext(message, "nu", "nyu")
diff --git a/modular_citadel/code/modules/reagents/objects/clothes.dm b/modular_citadel/code/modules/reagents/objects/clothes.dm
index 73bd7f84d5..cb1b4f4da4 100644
--- a/modular_citadel/code/modules/reagents/objects/clothes.dm
+++ b/modular_citadel/code/modules/reagents/objects/clothes.dm
@@ -36,6 +36,52 @@
 			return
 	..()
 
+/obj/item/clothing/head/hattip/equipped(mob/M, slot)
+	. = ..()
+	if (slot == SLOT_HEAD)
+		RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+	else
+		UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/clothing/head/hattip/dropped(mob/M)
+	. = ..()
+	UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/clothing/head/hattip/proc/handle_speech(datum/source, mob/speech_args)
+	var/message = speech_args[SPEECH_MESSAGE]
+	var/mob/living/carbon/C = get_wearer()//user
+	var/obj/item/organ/tongue/T = C.getorganslot(ORGAN_SLOT_TONGUE)
+	if (T.name == "fluffy tongue")
+		if(prob(0.01))
+			message += "\" and tips their hat. \"swpy's sappin' my chem dispwencer uwu!!"
+			return message
+		message += "\" and tips their hat. \"[pick("weehaw!", "bwoy howdy.", "dawn tuutin'.", "weww don't that beat aww.", "whoooowee, wouwd ya wook at that!", "whoooowee! makin' bwacon!", "cweam gwavy!", "yippekeeyah-heeyapeeah-kwayoh!", "mwove 'em uut!", "gwiddy up!")]"
+		return message
+	if(prob(0.01))
+		message += "\" and tips their hat. \"Spy's sappin' my chem dispenser!"//How did I not think of this earlier
+		message_admins("I really appreciate all the hard work you put into adminning citadel, I hope you're all having a good day and I hope this hidden and rare message admins brightens up your day.")
+		return message
+	message += "\" and tips their hat. \"[pick("Yeehaw!", "Boy howdy.", "Darn tootin'.", "Well don't that beat all.", "Whoooowee, would ya look at that!", "Whoooowee! Makin' bacon!", "Cream Gravy!", "Yippekeeyah-heeyapeeah-kayoh!", "Move 'em out!", "Giddy up!")]"
+	speech_args[SPEECH_MESSAGE] = trim(message)
+	/*
+	if(message[1] != "*")
+		message = " [message]"
+		var/list/french_words = strings("french_replacement.json", "french")
+
+		for(var/key in french_words)
+			var/value = french_words[key]
+			if(islist(value))
+				value = pick(value)
+
+			message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]")
+			message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]")
+			message = replacetextEx(message, " [key]", " [value]")
+
+		if(prob(3))
+			message += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
+	speech_args[SPEECH_MESSAGE] = trim(message)
+	*/
+/*
 /obj/item/clothing/head/hattip/speechModification(message, /mob/living/carbon/C)
 	..()
 	var/mob/living/carbon/C = get_wearer()//user
@@ -52,7 +98,7 @@
 		return message
 	message += "\" and tips their hat. \"[pick("Yeehaw!", "Boy howdy.", "Darn tootin'.", "Well don't that beat all.", "Whoooowee, would ya look at that!", "Whoooowee! Makin' bacon!", "Cream Gravy!", "Yippekeeyah-heeyapeeah-kayoh!", "Move 'em out!", "Giddy up!")]"
 	return message
-
+*/
 
 /obj/item/clothing/head/hattip/proc/get_wearer()
 	return loc