From 757d4a66beeefecfc41e920841250795064bad4c Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Thu, 23 Mar 2017 19:44:33 -0400
Subject: [PATCH 01/10] Redoes everything

---
 code/__HELPERS/text.dm                        | 30 +++++-----
 code/game/dna/genes/vg_powers.dm              | 11 ++--
 .../mob/living/carbon/human/human_defense.dm  |  3 +
 .../reagents/chemistry/reagents/water.dm      | 57 ++++++++++++++++++-
 4 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 89755d7acf0..864fc094286 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -448,32 +448,32 @@ proc/checkhtml(var/t)
 
 
 // Pencode
-/proc/pencode_to_html(text, mob/user, obj/item/weapon/pen/P = null, sign = 1, fields = 1, deffont = PEN_FONT, signfont = SIGNFONT, crayonfont = CRAYON_FONT)
-	text = replacetext(text, "\n",			"<BR>")
-	text = replacetext(text, "\[center\]",	"<center>")
-	text = replacetext(text, "\[/center\]",	"</center>")
-	text = replacetext(text, "\[br\]",		"<BR>")
+/proc/pencode_to_html(text, mob/user, obj/item/weapon/pen/P = null, format = 1, sign = 1, fields = 1, deffont = PEN_FONT, signfont = SIGNFONT, crayonfont = CRAYON_FONT)
 	text = replacetext(text, "\[b\]",		"<B>")
 	text = replacetext(text, "\[/b\]",		"</B>")
 	text = replacetext(text, "\[i\]",		"<I>")
 	text = replacetext(text, "\[/i\]",		"</I>")
 	text = replacetext(text, "\[u\]",		"<U>")
 	text = replacetext(text, "\[/u\]",		"</U>")
-	text = replacetext(text, "\[large\]",	"<font size=\"4\">")
-	text = replacetext(text, "\[/large\]",	"</font>")
 	if(sign)
 		text = replacetext(text, "\[sign\]",	"<font face=\"[signfont]\"><i>[user ? user.real_name : "Anonymous"]</i></font>")
 	if(fields)
 		text = replacetext(text, "\[field\]",	"<span class=\"paper_field\"></span>")
+	if(format)
+		text = replacetext(text, "\[h1\]",	"<H1>")
+		text = replacetext(text, "\[/h1\]",	"</H1>")
+		text = replacetext(text, "\[h2\]",	"<H2>")
+		text = replacetext(text, "\[/h2\]",	"</H2>")
+		text = replacetext(text, "\[h3\]",	"<H3>")
+		text = replacetext(text, "\[/h3\]",	"</H3>")
+		text = replacetext(text, "\n",			"<BR>")
+		text = replacetext(text, "\[center\]",	"<center>")
+		text = replacetext(text, "\[/center\]",	"</center>")
+		text = replacetext(text, "\[br\]",		"<BR>")
+		text = replacetext(text, "\[large\]",	"<font size=\"4\">")
+		text = replacetext(text, "\[/large\]",	"</font>")
 
-	text = replacetext(text, "\[h1\]",	"<H1>")
-	text = replacetext(text, "\[/h1\]",	"</H1>")
-	text = replacetext(text, "\[h2\]",	"<H2>")
-	text = replacetext(text, "\[/h2\]",	"</H2>")
-	text = replacetext(text, "\[h3\]",	"<H3>")
-	text = replacetext(text, "\[/h3\]",	"</H3>")
-
-	if(istype(P, /obj/item/toy/crayon)) // If it is a crayon, and he still tries to use these, make them empty!
+	if(istype(P, /obj/item/toy/crayon) | !format) // If it is a crayon, and he still tries to use these, make them empty!
 		text = replacetext(text, "\[*\]", 		"")
 		text = replacetext(text, "\[hr\]",		"")
 		text = replacetext(text, "\[small\]", 	"")
diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm
index e159aa44247..0a336695082 100644
--- a/code/game/dna/genes/vg_powers.dm
+++ b/code/game/dna/genes/vg_powers.dm
@@ -211,11 +211,11 @@
 /obj/effect/proc_holder/spell/targeted/remotetalk/choose_targets(mob/user = usr)
 	var/list/targets = new /list()
 	var/list/validtargets = new /list()
-	for(var/mob/M in view(user.client.view, user))
+	var/turf/T = get_turf(user)
+	for(var/mob/M in range(14, T))
 		if(M && M.mind)
 			if(M == user)
 				continue
-
 			validtargets += M
 
 	if(!validtargets.len)
@@ -237,14 +237,15 @@
 	if(!say)
 		return
 	say = strip_html(say)
+	say = pencode_to_html(say, usr, format = 0, fields = 0
 
 	for(var/mob/living/target in targets)
 		log_say("Project Mind: [key_name(user)]->[key_name(target)]: [say]")
 		if(REMOTE_TALK in target.mutations)
-			target.show_message("<span class='notice'>You hear [user.real_name]'s voice: [say]</span>")
+			target.show_message("<span class='abductor'>You hear [user.real_name]'s voice: [say]</span>")
 		else
-			target.show_message("<span class='notice'>You hear a voice that seems to echo around the room: [say]</span>")
-		user.show_message("<span class='notice'>You project your mind into [target.real_name]: [say]</span>")
+			target.show_message("<span class='abductor'>You hear a voice that seems to echo around the room: [say]</span>")
+		user.show_message("<span class='abductor'>You project your mind into [target.real_name]: [say]</span>")
 		for(var/mob/dead/observer/G in player_list)
 			G.show_message("<i>Telepathic message from <b>[user]</b> ([ghost_follow_link(user, ghost=G)]) to <b>[target]</b> ([ghost_follow_link(target, ghost=G)]): [say]</i>")
 
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 3f25873e5f2..c4b9540d899 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -471,3 +471,6 @@ emp_act
 	..()
 	if(temperature >= 330)	bodytemperature = bodytemperature + (temperature - bodytemperature)
 	if(temperature <= 280)	bodytemperature = bodytemperature - (bodytemperature - temperature)
+	if(get_species() == "Grey")
+		take_organ_damage(5,min(volume,20))
+		emote("scream")
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index 70d2a9f76c0..773d03c6006 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -20,10 +20,65 @@
 	drink_desc = "The father of all refreshments."
 
 /datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, volume)
-// Put out fire
 	if(method == TOUCH)
+		// Put out fire
 		M.adjust_fire_stacks(-(volume / 10))
 		M.ExtinguishMob()
+		if(ishuman(M))
+
+			var/mob/living/carbon/human/H = M
+
+			if(H.get_species() != "Grey") //God this is so gross I hate it.
+				return
+
+			if(volume > 25)
+
+				if(H.wear_mask)
+					to_chat(H, "<span class='danger'>Your mask protects you from the water!</span>")
+					return
+
+				if(H.head)
+					to_chat(H, "<span class='danger'>Your helmet protects you from the water!</span>")
+					return
+
+				if(!M.unacidable)
+					if(prob(75))
+						var/obj/item/organ/external/affecting = H.get_organ("head")
+						if(affecting)
+							affecting.take_damage(5, 10)
+							H.UpdateDamageIcon()
+							H.emote("scream")
+					else
+						M.take_organ_damage(5,10)
+			else
+				M.take_organ_damage(5,10)
+
+	if(method == INGEST)
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+
+			if(H.get_species() != "Grey")
+				return
+
+			if(volume < 10)
+				to_chat(M, "<span class='danger'>The watery solvent substance stings you, but isn't concentrated enough to harm you!</span>")
+
+			if(volume >=10 && volume <=25)
+				if(!H.unacidable)
+					M.take_organ_damage(0,min(max(volume-10,2)*2,20))
+					M.emote("scream")
+
+
+			if(volume > 25)
+				if(!M.unacidable)
+					if(prob(75))
+						var/obj/item/organ/external/affecting = H.get_organ("head")
+						if(affecting)
+							affecting.take_damage(0, 20)
+							H.UpdateDamageIcon()
+							H.emote("scream")
+					else
+						M.take_organ_damage(0,20)
 
 /datum/reagent/water/reaction_turf(turf/simulated/T, volume)
 	if(!istype(T))

