From 4b5b6a906303dde37ba99475608203bba2d2ae1d Mon Sep 17 00:00:00 2001 From: bunny232 Date: Thu, 3 Jun 2021 18:38:59 -0400 Subject: [PATCH 1/6] Update MetaStation.dmm --- _maps/map_files/MetaStation/MetaStation.dmm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index d2857d8a43..0363f8b45a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -53189,7 +53189,9 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "fVD" = ( -/obj/machinery/pool/drain, +/obj/machinery/pool/drain{ + drain_suck_range = 1 + }, /turf/open/pool, /area/commons/fitness/pool) "fVX" = ( From e4c01b3f745501f0f12c91b17233bcf734860ed8 Mon Sep 17 00:00:00 2001 From: bunny232 Date: Thu, 3 Jun 2021 18:49:43 -0400 Subject: [PATCH 2/6] Woopsie, right vars are set now --- _maps/map_files/MetaStation/MetaStation.dmm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0363f8b45a..0570a6d480 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -53190,7 +53190,8 @@ /area/engineering/atmos) "fVD" = ( /obj/machinery/pool/drain{ - drain_suck_range = 1 + drain_suck_range = 2; + item_suction_range = 1 }, /turf/open/pool, /area/commons/fitness/pool) From 720966f31e3a2d45082dd97d4f1adbffd39faa7f Mon Sep 17 00:00:00 2001 From: bunny232 Date: Thu, 3 Jun 2021 19:10:46 -0400 Subject: [PATCH 3/6] Misty~ --- code/modules/pool/pool_controller.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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() From d3f6b69a865eb94d87da2732ec4e0a7efa204bae Mon Sep 17 00:00:00 2001 From: MrJWhit <48370570+MrJWhit@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:26:06 -0400 Subject: [PATCH 4/6] Update BoxStation.dmm --- _maps/map_files/BoxStation/BoxStation.dmm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d3f71b44f6..aacedbca82 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_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 From f3f5b0d6052f2471c90e79cc0987912a55bdadc2 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 5 Jun 2021 16:26:23 -0500 Subject: [PATCH 5/6] Automatic changelog generation for PR #14793 [ci skip] --- html/changelogs/AutoChangeLog-pr-14793.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-14793.yml diff --git a/html/changelogs/AutoChangeLog-pr-14793.yml b/html/changelogs/AutoChangeLog-pr-14793.yml new file mode 100644 index 0000000000..137bb40a49 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14793.yml @@ -0,0 +1,4 @@ +author: "bunny232" +delete-after: True +changes: + - rscadd: "Pools are capable of mist at lower temperatures" From e24ecea4927213051fdcd10fe67b8e63cb714db9 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sun, 6 Jun 2021 00:41:17 +0000 Subject: [PATCH 6/6] Automatic changelog compile [ci skip] --- html/changelog.html | 12 ++++++------ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-14793.yml | 4 ---- 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-14793.yml diff --git a/html/changelog.html b/html/changelog.html index 1e425c557e..e277c9fbe1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,12 @@ -->
+

06 June 2021

+

bunny232 updated:

+
    +
  • Pools are capable of mist at lower temperatures
    • +
+

05 June 2021

Arturlang updated:

    @@ -592,12 +598,6 @@
  • Lockers/Crates can now be deconstructed the right way respecting the cutting_tool (even if it's not one of the default interactions).
  • Dragging the laptop into itself shouldn't do anything anymore (kind of pointless and hard to do).
- -

04 April 2021

-

Hatterhat updated:

-
    -
  • After a sudden crash in the tower-cap log slash wooden plank economy, NanoTrasen has decided to stop selling tower-cap logs to Cargo.
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 30b5280ea2..f5a9c7dba8 100644 --- a/html/changelogs/.all_changelog.yml +++ 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 diff --git a/html/changelogs/AutoChangeLog-pr-14793.yml b/html/changelogs/AutoChangeLog-pr-14793.yml deleted file mode 100644 index 137bb40a49..0000000000 --- a/html/changelogs/AutoChangeLog-pr-14793.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "bunny232" -delete-after: True -changes: - - rscadd: "Pools are capable of mist at lower temperatures"