From 23f7879057ee67b68dd33a06538ea8f17ab16de8 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 13 Feb 2020 14:57:08 +0100
Subject: [PATCH] taste spam

---
 code/modules/mob/living/taste.dm      | 39 ++++++++++++++-------------
 code/modules/surgery/organs/tongue.dm | 16 +++++------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm
index e4d1aa94a5..46d0608f44 100644
--- a/code/modules/mob/living/taste.dm
+++ b/code/modules/mob/living/taste.dm
@@ -16,21 +16,22 @@
 
 // non destructively tastes a reagent container
 /mob/living/proc/taste(datum/reagents/from)
-	if(last_taste_time + 50 < world.time)
-		var/taste_sensitivity = get_taste_sensitivity()
-		var/text_output = from.generate_taste_message(taste_sensitivity)
-		// We dont want to spam the same message over and over again at the
-		// person. Give it a bit of a buffer.
-		if(hallucination > 50 && prob(25))
-			text_output = pick("spiders","dreams","nightmares","the future","the past","victory",\
-			"defeat","pain","bliss","revenge","poison","time","space","death","life","truth","lies","justice","memory",\
-			"regrets","your soul","suffering","music","noise","blood","hunger","the american way")
-		if(text_output != last_taste_text || last_taste_time + 100 < world.time)
-			to_chat(src, "<span class='notice'>You can taste [text_output].</span>")
-			// "something indescribable" -> too many tastes, not enough flavor.
-
-			last_taste_time = world.time
-			last_taste_text = text_output
+	if(last_taste_time + 50 > world.time)
+		return FALSE
+	var/taste_sensitivity = get_taste_sensitivity()
+	var/text_output = from.generate_taste_message(taste_sensitivity)
+	// We dont want to spam the same message over and over again at the
+	// person. Give it a bit of a buffer.
+	if(hallucination > 50 && prob(25))
+		text_output = pick("spiders","dreams","nightmares","the future","the past","victory",\
+		"defeat","pain","bliss","revenge","poison","time","space","death","life","truth","lies","justice","memory",\
+		"regrets","your soul","suffering","music","noise","blood","hunger","the american way")
+	if(text_output != last_taste_text || last_taste_time + 100 < world.time)
+		to_chat(src, "<span class='notice'>You can taste [text_output].</span>")
+		// "something indescribable" -> too many tastes, not enough flavor.
+		last_taste_time = world.time
+		last_taste_text = text_output
+	return TRUE
 
 //FermiChem - How to check pH of a beaker without a meter/pH paper.
 //Basically checks the pH of the holder and burns your poor tongue if it's too acidic!
@@ -41,22 +42,24 @@
 	if (!T)
 		return
 	.=..()
+	if(!.)
+		return
 	if ((from.pH > 12.5) || (from.pH < 1.5))
-		to_chat(src, "<span class='warning'>You taste chemical burns!</span>")
 		T.applyOrganDamage(5)
+		to_chat(src, "<span class='warning'>You taste chemical burns!</span>")
 	if(istype(T, /obj/item/organ/tongue/cybernetic))
 		to_chat(src, "<span class='notice'>Your tongue moves on it's own in response to the liquid.</span>")
 		say("The pH is appropriately [round(from.pH, 1)].")
 		return
 	if (!HAS_TRAIT(src, TRAIT_AGEUSIA)) //I'll let you get away with not having 1 damage.
 		switch(from.pH)
-			if(11.5 to INFINITY)
+			if(11.5 to 12.5)
 				to_chat(src, "<span class='warning'>You taste a strong alkaline flavour!</span>")
 			if(8.5 to 11.5)
 				to_chat(src, "<span class='notice'>You taste a sort of soapy tone in the mixture.</span>")
 			if(2.5 to 5.5)
 				to_chat(src, "<span class='notice'>You taste a sort of acid tone in the mixture.</span>")
-			if(-INFINITY to 2.5)
+			if(1.5 to 2.5)
 				to_chat(src, "<span class='warning'>You taste a strong acidic flavour!</span>")
 
 #undef DEFAULT_TASTE_SENSITIVITY
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index d71aa097d1..bcc764d00a 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -39,14 +39,7 @@
 	languages_possible = languages_possible_base
 
 /obj/item/organ/tongue/proc/handle_speech(datum/source, list/speech_args)
-
-/obj/item/organ/tongue/emp_act(severity)
-	. = ..()
-	if(. & EMP_PROTECT_SELF)
-		return
-	if(organ_flags & ORGAN_SYNTHETIC)
-		var/errormessage = list("Runtime in tongue.dm, line 39: Undefined operation \"zapzap ow my tongue\"", "afhsjifksahgjkaslfhashfjsak", "-1.#IND", "Graham's number", "inside you all along", "awaiting at least 1 approving review before merging this taste request")
-		owner.say("The pH is appropriately [pick(errormessage)].", forced = "EMPed synthetic tongue")
+	return
 
 /obj/item/organ/tongue/applyOrganDamage(d, maximum = maxHealth)
 	. = ..()
@@ -302,6 +295,13 @@
 	maxHealth = 60 //It's robotic!
 	organ_flags = ORGAN_SYNTHETIC
 
+/obj/item/organ/tongue/cybernetic/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
+	var/errormessage = list("Runtime in tongue.dm, line 39: Undefined operation \"zapzap ow my tongue\"", "afhsjifksahgjkaslfhashfjsak", "-1.#IND", "Graham's number", "inside you all along", "awaiting at least 1 approving review before merging this taste request")
+	owner.say("The pH is appropriately [pick(errormessage)].", forced = "EMPed synthetic tongue")
+
 /obj/item/organ/tongue/cybernetic/handle_speech(datum/source, list/speech_args)
 	speech_args[SPEECH_SPANS] |= SPAN_ROBOT