From 05eceb85d1c60a49421da9c56526c71d25c19cc0 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Thu, 23 Mar 2017 19:47:44 -0400
Subject: [PATCH 02/10] A single missing parenthesis managed to make every
 single file in all of code/modules return an error.

---
 code/game/dna/genes/vg_powers.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm
index 0a336695082..3a05ae02e38 100644
--- a/code/game/dna/genes/vg_powers.dm
+++ b/code/game/dna/genes/vg_powers.dm
@@ -237,7 +237,7 @@
 	if(!say)
 		return
 	say = strip_html(say)
-	say = pencode_to_html(say, usr, format = 0, fields = 0
+	say = pencode_to_html(say, usr, format = 0, fields = 0)
 
 	for(var/mob/living/target in targets)
 		log_say("Project Mind: [key_name(user)]->[key_name(target)]: [say]")

From 247ba05ce55ec501b80c5a82f711e77b465ecc3c Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Thu, 23 Mar 2017 21:09:29 -0400
Subject: [PATCH 03/10] Finishes everything probably

---
 code/__HELPERS/text.dm       |  9 +++++----
 code/modules/mob/language.dm | 21 ++++++++++++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index 864fc094286..f9bae78c35b 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -473,7 +473,7 @@ proc/checkhtml(var/t)
 		text = replacetext(text, "\[large\]",	"<font size=\"4\">")
 		text = replacetext(text, "\[/large\]",	"</font>")
 
-	if(istype(P, /obj/item/toy/crayon) | !format) // If it is a crayon, and he still tries to use these, make them empty!
+	if(istype(P, /obj/item/toy/crayon) || !format) // If it is a crayon, and he still tries to use these, make them empty!
 		text = replacetext(text, "\[*\]", 		"")
 		text = replacetext(text, "\[hr\]",		"")
 		text = replacetext(text, "\[small\]", 	"")
@@ -485,7 +485,7 @@ proc/checkhtml(var/t)
 		text = replacetext(text, "\[row\]", 	"")
 		text = replacetext(text, "\[cell\]", 	"")
 		text = replacetext(text, "\[logo\]", 	"")
-
+	if(istype(P, /obj/item/toy/crayon))
 		text = "<font face=\"[crayonfont]\" color=[P ? P.colour : "black"]><b>[text]</b></font>"
 	else 	// They are using "not a crayon" - formatting is OK and such
 		text = replacetext(text, "\[*\]",		"<li>")
@@ -501,9 +501,10 @@ proc/checkhtml(var/t)
 		text = replacetext(text, "\[row\]",		"</td><tr>")
 		text = replacetext(text, "\[cell\]",	"<td>")
 		text = replacetext(text, "\[logo\]",	"<img src = ntlogo.png>")
-
+	if(P)
 		text = "<font face=\"[deffont]\" color=[P ? P.colour : "black"]>[text]</font>"
-
+	else
+		text = "<font face=\"[deffont]\">[text]</font>"
 	text = copytext(text, 1, MAX_PAPER_MESSAGE_LEN)
 	return text
 
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index fb6d5ef5948..01fe5f43cc9 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -96,6 +96,9 @@
 	return (copytext(message, length(message)) == "!") ? 2 : 1
 
 /datum/language/proc/broadcast(mob/living/speaker, message, speaker_mask)
+	if(!check_can_speak(speaker))
+		return FALSE
+
 	log_say("[key_name(speaker)]: ([name]) [message]")
 
 	if(!speaker_mask)
@@ -114,6 +117,9 @@
 /datum/language/proc/check_special_condition(mob/other, mob/living/speaker)
 	return TRUE
 
+/datum/language/proc/check_can_speak(mob/living/speaker)
+	return TRUE
+
 /datum/language/proc/get_spoken_verb(msg_end)
 	switch(msg_end)
 		if("!")
@@ -292,8 +298,21 @@
 /datum/language/grey/broadcast(mob/living/speaker, message, speaker_mask)
 	..(speaker,message,speaker.real_name)
 
+/datum/language/grey/check_can_speak(mob/living/speaker)
+	if(ishuman(speaker))
+		var/mob/living/carbon/human/spkr = speaker
+		var/obj/item/organ/external/rhand = spkr.organs_by_name["r_hand"]
+		var/obj/item/organ/external/lhand = spkr.organs_by_name["l_hand"]
+		if((!rhand || !rhand.is_usable()) && (!lhand || !lhand.is_usable()))
+			to_chat(speaker,"<span class='warning'>You can't communicate without the ability to use your hands!</span>")
+			return FALSE
+	if(speaker.incapacitated(ignore_lying = 1))
+		to_chat(speaker,"<span class='warning'>You can't communicate while unable to move your hands to your head!</span>")
+		return FALSE
+	return TRUE
+
 /datum/language/grey/check_special_condition(mob/living/carbon/human/other, mob/living/carbon/human/speaker)
-	if(other in range(7, speaker))
+	if(other.z == speaker.z)
 		return TRUE
 	return FALSE
 

From 19db4147ffee1501c89776103dc36e823b89f792 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Thu, 23 Mar 2017 21:56:36 -0400
Subject: [PATCH 04/10] Finalizes the re-do of my language changes.

---
 code/modules/mob/language.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 01fe5f43cc9..8a278a026e9 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -296,6 +296,13 @@
 	flags = RESTRICTED | HIVEMIND
 
 /datum/language/grey/broadcast(mob/living/speaker, message, speaker_mask)
+	var/their = "their"
+	if(speaker.gender == "female")
+		their = "her"
+	if(speaker.gender == "male")
+		their = "his"
+	for(var/mob/living/player in view(4, speaker))
+		to_chat(player,"<span class='notice'>[speaker] touches [their] fingers to [their] temple.</span>")
 	..(speaker,message,speaker.real_name)
 
 /datum/language/grey/check_can_speak(mob/living/speaker)

From 67665d76cf475c4a3eca4385e39612e65a788bb3 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Tue, 28 Mar 2017 23:48:07 -0400
Subject: [PATCH 05/10] Fixes two things

Hopefully last fix

Revert "Hopefully last fix"

This reverts commit 91550ad5abb256d3d868459393073a4bd74b7241.

Fixes two things
---
 code/game/dna/genes/vg_powers.dm | 2 +-
 code/modules/mob/language.dm     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm
index 3a05ae02e38..32a6a58cbb3 100644
--- a/code/game/dna/genes/vg_powers.dm
+++ b/code/game/dna/genes/vg_powers.dm
@@ -245,7 +245,7 @@
 			target.show_message("<span class='abductor'>You hear [user.real_name]'s voice: [say]</span>")
 		else
 			target.show_message("<span class='abductor'>You hear a voice that seems to echo around the room: [say]</span>")
-		user.show_message("<span class='abductor'>You project your mind into [target.real_name]: [say]</span>")
+		user.show_message("<span class='abductor'>You project your mind into [target.name]: [say]</span>")
 		for(var/mob/dead/observer/G in player_list)
 			G.show_message("<i>Telepathic message from <b>[user]</b> ([ghost_follow_link(user, ghost=G)]) to <b>[target]</b> ([ghost_follow_link(target, ghost=G)]): [say]</i>")
 
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 8a278a026e9..bbf840f7b3f 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -301,8 +301,8 @@
 		their = "her"
 	if(speaker.gender == "male")
 		their = "his"
-	for(var/mob/living/player in view(4, speaker))
-		to_chat(player,"<span class='notice'>[speaker] touches [their] fingers to [their] temple.</span>")
+
+	speaker.visible_message("<span class='notice'>[speaker] touches [their] fingers to [their] temple.</span>")
 	..(speaker,message,speaker.real_name)
 
 /datum/language/grey/check_can_speak(mob/living/speaker)

From 9d74b9090aa11ba6d4b5297e388ecbd580837c50 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Tue, 16 May 2017 23:51:37 -0400
Subject: [PATCH 06/10] Last fix, I hope

---
 code/modules/mob/language.dm                              | 8 ++++----
 .../file_system/programs/generic/file_browser.dm          | 2 +-
 code/modules/paperwork/paper.dm                           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index bbf840f7b3f..7bd393412a8 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -307,9 +307,9 @@
 
 /datum/language/grey/check_can_speak(mob/living/speaker)
 	if(ishuman(speaker))
-		var/mob/living/carbon/human/spkr = speaker
-		var/obj/item/organ/external/rhand = spkr.organs_by_name["r_hand"]
-		var/obj/item/organ/external/lhand = spkr.organs_by_name["l_hand"]
+		var/mob/living/carbon/human/S = speaker
+		var/obj/item/organ/external/rhand = S.get_organ("r_hand")
+		var/obj/item/organ/external/lhand = S.get_organ("l_hand")
 		if((!rhand || !rhand.is_usable()) && (!lhand || !lhand.is_usable()))
 			to_chat(speaker,"<span class='warning'>You can't communicate without the ability to use your hands!</span>")
 			return FALSE
@@ -319,7 +319,7 @@
 	return TRUE
 
 /datum/language/grey/check_special_condition(mob/living/carbon/human/other, mob/living/carbon/human/speaker)
-	if(other.z == speaker.z)
+	if(atoms_share_level(other, speaker))
 		return TRUE
 	return FALSE
 
diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
index 20c4e92fd98..a868c0958ea 100644
--- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
@@ -43,7 +43,7 @@
 			if(!istype(file))
 				data["error"] = "I/O ERROR: Unable to open file."
 			else
-				data["filedata"] = pencode_to_html(file.stored_data, sign = 0, fields = 0)
+				data["filedata"] = pencode_to_html(file.stored_data, format = 1, sign = 0, fields = 0)
 				data["filename"] = "[file.filename].[file.filetype]"
 	else
 		if(!computer || !HDD)
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 60a501f1ecf..f82d2bc0b1e 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -203,7 +203,7 @@
 
 
 /obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob)
