From ff7e364558c7efc01bb279c7fc6d4de7fae0482a Mon Sep 17 00:00:00 2001
From: SplinterGP <isseisanloverias@gmail.com>
Date: Sun, 9 Feb 2020 20:40:26 -0300
Subject: [PATCH] Greys get fire damage instead from being soaked in water and
 grey telep.

Now greys will get fire damage instead of toxin damage from water when soaked, the greys also now know what grey is doing telepathy with them (only grey)
---
 .../modules/mob/living/carbon/human/human_powers_YW.dm | 10 ++++++++--
 .../mob/living/carbon/human/species/station/greyYW.dm  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_powers_YW.dm b/code/modules/mob/living/carbon/human/human_powers_YW.dm
index 22bb6874e6..abb3a70ab9 100644
--- a/code/modules/mob/living/carbon/human/human_powers_YW.dm
+++ b/code/modules/mob/living/carbon/human/human_powers_YW.dm
@@ -5,7 +5,13 @@
 
 	var/msg = sanitize(input("Message:", "Project mind") as text|null)
 	if(msg)
+		var/mob/living/carbon/human/H = M
 		log_say("(GreyTP to [key_name(M)]) [msg]", src)
-		M << "<font color='purple'>you hear a voice echo across the room in your head... <i>[msg]</i></font>"
-		to_chat(src, "<font color='purple'>You said: \"[msg]\" to [M]</font>")
+		if(H.species.name == src.species.name)
+			M << "<font color='purple'>you hear [src.name]'s voice: <i>[msg]</i></font>"
+			to_chat(src, "<font color='purple'>You said: \"[msg]\" to [M]</font>")
+		else
+			M << "<font color='purple'>you hear a voice echo in your head... <i>[msg]</i></font>"
+			to_chat(src, "<font color='purple'>You said: \"[msg]\" to [M]</font>")
+
 	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/greyYW.dm b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
index adfebcb3a5..5b59e71227 100644
--- a/code/modules/mob/living/carbon/human/species/station/greyYW.dm
+++ b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
@@ -59,4 +59,4 @@
 
 /datum/species/grey/handle_environment_special(var/mob/living/carbon/human/H)
 	if(H.fire_stacks < 0 && H.get_water_protection() <= 0.5)	// If over half your body is soaked, you're melting.
-		H.adjustToxLoss(max(0,(3 - (3 * H.get_water_protection()))))	// Tripled because 0.5 is miniscule, and fire_stacks are capped in both directions.
+		H.adjustFireLoss(max(0,(3 - (3 * H.get_water_protection()))))	// Tripled because 0.5 is miniscule, and fire_stacks are capped in both directions.