From 7b35161242ce85246b62aeb9271cd4446b7139e2 Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Wed, 31 Jul 2024 14:31:18 -0400
Subject: [PATCH 1/2] Adds CI for simple pipe and unary connections (#26340)
* Adds CI for missing pipe connections
* fix box
* fix delta
* fixes meta
* partially fixes cere
* yah
* cere fix
* holy shit
* adds unary stuff too
* im dumb
* yeah
---
_maps/map_files/stations/boxstation.dmm | 27 +++--
_maps/map_files/stations/cerestation.dmm | 128 +++++++---------------
_maps/map_files/stations/deltastation.dmm | 13 ++-
_maps/map_files/stations/metastation.dmm | 28 ++---
code/modules/unit_tests/map_tests.dm | 25 +++++
5 files changed, 96 insertions(+), 125 deletions(-)
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index a4ab4898cfb3..19781232e209 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -41341,6 +41341,7 @@
pixel_x = 3;
pixel_y = -3
},
+/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -52029,6 +52030,15 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"dLj" = (
+/obj/machinery/door/poddoor/preopen{
+ name = "Biohazard Shutter";
+ id_tag = "RnDChem"
+ },
+/obj/effect/spawner/window/reinforced/plasma,
+/obj/machinery/atmospherics/pipe/simple/visible,
+/turf/simulated/floor/engine,
+/area/station/science/misc_lab)
"dLF" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/preopen{
@@ -52106,10 +52116,6 @@
icon_state = "purplecorner"
},
/area/station/hallway/primary/starboard/east)
-"dMK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/wall,
-/area/station/public/toilet/unisex)
"dMM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/effect/spawner/random_spawners/oil_maybe,
@@ -64148,8 +64154,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"jzZ" = (
@@ -79554,11 +79558,6 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
-"qRE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/wall,
-/area/station/command/meeting_room)
"qRU" = (
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 1;
@@ -124830,7 +124829,7 @@ aWZ
thN
xVe
qcB
-dMK
+aUQ
cts
csD
csD
@@ -125061,7 +125060,7 @@ brb
bpt
jju
nvC
-qRE
+bxl
bxl
lOo
lOo
@@ -143863,7 +143862,7 @@ cDG
cFU
cHp
cIF
-cJP
+dLj
oEK
cLe
tWz
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 6fe7e02c1ae9..cb6d9f302ade 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -6784,6 +6784,12 @@
/mob/living/simple_animal/hostile/gorilla/cargo_domestic{
name = "Forklift"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -7989,6 +7995,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aYU" = (
@@ -10347,9 +10356,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -10357,6 +10363,9 @@
name = "External Airlock Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/east)
"bly" = (
@@ -24234,17 +24243,10 @@
icon_state = "brown"
},
/area/station/supply/qm)
-"cEu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 8
- },
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/supply/office)
"cEv" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -24488,9 +24490,6 @@
},
/area/station/medical/chemistry)
"cFv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/disposalpipe/segment,
/obj/structure/morgue{
dir = 8
@@ -37496,6 +37495,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -37596,11 +37598,9 @@
},
/area/station/security/checkpoint/secondary)
"eZa" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -39938,14 +39938,12 @@
dir = 4
},
/obj/item/storage/fancy/donut_box,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/security/main)
"fRK" = (
@@ -46776,11 +46774,11 @@
/turf/simulated/floor/transparent/glass/reinforced/plasma,
/area/station/engineering/control)
"ieP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
},
-/turf/simulated/mineral/ancient,
-/area/station/maintenance/port2)
+/area/station/supply/office)
"ifa" = (
/turf/simulated/wall/indestructible/riveted,
/area/station/science/toxins/test)
@@ -48449,12 +48447,6 @@
icon_state = "dark"
},
/area/station/supply/office)
-"iFb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/space,
-/area/space)
"iFj" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -51491,14 +51483,12 @@
"jAN" = (
/obj/effect/landmark/lightsout,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/obj/structure/cable/orange{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -54589,10 +54579,10 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/south)
"kyi" = (
+/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 6
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"kyo" = (
@@ -56993,7 +56983,9 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -62112,10 +62104,6 @@
icon_state = "wood-broken7"
},
/area/station/service/bar)
-"mRO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/wall,
-/area/station/hallway/primary/central/east)
"mRS" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/sign/securearea,
@@ -64966,12 +64954,6 @@
icon_state = "darkyellow"
},
/area/station/engineering/break_room)
-"nNa" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/wall,
-/area/station/supply/office)
"nNd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light/small{
@@ -68413,9 +68395,6 @@
},
/area/station/hallway/primary/fore/west)
"oTn" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 1
- },
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plating,
@@ -71030,16 +71009,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/supply/miningdock)
-"pIz" = (
-/obj/structure/morgue,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/landmark/spawner/rev,
-/turf/simulated/floor/plasteel{
- icon_state = "dark"
- },
-/area/station/medical/morgue)
"pII" = (
/obj/machinery/suit_storage_unit/rd/secure,
/obj/machinery/alarm/directional/east,
@@ -84569,6 +84538,9 @@
icon_state = "4-8"
},
/obj/effect/spawner/random_spawners/dirt_frequent,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"ucV" = (
@@ -93467,20 +93439,6 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/fore2)
-"wEY" = (
-/obj/machinery/atmospherics/meter,
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
- dir = 1;
- external_pressure_bound = 0;
- autolink_id = "o2_out";
- internal_pressure_bound = 4000;
- pressure_checks = 2
- },
-/turf/simulated/wall/r_wall,
-/area/station/engineering/atmos)
"wFa" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/item/radio/intercom{
@@ -94106,9 +94064,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -115720,7 +115676,7 @@ vkl
vkl
gtU
vkl
-xTj
+vkl
lyI
lyI
fPc
@@ -120273,7 +120229,7 @@ nIF
xdr
cEM
cEM
-ieP
+cEM
hoF
xWx
xWx
@@ -126737,7 +126693,7 @@ bPp
bDR
bNn
vsE
-wEY
+bPp
bDR
bUl
vsE
@@ -135197,7 +135153,7 @@ dwz
gzG
dwz
dwz
-mRO
+dwz
uNG
uNG
uNG
@@ -141851,7 +141807,7 @@ rNK
rNK
rNK
rNK
-iFb
+rNK
rNK
rNK
rNK
@@ -149538,7 +149494,7 @@ scI
any
cAn
cBv
-cEu
+pdF
cHF
ayP
cSE
@@ -149794,7 +149750,7 @@ woa
scI
any
aQA
-hZJ
+ieP
cEv
cIr
kkk
@@ -150316,7 +150272,7 @@ any
any
any
fue
-nNa
+any
ucH
gaX
any
@@ -153194,7 +153150,7 @@ bil
wxI
uyn
uyn
-pIz
+lzO
gGb
biN
ivK
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index c77375516e74..1939e07b0136 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -17258,14 +17258,12 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -31904,7 +31902,7 @@
/area/station/engineering/ai_transit_tube)
"bNY" = (
/obj/item/kirbyplants,
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/plasteel{
@@ -34311,7 +34309,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/ai_transit_tube)
"bUd" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/plasteel/dark,
@@ -72538,6 +72536,9 @@
/obj/machinery/door/airlock/mining{
name = "Expedition Headquarters"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/supply/expedition)
"iFv" = (
@@ -90698,7 +90699,7 @@
},
/area/station/hallway/primary/central/north)
"sWx" = (
-/obj/effect/spawner/airlock/w_to_e,
+/obj/effect/spawner/airlock/e_to_w,
/turf/simulated/wall,
/area/station/engineering/ai_transit_tube)
"sWI" = (
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 1418a5a502fa..7738b3e73500 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -2133,7 +2133,6 @@
"aqc" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/mapping_helpers/airlock/autoname,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -25109,6 +25108,8 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -25397,12 +25398,6 @@
layer = 4;
pixel_y = 32
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -25416,6 +25411,12 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -57884,17 +57885,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
-"jjG" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 8
- },
-/obj/machinery/door/poddoor{
- id_tag = "ToxinsVenting";
- name = "Toxins Venting Bay Door";
- power_state = 0
- },
-/turf/space,
-/area/station/science/toxins/mixing)
"jjL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -123657,7 +123647,7 @@ bMg
mcw
rfK
cEK
-jjG
+agK
agK
nec
cOp
diff --git a/code/modules/unit_tests/map_tests.dm b/code/modules/unit_tests/map_tests.dm
index f4e869ceef8c..067e7358d5b7 100644
--- a/code/modules/unit_tests/map_tests.dm
+++ b/code/modules/unit_tests/map_tests.dm
@@ -154,3 +154,28 @@
continue // same object, continue
if(cable.d1 == other_cable.d1 && cable.d2 == other_cable.d2)
Fail(T, "tile has duplicated cables.")
+
+/datum/map_per_tile_test/missing_pipe_connection
+
+/datum/map_per_tile_test/missing_pipe_connection/CheckTile(turf/T)
+ var/obj/machinery/atmospherics/pipe/simple/pipe = locate() in T.contents
+ if(isnull(pipe))
+ return
+ if(!pipe.node1 && !pipe.node2)
+ Fail(T, "[pipe] ([pipe.type]) missing both nodes.")
+ return
+ if(istype(pipe, /obj/machinery/atmospherics/pipe/simple/heat_exchanging) && (pipe.node1 || pipe.node2))
+ return // H/E pipes only need one end, because they don't always become full loops
+ if(!pipe.node1)
+ Fail(T, "[pipe] ([pipe.type]) missing node1. ([uppertext(dir2text(pipe.initialize_directions & ~(get_dir(pipe, pipe.node2))))])")
+ if(!pipe.node2)
+ Fail(T, "[pipe] ([pipe.type]) missing node2. ([uppertext(dir2text(pipe.initialize_directions & ~(get_dir(pipe, pipe.node1))))])")
+
+/datum/map_per_tile_test/unary_device_connection
+
+/datum/map_per_tile_test/unary_device_connection/CheckTile(turf/T)
+ var/obj/machinery/atmospherics/unary/unary_device = locate() in T.contents
+ if(isnull(unary_device))
+ return
+ if(!unary_device.node)
+ Fail(T, "[unary_device] ([unary_device.type]) missing node. ([uppertext(dir2text(unary_device.dir))])")
From ca79f65c8d581760b40138c9d4edfd4ff7febc59 Mon Sep 17 00:00:00 2001
From: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:01:55 +1000
Subject: [PATCH 2/2] Adds a missing `|` to the player panel after "make super
hero" (#26353)
* Hold my brain, brain holder.
* Update misc_admin_procs.dm
* woops
---
code/modules/admin/misc_admin_procs.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm
index 42463d226288..936e29a9e87f 100644
--- a/code/modules/admin/misc_admin_procs.dm
+++ b/code/modules/admin/misc_admin_procs.dm
@@ -202,7 +202,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
Make Robot |
Make Alien |
Make Slime |
- Make Superhero
+ Make Superhero |
"}
//Simple Animals