-	t = pencode_to_html(t, usr, P, TRUE, TRUE, deffont, signfont, crayonfont)
+	t = pencode_to_html(t, usr, P, TRUE, TRUE, TRUE, deffont, signfont, crayonfont)
 
 //Count the fields
 	var/laststart = 1

From 166c79d86a9d76880936ce6e3cce8636c9013d62 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Wed, 31 May 2017 15:53:24 -0400
Subject: [PATCH 07/10] makes a species water_act

---
 code/modules/mob/living/carbon/human/human_defense.dm   | 5 ++---
 code/modules/mob/living/carbon/human/species/species.dm | 3 +++
 code/modules/mob/living/carbon/human/species/station.dm | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index c4b9540d899..9e8fcf8d50b 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -471,6 +471,5 @@ emp_act
 	..()
 	if(temperature >= 330)	bodytemperature = bodytemperature + (temperature - bodytemperature)
 	if(temperature <= 280)	bodytemperature = bodytemperature - (bodytemperature - temperature)
-	if(get_species() == "Grey")
-		take_organ_damage(5,min(volume,20))
-		emote("scream")
+	species.water_act(src,volume,temperature,source)
+
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index d2d44757705..ccaff68fec7 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -677,3 +677,6 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 
 	if(H.see_override)	//Override all
 		H.see_invisible = H.see_override
