From 747b84d25579757998524861939edaef89e18c2f Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 13 Feb 2020 14:47:53 +0100
Subject: [PATCH] Thank you fermis very cool

---
 code/modules/surgery/organs/tongue.dm | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index d540d12d14..d71aa097d1 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -31,11 +31,11 @@
 /obj/item/organ/tongue/Initialize(mapload)
 	. = ..()
 	low_threshold_passed = "<span class='info'>Your [name] feels a little sore.</span>"
-	low_threshold_cleared = "<span class='info'>Your [name] soreness subsides.</span>"
+	low_threshold_cleared = "<span class='info'>Your [name] soreness has subsided.</span>"
 	high_threshold_passed = "<span class='warning'>Your [name] is really starting to hurt.</span>"
-	high_threshold_cleared = "<span class='info'>The pain of your [name] subsides a little.</span>"
+	high_threshold_cleared = "<span class='info'>The pain of your [name] has subsided a little.</span>"
 	now_failing = "<span class='warning'>Your [name] feels like it's about to fall out!.</span>"
-	now_fixed = "<span class='info'>The excruciating pain of your [name] subsides.</span>"
+	now_fixed = "<span class='info'>The excruciating pain of your [name] has subsided.</span>"
 	languages_possible = languages_possible_base
 
 /obj/item/organ/tongue/proc/handle_speech(datum/source, list/speech_args)
@@ -48,19 +48,9 @@
 		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/applyOrganDamage(var/d, var/maximum = maxHealth)
-
-	if(!d) //Micro-optimization.
-		return
-	if(maximum < damage)
-		return
-	damage = CLAMP(damage + d, 0, maximum)
-	var/mess = check_damage_thresholds(owner)
-	prev_damage = damage
-	if(mess && owner)
-		to_chat(owner, mess)
-
-	if ((damage / maxHealth) > 1)
+/obj/item/organ/tongue/applyOrganDamage(d, maximum = maxHealth)
+	. = ..()
+	if (damage >= maxHealth)
 		to_chat(owner, "<span class='userdanger'>Your tongue is singed beyond recognition, and disintegrates!</span>")
 		SSblackbox.record_feedback("tally", "fermi_chem", 1, "Tongues lost to Fermi")
 		qdel(src)