From 19f1eba0155ecb1a1686c8c6f086549be1ababee Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sat, 25 Jan 2020 17:13:11 -0700
Subject: [PATCH] renames

---
 code/__DEFINES/pool.dm               | 2 +-
 code/modules/pool/pool_controller.dm | 6 +++---
 code/modules/pool/pool_drain.dm      | 2 +-
 code/modules/pool/pool_wires.dm      | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/__DEFINES/pool.dm b/code/__DEFINES/pool.dm
index 3df2f15bf6..3a7981d354 100644
--- a/code/__DEFINES/pool.dm
+++ b/code/__DEFINES/pool.dm
@@ -6,7 +6,7 @@
 #define POOL_SCALDING 5
 
 GLOBAL_LIST_INIT(blacklisted_pool_reagents, list(
-	/datum/reagent/plasma, /datum/reagent/oxygen, /datum/reagent/n2o, /datum/reagent/nitrogen,		//gases
+	/datum/reagent/toxin/plasma, /datum/reagent/oxygen, /datum/reagent/nitrous_oxide, /datum/reagent/nitrogen,		//gases
 	/datum/reagent/fermi,		//blanket fermichem ban sorry. this also covers mkultra, genital enlargers, etc etc.
 	/datum/reagent/drug/aphrodisiac, /datum/reagent/drug/anaphrodisiac, /datum/reagent/drug/aphrodisiacplus, /datum/reagent/anaphrodisiacplus		//literally asking for prefbreaks
 	))
diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm
index 24623cdc68..6be4fd7643 100644
--- a/code/modules/pool/pool_controller.dm
+++ b/code/modules/pool/pool_controller.dm
@@ -281,12 +281,12 @@
 	if(href_list["IncreaseTemp"])
 		if(CanUpTemp(usr))
 			temperature++
-			handle_temp()
+			update_temp()
 			interact_delay = world.time + 15
 	if(href_list["DecreaseTemp"])
 		if(CanDownTemp(usr))
 			temperature--
-			handle_temp()
+			update_temp()
 			interact_delay = world.time + 15
 	if(href_list["Activate Drain"])
 		if((drainable || issilicon(usr) || IsAdminGhost(usr)) && !linked_drain.active)
@@ -369,7 +369,7 @@
 			var/M = new /obj/effect/mist(W)
 			linked_mist += M
 
-/obj/machinery/pool/controller/proc/mistoff() //Delete all /obj/effect/mist from all linked pool tiles.
+/obj/machinery/pool/controller/proc/mist_off() //Delete all /obj/effect/mist from all linked pool tiles.
 	for(var/M in linked_mist)
 		qdel(M)
 	mist_state = FALSE
diff --git a/code/modules/pool/pool_drain.dm b/code/modules/pool/pool_drain.dm
index 425977d202..c292dd7354 100644
--- a/code/modules/pool/pool_drain.dm
+++ b/code/modules/pool/pool_drain.dm
@@ -62,7 +62,7 @@
 					pool_controller.bloody /= 2
 				else
 					pool_controller.bloody /= 4
-				pool_controller.changecolor()
+				pool_controller.update_color()
 				filling = FALSE
 				active = FALSE
 		else
diff --git a/code/modules/pool/pool_wires.dm b/code/modules/pool/pool_wires.dm
index 7e98383606..7341c503a9 100644
--- a/code/modules/pool/pool_wires.dm
+++ b/code/modules/pool/pool_wires.dm
@@ -22,7 +22,7 @@
 	var/obj/machinery/pool/controller/P = holder
 	var/list/status = list()
 	status += "The blue light is [P.drainable ? "on" : "off"]."
-	status += "The red light is [P.tempunlocked ? "on" : "off"]."
+	status += "The red light is [P.temperature_unlocked ? "on" : "off"]."
 	status += "The yellow light is [P.shocked ? "on" : "off"]."
 	return status
 
@@ -32,7 +32,7 @@
 		if(POOL_WIRE_DRAIN)
 			P.drainable = FALSE
 		if(POOL_WIRE_TEMP)
-			P.tempunlocked = FALSE
+			P.temperature_unlocked = FALSE
 		if(WIRE_SHOCK)
 			P.shocked = !P.shocked
 			addtimer(CALLBACK(P, /obj/machinery/autolathe.proc/reset, wire), 60)
@@ -47,9 +47,9 @@
 				P.drainable = TRUE
 		if(POOL_WIRE_TEMP)
 			if(mend)
-				P.tempunlocked = FALSE
+				P.temperature_unlocked = FALSE
 			else
-				P.tempunlocked = TRUE
+				P.temperature_unlocked = TRUE
 		if(WIRE_ZAP)
 			P.shock(usr, 50)
 		if(WIRE_SHOCK)