+
+/datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
+	..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index c1005f2b932..9355f5b38ec 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -750,6 +750,11 @@
 		genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
 	..()
 
+/datum/species/grey/water_act(var/mob/living/carbon/C, volume, temperature, source)
+	C.take_organ_damage(5,min(volume,20))
+	C.emote("scream")
+	..()
+
 /datum/species/grey/after_equip_job(datum/job/J, mob/living/carbon/human/H)
 	var/speech_pref = H.client.prefs.speciesprefs
 	if(speech_pref)

From 933d7e97805caf95461867fd7327887f8586d055 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Thu, 29 Jun 2017 00:45:04 -0400
Subject: [PATCH 08/10] Fixes the last things

---
 code/modules/mob/living/carbon/human/species/species.dm | 2 +-
 code/modules/mob/living/carbon/human/species/station.dm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index ccaff68fec7..76000a4c431 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -679,4 +679,4 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		H.see_invisible = H.see_override
 
 /datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
-	..()
\ No newline at end of file
+	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 9355f5b38ec..54555a6152a 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -751,9 +751,9 @@
 	..()
 
 /datum/species/grey/water_act(var/mob/living/carbon/C, volume, temperature, source)
+	..()
 	C.take_organ_damage(5,min(volume,20))
 	C.emote("scream")
