diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml
index c6768537d0e..333268c9e45 100644
--- a/.github/workflows/byond.yml
+++ b/.github/workflows/byond.yml
@@ -18,11 +18,12 @@ env:
jobs:
lint:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Install
run: |
+ sudo apt-get install python3-cffi
pip install --user -r ./tools/requirements.txt
chmod +x ./scripts/code_check.sh && ./scripts/code_check.sh $PWD
bash tools/ci/install_spaceman_dmm.sh dreamchecker
@@ -48,7 +49,7 @@ jobs:
matrix:
map: [runtime, aurora, sccv_horizon, away_sites_testing]
fail-fast: false
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
needs: lint
services:
mariadb:
@@ -67,7 +68,7 @@ jobs:
source .versions.sh
sudo dpkg --add-architecture i386
sudo apt-get update
- sudo apt-get install -y gcc-multilib libssl1.1:i386
+ sudo apt-get install -y gcc-multilib zlib1g-dev:i386 libssl-dev:i386
bash tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
echo "Getting rust_g from https://github.com/Aurorastation/rust-g/releases/download/${RUST_G_VERSION}/librust_g.so"
diff --git a/.travis.yml b/.travis.yml
index d32d7696cda..0bf4ce5e684 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,19 @@
language: generic
-dist: xenial
+dist: jammy
sudo: false
env:
global:
- BYOND_MAJOR="513"
- BYOND_MINOR="1517"
+ BYOND_MAJOR="514"
+ BYOND_MINOR="1589"
MACRO_COUNT=0
GENDER_COUNT=6
TO_WORLD_COUNT=209
- FLYWAY_BUILD="5.2.4"
+ FLYWAY_BUILD="9.9.0"
NODE_VERSION=10
- RUST_G_VERSION="0.4.2+a2"
+ RUST_G_VERSION="v1.2.0+a2"
PATH=/opt/python/3.7.1/bin:$PATH
- SPACEMAN_DMM_VERSION="suite-1.6"
+ SPACEMAN_DMM_VERSION="suite-1.7.3"
matrix:
- USE_MAP=aurora
- USE_MAP=runtime
diff --git a/.versions.sh b/.versions.sh
index 7def41c2547..1027fae27e8 100644
--- a/.versions.sh
+++ b/.versions.sh
@@ -1,8 +1,8 @@
#!/bin/sh
export BYOND_MAJOR=514
-export BYOND_MINOR=1560
+export BYOND_MINOR=1589
-export RUST_G_VERSION=v0.5.0+a2
-export FLYWAY_BUILD=5.2.4
-export SPACEMAN_DMM_VERSION=suite-1.7
+export RUST_G_VERSION=v1.2.0+a2
+export FLYWAY_BUILD=9.9.0
+export SPACEMAN_DMM_VERSION=suite-1.7.3
diff --git a/code/_helpers/type2type.dm b/code/_helpers/type2type.dm
index 38b79d556aa..83dd093aeea 100644
--- a/code/_helpers/type2type.dm
+++ b/code/_helpers/type2type.dm
@@ -269,9 +269,9 @@ proc/tg_list2text(list/list, glue=",")
switch(child)
if(/datum)
return null
- if(/obj || /mob)
+ if(/obj, /mob)
return /atom/movable
- if(/area || /turf)
+ if(/area, /turf)
return /atom
else
return /datum
diff --git a/code/game/machinery/suit_cycler.dm b/code/game/machinery/suit_cycler.dm
index 2363217688c..75e67313fd8 100644
--- a/code/game/machinery/suit_cycler.dm
+++ b/code/game/machinery/suit_cycler.dm
@@ -623,7 +623,7 @@
suit.name = "captain voidsuit"
suit.icon_state = "capspace"
suit.item_state = "capspace"
- if("^%###^%$" || "Mercenary")
+ if("^%###^%$", "Mercenary")
if(helmet)
helmet.name = "blood-red voidsuit helmet"
helmet.icon_state = "rig0-syndie"
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index ed02ba15dd7..fc3e8088c2e 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -67,6 +67,10 @@
icon_state = "bcircuit"
initial_flooring = /singleton/flooring/reinforced/circuit
+/turf/simulated/floor/bluegrid/cooled
+ name = "cooled mainframe floor"
+ temperature = 278
+
/turf/simulated/floor/greengrid
name = "mainframe floor"
icon = 'icons/turf/flooring/circuit.dmi'
@@ -130,6 +134,10 @@
icon_state = "steel"
initial_flooring = /singleton/flooring/tiling
+/turf/simulated/floor/tiled/cooled
+ name = "cooled steel tiles"
+ temperature = 278
+
/turf/simulated/floor/tiled/full
name = "full steel tile"
icon_state = "steel_full"
@@ -147,6 +155,10 @@
initial_flooring = /singleton/flooring/reinforced
footstep_sound = /singleton/sound_category/plating_footstep
+/turf/simulated/floor/reinforced/cooled
+ name = "cooled reinforced floor"
+ temperature = 278
+
/turf/simulated/floor/reinforced/airless
oxygen = 0
nitrogen = 0
@@ -214,6 +226,10 @@
icon_state = "dark"
initial_flooring = /singleton/flooring/tiling/dark
+/turf/simulated/floor/tiled/dark/cooled
+ name = "cooled plasteel tiles"
+ temperature = 278
+
/turf/simulated/floor/tiled/dark/airless
oxygen = 0
nitrogen = 0
@@ -273,6 +289,10 @@
nitrogen = 0
roof_type = null
+/turf/simulated/floor/plating/cooled
+ name = "cooled plating"
+ temperature = 278
+
/turf/simulated/floor/plating/asteroid
icon = 'icons/turf/total_floors.dmi'
icon_state = "asteroidplating"
diff --git a/code/modules/atmospherics/components/valve.dm b/code/modules/atmospherics/components/valve.dm
index 11434e28678..22c316e00e6 100644
--- a/code/modules/atmospherics/components/valve.dm
+++ b/code/modules/atmospherics/components/valve.dm
@@ -39,9 +39,9 @@
/obj/machinery/atmospherics/valve/Initialize()
switch(dir)
- if(NORTH || SOUTH)
+ if(NORTH, SOUTH)
initialize_directions = NORTH|SOUTH
- if(EAST || WEST)
+ if(EAST, WEST)
initialize_directions = EAST|WEST
. = ..()
diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm
index 01d18a7c214..d881b7fff9d 100644
--- a/code/modules/flufftext/TextFilters.dm
+++ b/code/modules/flufftext/TextFilters.dm
@@ -14,8 +14,8 @@ proc/Intoxicated(phrase)
if(lowertext(newletter)=="a") newletter="ah"
if(lowertext(newletter)=="c") newletter="k"
switch(rand(1,7))
- if(1,3,5,8) newletter="[lowertext(newletter)]"
- if(2,4,6,15) newletter="[uppertext(newletter)]"
+ if(1,3,5) newletter="[lowertext(newletter)]"
+ if(2,4,6) newletter="[uppertext(newletter)]"
if(7) newletter+="'"
//if(9,10) newletter="[newletter]"
//if(11,12) newletter="[newletter]"
diff --git a/code/modules/hallucinations/types/basic.dm b/code/modules/hallucinations/types/basic.dm
index ec36241282a..8c16ee21514 100644
--- a/code/modules/hallucinations/types/basic.dm
+++ b/code/modules/hallucinations/types/basic.dm
@@ -147,6 +147,8 @@
holder.make_dizzy(105)
if(3)
to_chat(holder, SPAN_GOOD("You feel good."))
+ else
+ . = null //This does nothing, it's to avoid a dreamchecker error
..()
//the prick feeling but you actually imagine someone injecting you
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 322b057c62b..06fbcb0ebf9 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -112,6 +112,8 @@ proc/get_radio_key_from_channel(var/channel)
Weaken(3)
if(11 to 60)
to_chat(src, SPAN_WARNING("You struggle to speak with your dislocated jaw!"))
+ else
+ . = null //This does nothing, it's to avoid a dreamchecker error
. = TRUE
else if(stuttering)
message = get_stuttered_message(message)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 6e68d72fb0d..9b42d4a84ad 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -384,9 +384,14 @@ proc/slur(phrase, strength = 100)
if(lowertext(newletter)=="a") newletter="ah"
if(lowertext(newletter)=="c") newletter="k"
switch(rand(1,15))
- if(1,3,5,8) newletter="[lowertext(newletter)]"
- if(2,4,6,15) newletter="[uppertext(newletter)]"
- if(7) newletter+="'"
+ if(1,3,5,8)
+ newletter="[lowertext(newletter)]"
+ if(2,4,6,15)
+ newletter="[uppertext(newletter)]"
+ if(7)
+ newletter+="'"
+ else
+ . = null // For dreamchecker, does nothing
newphrase+="[newletter]";counter-=1
return newphrase
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index cc80acc10bc..7285d866d3b 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -371,10 +371,10 @@
var/dir2 = 0
var/dir3 = 0
switch(direction)
- if(NORTH||SOUTH)
+ if(NORTH, SOUTH)
dir2 = 4
dir3 = 8
- if(EAST||WEST)
+ if(EAST, WEST)
dir2 = 1
dir3 = 2
var/turf/T2 = T
diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm
index e42e28190c9..8afc66c43fb 100644
--- a/code/unit_tests/zas_tests.dm
+++ b/code/unit_tests/zas_tests.dm
@@ -64,33 +64,32 @@ proc/test_air_in_area(var/test_area, var/expectation = UT_NORMAL)
var/pressure = GM.return_pressure()
var/temp = GM.temperature
- switch(expectation)
- if(UT_VACUUM)
- if(pressure > 10)
- test_result["msg"] = "Pressure out of bounds: [pressure] | [t_msg]"
+ if(expectation == UT_VACUUM)
+ if(pressure > 10)
+ test_result["msg"] = "Pressure out of bounds: [pressure]Pa at [temp]K | [t_msg] | expectation: VACUUM"
+ return test_result
+
+
+ if(expectation == UT_NORMAL || expectation == UT_NORMAL_COLD || expectation == UT_NORMAL_COOL)
+ if(abs(pressure - ONE_ATMOSPHERE) > 10)
+ test_result["msg"] = "Pressure out of bounds: [pressure]Pa | [t_msg]"
+ return test_result
+
+ if(expectation == UT_NORMAL)
+ if(abs(temp - T20C) > 10)
+ test_result["msg"] = "Temperature out of bounds: [temp]K at [pressure]Pa | [t_msg] | expectation: NORMAL"
return test_result
-
- if(UT_NORMAL || UT_NORMAL_COLD || UT_NORMAL_COOL)
- if(abs(pressure - ONE_ATMOSPHERE) > 10)
- test_result["msg"] = "Pressure out of bounds: [pressure] | [t_msg]"
+ if(expectation == UT_NORMAL_COLD)
+ if(temp > 120)
+ test_result["msg"] = "Temperature out of bounds: [temp]K at [pressure]Pa | [t_msg] | expectation: NORMAL_COLD"
return test_result
- if(expectation == UT_NORMAL)
- if(abs(temp - T20C) > 10)
- test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
- return test_result
-
- if(expectation == UT_NORMAL_COLD)
- if(temp > 120)
- test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
- return test_result
-
- if(expectation == UT_NORMAL_COOL)
- if(temp > 283)
- test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
- return test_result
+ if(expectation == UT_NORMAL_COOL)
+ if(temp > 283)
+ test_result["msg"] = "Temperature out of bounds: [temp]K at [pressure]Pa | [t_msg] | expectation: NORMAL_COOL"
+ return test_result
GM_checked.Add(GM)
diff --git a/html/changelogs/Fluffyghost-userustg120.yml b/html/changelogs/Fluffyghost-userustg120.yml
new file mode 100644
index 00000000000..58d5a816cfe
--- /dev/null
+++ b/html/changelogs/Fluffyghost-userustg120.yml
@@ -0,0 +1,53 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Fluffyghost
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - backend: "Updated build chain to use the new rustg v1.2.0+a2 from our repository, after having updated our repository."
+ - backend: "Updated byond version to use to 514.1589 from the previously set minor, in the chain."
+ - backend: "Updated flyway version to use to 9.9.0."
+ - backend: "Updated spacemandmm version to use to 1.7.3."
+ - backend: "Removed version bindings for pip requirements."
+ - backend: "Github pipeline now runs on Ubuntu 22.04 (from 20.04), both are LTS."
+ - backend: "Added package requirements to correctly bind into the new version of rust-g."
+ - rscadd: "Added some premade cooled floors, used in the AI chamber."
+ - maptweak: "AI Chamber in Aurora and Horizon now uses the cooled floors."
+ - bugfix: "Fixed ZAS unit tests (along with the mapping above) so now they correctly run. They were not since Aurora."
+ - bugfix: "Fixed switch statements that were using double pipes, as they are either not supported since a while or never were."
+ - bugfix: "Fixed switch statements based on random() that did not catch the variables, as the codechecks now catch them."
+ - rscadd: "ZAS Unit Tests now tell when something fails the temperature, pressure and what expectation parameter they checked for."
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index e0e5cb35321..a5edb2d621d 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -5447,10 +5447,7 @@
/obj/item/aiModule/robocop,
/obj/item/aiModule/paladin,
/obj/item/aiModule/corp,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amk" = (
/obj/machinery/door/window{
@@ -5463,10 +5460,7 @@
/obj/item/aiModule/freeformcore,
/obj/item/aiModule/asimov,
/obj/item/aiModule/nanotrasen,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aml" = (
/obj/machinery/light/small/emergency{
@@ -5644,73 +5638,46 @@
/obj/effect/decal/cleanable/cobweb2{
icon_state = "cobweb1"
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amy" = (
/obj/structure/table/standard,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amz" = (
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amA" = (
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amB" = (
/obj/machinery/ai_status_display{
pixel_x = 32
},
/obj/machinery/firealarm/north,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amC" = (
/obj/effect/decal/warning_stripes,
/obj/machinery/porta_turret{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amD" = (
/obj/item/modular_computer/console/preset/ai,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amE" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amF" = (
/obj/machinery/door/window/southleft,
/obj/machinery/atmospherics/portables_connector,
/obj/machinery/portable_atmospherics/canister/air/airlock,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -5866,10 +5833,7 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amQ" = (
/obj/structure/bed/stool/chair/office/dark{
@@ -5878,20 +5842,14 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/generic,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amR" = (
/obj/machinery/porta_turret{
dir = 4
},
/obj/effect/decal/warning_stripes,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amS" = (
/obj/machinery/door/blast/regular{
@@ -5916,25 +5874,19 @@
dir = 1
},
/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"amT" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"amV" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amW" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -5943,10 +5895,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amX" = (
/obj/machinery/camera/network/command{
@@ -5960,20 +5909,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amY" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"amZ" = (
/obj/machinery/light/small,
@@ -5983,10 +5926,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"ana" = (
/obj/machinery/door/airlock/highsecurity{
@@ -6007,10 +5947,7 @@
name = "AI core maintenance hatch";
opacity = 0
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anb" = (
/obj/machinery/light/small,
@@ -6020,10 +5957,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anc" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -6032,10 +5966,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"and" = (
/obj/structure/sign/vacuum,
@@ -6241,10 +6172,7 @@
"anr" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"ans" = (
/obj/machinery/door/blast/regular{
@@ -6267,7 +6195,7 @@
icon_state = "0-2"
},
/obj/structure/cable/cyan,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"ant" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -6275,37 +6203,25 @@
dir = 4
},
/obj/effect/decal/warning_stripes,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"anv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"anw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"anx" = (
/obj/item/device/radio/intercom{
@@ -6330,10 +6246,7 @@
/obj/effect/landmark{
name = "tripai"
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"any" = (
/obj/machinery/door/airlock/highsecurity{
@@ -6341,10 +6254,7 @@
req_access = list(16)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anz" = (
/obj/structure/grille,
@@ -6571,10 +6481,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -6583,10 +6490,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anM" = (
/obj/machinery/door/firedoor,
@@ -6602,7 +6506,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"anN" = (
/obj/structure/grille,
@@ -6619,7 +6523,7 @@
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"anO" = (
/obj/structure/cable/cyan{
@@ -6648,7 +6552,7 @@
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"anP" = (
/obj/structure/cable/cyan{
@@ -6656,24 +6560,15 @@
d2 = 8;
icon_state = "2-8"
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"anR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"anS" = (
/obj/structure/window/reinforced{
@@ -6685,10 +6580,7 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"anT" = (
/obj/structure/cable/cyan{
@@ -6723,10 +6615,7 @@
dir = 4
},
/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anW" = (
/obj/effect/decal/cleanable/dirt,
@@ -6734,10 +6623,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"anX" = (
/obj/structure/grille,
@@ -6901,20 +6787,14 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aok" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aol" = (
/obj/machinery/hologram/holopad,
@@ -6925,10 +6805,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aom" = (
/obj/machinery/access_button{
@@ -6953,10 +6830,7 @@
pixel_x = 35;
pixel_y = 25
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aon" = (
/obj/machinery/door/airlock/external{
@@ -6973,9 +6847,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating{
- temperature = 273.15
- },
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"aoo" = (
/obj/machinery/embedded_controller/radio/airlock/docking_port{
@@ -7013,9 +6885,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating{
- temperature = 273.15
- },
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"aop" = (
/obj/machinery/door/airlock/external{
@@ -7045,9 +6915,7 @@
name = "AI core maintenance hatch";
opacity = 0
},
-/turf/simulated/floor/plating{
- temperature = 273.15
- },
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"aoq" = (
/obj/structure/cable/cyan{
@@ -7080,10 +6948,7 @@
pixel_x = -35;
pixel_y = -25
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aor" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
@@ -7096,10 +6961,7 @@
dir = 4
},
/obj/machinery/ai_slipper,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aos" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -7108,10 +6970,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aot" = (
/obj/machinery/flasher{
@@ -7132,10 +6991,7 @@
name = "AI Core Door";
req_access = list(16)
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aou" = (
/obj/item/device/radio/intercom{
@@ -7179,10 +7035,7 @@
/obj/effect/landmark/start{
name = "AI"
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aov" = (
/obj/structure/cable/cyan{
@@ -7215,10 +7068,7 @@
c_tag = "AI Core - SMES Room 2";
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aox" = (
/obj/machinery/door/airlock/highsecurity{
@@ -7240,10 +7090,7 @@
name = "AI core maintenance hatch";
opacity = 0
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoy" = (
/obj/effect/decal/cleanable/dirt,
@@ -7253,10 +7100,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoz" = (
/obj/effect/decal/warning_stripes,
@@ -7270,10 +7114,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoA" = (
/obj/machinery/camera/network/command{
@@ -7298,10 +7139,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/universal,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoB" = (
/obj/structure/cable{
@@ -7355,10 +7193,7 @@
/area/rnd/xenobiology/cells/charlie)
"aoE" = (
/obj/machinery/anti_bluespace,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoF" = (
/obj/machinery/door/firedoor,
@@ -7449,10 +7284,7 @@
d2 = 8;
icon_state = "4-8"
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoM" = (
/obj/structure/cable/cyan{
@@ -7461,10 +7293,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/blood/drip,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoN" = (
/obj/machinery/door/firedoor,
@@ -7485,7 +7314,7 @@
d2 = 4;
icon_state = "0-4"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"aoO" = (
/obj/machinery/door/firedoor,
@@ -7502,7 +7331,7 @@
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"aoP" = (
/obj/structure/cable/cyan{
@@ -7533,7 +7362,7 @@
d2 = 8;
icon_state = "0-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"aoQ" = (
/obj/structure/cable/cyan{
@@ -7546,10 +7375,7 @@
d2 = 4;
icon_state = "1-4"
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoR" = (
/obj/structure/cable/cyan{
@@ -7558,17 +7384,11 @@
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aoS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aoT" = (
/obj/machinery/power/apc/super/critical{
@@ -7591,10 +7411,7 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aoU" = (
/obj/structure/cable/cyan{
@@ -7625,10 +7442,7 @@
dir = 4
},
/mob/living/silicon/robot/shell,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoX" = (
/obj/effect/decal/cleanable/dirt,
@@ -7636,10 +7450,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoY" = (
/obj/effect/decal/cleanable/dirt,
@@ -7656,10 +7467,7 @@
target_pressure = 150;
use_power = 1
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aoZ" = (
/obj/structure/cable{
@@ -7831,10 +7639,7 @@
/obj/structure/table/rack,
/obj/item/clothing/mask/breath,
/obj/item/tank/emergency_oxygen,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apn" = (
/obj/machinery/door/blast/regular{
@@ -7857,7 +7662,7 @@
d2 = 2;
icon_state = "0-2"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"apo" = (
/obj/structure/cable/cyan{
@@ -7870,10 +7675,7 @@
dir = 4
},
/obj/effect/decal/warning_stripes,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"app" = (
/obj/structure/cable/cyan{
@@ -7884,10 +7686,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apq" = (
/obj/structure/cable/cyan{
@@ -7903,10 +7702,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apr" = (
/obj/structure/cable/cyan{
@@ -7917,10 +7713,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aps" = (
/obj/item/device/radio/intercom{
@@ -7942,10 +7735,7 @@
/obj/effect/landmark{
name = "tripai"
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apt" = (
/obj/machinery/door/airlock/highsecurity{
@@ -8284,18 +8074,12 @@
/obj/machinery/light{
dir = 8
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apM" = (
/obj/structure/bed/stool/chair/office/dark,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apN" = (
/obj/machinery/door/blast/regular{
@@ -8315,25 +8099,19 @@
},
/obj/structure/window/reinforced,
/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"apO" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apP" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -8343,10 +8121,7 @@
dir = 1;
pixel_y = -28
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apR" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -8355,10 +8130,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apS" = (
/obj/machinery/light/small{
@@ -8370,10 +8142,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apT" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -8382,10 +8151,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apU" = (
/obj/machinery/camera/network/command{
@@ -8400,10 +8166,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"apV" = (
/obj/machinery/door/airlock/highsecurity{
@@ -8424,10 +8187,7 @@
name = "AI core maintenance hatch";
opacity = 0
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apW" = (
/obj/machinery/light/small{
@@ -8439,10 +8199,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -8451,10 +8208,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"apY" = (
/obj/structure/cable{
@@ -8791,18 +8545,12 @@
pixel_x = -5;
pixel_y = -27
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aqq" = (
/obj/machinery/computer/robotics,
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aqr" = (
/obj/machinery/alarm/cold{
@@ -8812,26 +8560,17 @@
/obj/machinery/ai_status_display{
pixel_x = 32
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aqs" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/item/modular_computer/console/preset/ai,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aqt" = (
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aqu" = (
/obj/machinery/door/window/northright,
@@ -8839,10 +8578,7 @@
dir = 1
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"aqv" = (
/obj/structure/cable{
@@ -9056,10 +8792,7 @@
/obj/item/aiModule/teleporterOffline,
/obj/item/aiModule/antimov,
/obj/item/aiModule/purge,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aqO" = (
/obj/machinery/door/window{
@@ -9072,10 +8805,7 @@
/obj/item/aiModule/oneHuman,
/obj/item/aiModule/oxygen,
/obj/item/aiModule/freeformcore,
-/turf/simulated/floor/bluegrid{
- name = "cooled mainframe floor";
- temperature = 278
- },
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"aqP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -26419,10 +26149,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"cvy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -27094,10 +26821,7 @@
/obj/machinery/light_switch{
pixel_x = -26
},
-/turf/simulated/floor/tiled{
- name = "cooled floor";
- temperature = 278
- },
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"dNz" = (
/obj/effect/floor_decal/industrial/warning/cee{
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index 65547e0185e..f7fb256552a 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -724,7 +724,7 @@
name = "Inner Core Airlock";
req_access = list(13)
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"aFN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2026,7 +2026,7 @@
req_access = list(13)
},
/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"bBR" = (
/obj/machinery/computer/general_air_control/large_tank_control{
@@ -3740,7 +3740,7 @@
},
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/porta_turret,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"cTm" = (
/obj/machinery/portable_atmospherics/canister/air/airlock,
@@ -6201,7 +6201,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"eOk" = (
/obj/structure/cable{
@@ -7823,7 +7823,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"fVm" = (
/obj/structure/closet/hazmat/custodial,
@@ -8437,7 +8437,7 @@
/area/hallway/engineering)
"gsG" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"gtE" = (
/obj/effect/decal/cleanable/dirt,
@@ -12318,7 +12318,7 @@
/obj/structure/railing/mapped,
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/porta_turret,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"jyn" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -12443,7 +12443,7 @@
pixel_y = -25
},
/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"jCf" = (
/obj/machinery/light/small/emergency,
@@ -15267,7 +15267,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"lPP" = (
/obj/structure/tank_wall/hydrogen{
@@ -16700,7 +16700,7 @@
c_tag = "AI Core - First Deck Chamber";
dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"mVJ" = (
/obj/structure/cable/green{
@@ -17231,7 +17231,7 @@
/obj/structure/railing/mapped,
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/porta_turret,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"nqp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -21543,7 +21543,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"qQa" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -23306,7 +23306,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"skS" = (
/obj/machinery/light/spot/weak,
@@ -23660,7 +23660,7 @@
},
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/porta_turret,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"sxx" = (
/obj/machinery/recharge_station,
@@ -24176,7 +24176,7 @@
id_tag = "ai_core_sensor";
pixel_x = -30
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"sTu" = (
/obj/machinery/door/firedoor,
@@ -26767,7 +26767,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"uRt" = (
/obj/effect/floor_decal/industrial/warning{
@@ -30175,7 +30175,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"xrp" = (
/obj/effect/floor_decal/corner/blue{
@@ -30650,7 +30650,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 9
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"xLq" = (
/obj/structure/table/rack{
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 90b6f381b98..f485f23cba9 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -2040,7 +2040,7 @@
dir = 5
},
/obj/effect/floor_decal/spline/fancy,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"aTa" = (
/obj/machinery/light,
@@ -2784,7 +2784,7 @@
"bkQ" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/porta_turret,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/cooled,
/area/turret_protected/ai)
"blJ" = (
/obj/machinery/door/airlock/external{
@@ -3074,7 +3074,7 @@
dir = 8
},
/obj/effect/floor_decal/spline/fancy/corner,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"bqW" = (
/obj/effect/floor_decal/corner_wide/yellow/full{
@@ -6044,7 +6044,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"cRu" = (
/obj/machinery/door/firedoor,
@@ -6375,7 +6375,7 @@
/obj/effect/floor_decal/spline/fancy{
dir = 8
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"dat" = (
/obj/machinery/door/airlock/multi_tile/glass{
@@ -9257,7 +9257,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"eAl" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -16105,7 +16105,7 @@
/obj/effect/floor_decal/spline/fancy{
dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"hEx" = (
/obj/machinery/light{
@@ -16574,7 +16574,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plating/cooled,
/area/turret_protected/ai)
"hSp" = (
/obj/structure/closet/crate/hydroponics,
@@ -17411,7 +17411,7 @@
dir = 8
},
/obj/machinery/porta_turret,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/cooled,
/area/turret_protected/ai)
"imC" = (
/obj/structure/railing/mapped{
@@ -19878,7 +19878,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"jvp" = (
/obj/structure/closet/secure_closet/guncabinet{
@@ -21655,7 +21655,7 @@
dir = 4
},
/obj/machinery/firealarm/west,
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"krl" = (
/obj/machinery/door/airlock/mining{
@@ -24827,7 +24827,7 @@
c_tag = "AI Core - Fore"
},
/obj/structure/window/borosilicate/reinforced/skrell,
-/turf/simulated/floor/bluegrid,
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"lYV" = (
/obj/structure/table/stone/marble,
@@ -26322,7 +26322,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/cooled,
/area/turret_protected/ai)
"mHM" = (
/obj/machinery/door/airlock/highsecurity{
@@ -28021,7 +28021,7 @@
/obj/effect/floor_decal/spline/fancy{
dir = 8
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"ntt" = (
/turf/simulated/wall/r_wall,
@@ -29739,7 +29739,7 @@
/obj/effect/floor_decal/spline/fancy{
dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"oou" = (
/obj/structure/lattice/catwalk,
@@ -31268,7 +31268,7 @@
"pch" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/anti_bluespace,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/cooled,
/area/turret_protected/ai)
"pcx" = (
/obj/effect/floor_decal/industrial/warning{
@@ -33684,7 +33684,7 @@
/obj/effect/floor_decal/spline/fancy/corner{
dir = 8
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"qni" = (
/obj/structure/disposalpipe/segment{
@@ -34013,7 +34013,7 @@
dir = 4
},
/obj/machinery/porta_turret,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/cooled,
/area/turret_protected/ai)
"qvx" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -34094,7 +34094,7 @@
/obj/effect/floor_decal/spline/fancy{
dir = 8
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"qwJ" = (
/obj/structure/disposalpipe/segment,
@@ -35475,7 +35475,7 @@
/obj/effect/floor_decal/spline/fancy/corner{
dir = 1
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"rfO" = (
/turf/simulated/wall/r_wall,
@@ -37930,7 +37930,7 @@
pixel_x = -40;
pixel_y = 25
},
-/turf/simulated/floor/bluegrid,
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"sqc" = (
/obj/effect/floor_decal/industrial/warning,
@@ -39104,7 +39104,7 @@
/obj/effect/floor_decal/spline/fancy/corner{
dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"sYI" = (
/obj/machinery/alarm{
@@ -41975,7 +41975,7 @@
/obj/effect/floor_decal/spline/fancy{
dir = 1
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"upn" = (
/obj/structure/cable/green{
@@ -47683,7 +47683,7 @@
/obj/effect/floor_decal/spline/fancy{
dir = 1
},
-/turf/simulated/floor/tiled/dark,
+/turf/simulated/floor/tiled/dark/cooled,
/area/turret_protected/ai)
"wWx" = (
/turf/simulated/floor/wood,
@@ -48850,7 +48850,7 @@
dir = 1;
pixel_y = 24
},
-/turf/simulated/floor/bluegrid,
+/turf/simulated/floor/bluegrid/cooled,
/area/turret_protected/ai)
"xxy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
diff --git a/tools/requirements.txt b/tools/requirements.txt
index f2050ce006d..083395e8700 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,5 +1,5 @@
-pygit2==1.4.0
-bidict==0.21.2
-Pillow==9.3.0
+pygit2==1.11.1
+bidict==0.22.1
+Pillow==9.4.0
PyYAML==5.4.1
-beautifulsoup4==4.10.0
+beautifulsoup4==4.11.2