Merge remote-tracking branch 'upstream/master'

_maps/map_files/BoxStation/BoxStation.dmm

@@ -23919,11 +23919,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" = (
@@ -56045,7 +56045,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" = (
@@ -81884,7 +81884,7 @@ aQN
 aQN
 aZA
 aPA
-aWv
+jxF
 aYb
 aZE
 aZE
@@ -82655,7 +82655,7 @@ aQW
 aQW
 xDM
 aPA
-jxF
+aWv
 aYb
 aZE
 bjp
@@ -86193,7 +86193,7 @@ aaa
 aaa
 gXs
 gXs
-aaH
+gXs
 abc
 abu
 abu

_maps/map_files/MetaStation/MetaStation.dmm

@@ -53189,7 +53189,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" = (

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()
 

html/changelog.html

@@ -50,6 +50,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">06 June 2021</h2>
+			<h3 class="author">bunny232 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Pools are capable of mist at lower temperatures</li>
+			</ul>
+
 			<h2 class="date">05 June 2021</h2>
 			<h3 class="author">Arturlang updated:</h3>
 			<ul class="changes bgimages16">
@@ -592,12 +598,6 @@
 				<li class="bugfix">Lockers/Crates can now be deconstructed the right way respecting the cutting_tool (even if it's not one of the default interactions).</li>
 				<li class="rscdel">Dragging the laptop into itself shouldn't do anything anymore (kind of pointless and hard to do).</li>
 			</ul>
-
-			<h2 class="date">04 April 2021</h2>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="balance">After a sudden crash in the tower-cap log slash wooden plank economy, NanoTrasen has decided to stop selling tower-cap logs to Cargo.</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -29383,3 +29383,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Pubby's toxins injector now starts at 200L, like it does on other maps
   zeroisthebiggay:
   - rscadd: light floppy dog ears
+2021-06-06:
+  bunny232:
+  - rscadd: Pools are capable of mist at lower temperatures