-	..()
 
 /datum/species/grey/after_equip_job(datum/job/J, mob/living/carbon/human/H)
 	var/speech_pref = H.client.prefs.speciesprefs

From b33750ece817c8a06cbc71e3b6ae32bf2af37d04 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Thu, 29 Jun 2017 17:24:57 -0400
Subject: [PATCH 09/10] Fixes the last fixes

---
 code/modules/mob/living/carbon/human/human_defense.dm   | 3 ---
 code/modules/mob/living/carbon/human/species/species.dm | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 9e8fcf8d50b..6a63a30fc5c 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -468,8 +468,5 @@ emp_act
 	..()
 
 /mob/living/carbon/human/water_act(volume, temperature, source)
-	..()
-	if(temperature >= 330)	bodytemperature = bodytemperature + (temperature - bodytemperature)
-	if(temperature <= 280)	bodytemperature = bodytemperature - (bodytemperature - temperature)
 	species.water_act(src,volume,temperature,source)
 
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 76000a4c431..8320136e2be 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -679,4 +679,5 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		H.see_invisible = H.see_override
 
 /datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
-	return
\ No newline at end of file
+		if(temperature >= 330)	M.bodytemperature = M.bodytemperature + (temperature - M.bodytemperature)
+		if(temperature <= 280)	M.bodytemperature = M.bodytemperature - (M.bodytemperature - temperature)
\ No newline at end of file

From 61ac035415a45de70b5a047687cbcf49dbdbb808 Mon Sep 17 00:00:00 2001
From: fludd12 <fludd121@gmail.com>
Date: Fri, 30 Jun 2017 01:00:06 -0400
Subject: [PATCH 10/10] Fixes the last fixes of the last fixes

frick why
---
 code/modules/mob/living/carbon/human/human_defense.dm   | 1 +
 code/modules/mob/living/carbon/human/species/species.dm | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 6a63a30fc5c..fa31b3bc52b 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -468,5 +468,6 @@ emp_act
 	..()
 
 /mob/living/carbon/human/water_act(volume, temperature, source)
+	..()
 	species.water_act(src,volume,temperature,source)
 
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 8320136e2be..30bcdd1914a 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -679,5 +679,7 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		H.see_invisible = H.see_override
 
 /datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
-		if(temperature >= 330)	M.bodytemperature = M.bodytemperature + (temperature - M.bodytemperature)
-		if(temperature <= 280)	M.bodytemperature = M.bodytemperature - (M.bodytemperature - temperature)
\ No newline at end of file
+	if(temperature >= 330)
+		M.bodytemperature = M.bodytemperature + (temperature - M.bodytemperature)
+	if(temperature <= 280)
+		M.bodytemperature = M.bodytemperature - (M.bodytemperature - temperature)
\ No newline at end of file