diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 70f8d4d9d9..41dd476b2d 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -23924,11 +23924,11 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/maintenance/port)
"bfe" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/maintenance/port)
"bff" = (
@@ -56070,7 +56070,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/maintenance/port)
"jyO" = (
@@ -81963,7 +81963,7 @@ aQN
aQN
aZA
aPA
-aWv
+jxF
aYb
aZE
aZE
@@ -82734,7 +82734,7 @@ aQW
aQW
xDM
aPA
-jxF
+aWv
aYb
aZE
bjp
@@ -86272,7 +86272,7 @@ aaa
aaa
gXs
gXs
-aaH
+gXs
abc
abu
abu
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 8be02e9b1e..c691d29b5a 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -53209,7 +53209,10 @@
/turf/open/floor/plasteel,
/area/engineering/atmos)
"fVD" = (
-/obj/machinery/pool/drain,
+/obj/machinery/pool/drain{
+ drain_suck_range = 2;
+ item_suction_range = 1
+ },
/turf/open/pool,
/area/commons/fitness/pool)
"fVX" = (
diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm
index 84071d76f4..2d1aa63a91 100644
--- a/code/modules/admin/antag_panel.dm
+++ b/code/modules/admin/antag_panel.dm
@@ -104,7 +104,7 @@ GLOBAL_VAR(antag_prototypes)
var/datum/component/activity/activity = current.GetComponent(/datum/component/activity)
if(activity)
out += "Activity level: [activity.activity_level]
"
- out += "Hasn't changed areas in approximately [activity.not_moved_counter] seconds"
+ out += "Hasn't changed areas in approximately [activity.not_moved_counter] seconds
"
var/special_statuses = get_special_statuses()
if(length(special_statuses))
diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm
index 9f670de282..142690566b 100644
--- a/code/modules/pool/pool_controller.dm
+++ b/code/modules/pool/pool_controller.dm
@@ -235,10 +235,10 @@
if(POOL_SCALDING) //Scalding
M.adjust_bodytemperature(50,0,500)
if(POOL_WARM) //Warm
- M.adjust_bodytemperature(20,0,360) //Heats up mobs till the termometer shows up
+ M.adjust_bodytemperature(20,0,360) //Heats up mobs till the thermometer shows up
//Normal temp does nothing, because it's just room temperature water.
if(POOL_COOL)
- M.adjust_bodytemperature(-20,250) //Cools mobs till the termometer shows up
+ M.adjust_bodytemperature(-20,250) //Cools mobs till the thermometer shows up
if(POOL_FRIGID) //Freezing
M.adjust_bodytemperature(-60) //cool mob at -35k per cycle, less would not affect the mob enough.
if(M.bodytemperature <= 50 && !M.stat)
@@ -290,10 +290,10 @@
/obj/machinery/pool/controller/proc/update_temp()
if(mist_state)
- if(temperature < POOL_SCALDING)
+ if(temperature < POOL_WARM)
mist_off()
else
- if(temperature == POOL_SCALDING)
+ if(temperature >= POOL_WARM)
mist_on()
update_icon()
diff --git a/html/changelog.html b/html/changelog.html
index 38df427eb3..79b0c0aedc 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,12 @@
-->