Skip to content

Commit

Permalink
Removes per z level station relays, allows tcomms to reach across int…
Browse files Browse the repository at this point in the history
…erconnected zs (tgstation#76360)

The second layer of tram does not need its own relay, it is like 10 feet
max above the first.
Feels wrong in game, mappers tend to just sneak these off in corners, it
sucks.
Shouldn't need to do it.

Instead, tcomms z levels will be filled based off the z stack, rather
then just the layer itself.

Adds a list/helper to make this more efficient/more easily duplicable

Matches what people expect better, removes redundant map bits, better
vibes.

:cl:
balance: Tcomms now works across connected (vertically) zlevels. No more
hunting in maint for the relay.
/:cl:
  • Loading branch information
LemonInTheDark authored and Absolucy committed May 31, 2024
1 parent 9d67503 commit f3f0034
Show file tree
Hide file tree
Showing 9 changed files with 389 additions and 397 deletions.
361 changes: 178 additions & 183 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm

Large diffs are not rendered by default.

99 changes: 47 additions & 52 deletions _maps/map_files/NorthStar/north_star.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1561,6 +1561,20 @@
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/wood/large,
/area/station/service/library/artgallery)
"atO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=4-1";
location = "4-0"
},
/mob/living/basic/bot/medbot/autopatrol,
/turf/open/floor/iron/dark/side{
dir = 9
},
/area/station/hallway/floor4/fore)
"atP" = (
/obj/effect/turf_decal/trimline/green/corner,
/obj/structure/sign/poster/official/random/directional/west,
Expand Down Expand Up @@ -20563,17 +20577,6 @@
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/iron,
/area/station/commons/locker)
"fwM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=2-0";
location = "2-19"
},
/mob/living/basic/bot/medbot/autopatrol,
/turf/open/floor/iron/dark,
/area/station/hallway/floor2/aft)
"fwV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -21735,6 +21738,17 @@
"fMs" = (
/turf/open/floor/plating/airless,
/area/station/maintenance/floor3/port/aft)
"fMy" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=2-0";
location = "2-19"
},
/mob/living/basic/bot/medbot/autopatrol,
/turf/open/floor/iron/dark,
/area/station/hallway/floor2/aft)
"fMB" = (
/obj/effect/turf_decal/trimline/red/line{
dir = 8
Expand Down Expand Up @@ -22531,6 +22545,16 @@
/obj/structure/chair/comfy/black,
/turf/open/floor/iron/dark/smooth_large,
/area/station/hallway/floor1/fore)
"fXE" = (
/obj/structure/table/reinforced,
/mob/living/basic/bot/medbot/stationary{
name = "Doctor Oktoberfest";
desc = "A little medical robot. He helps keep the individual you're performing surgery on alive"
},
/turf/open/floor/iron/showroomfloor{
name = "lab floor"
},
/area/station/science/robotics/lab)
"fXF" = (
/obj/structure/chair/office,
/obj/effect/landmark/start/atmospheric_technician,
Expand Down Expand Up @@ -62635,16 +62659,6 @@
},
/turf/open/floor/grass,
/area/station/science/xenobiology)
"qCZ" = (
/obj/structure/table/reinforced,
/mob/living/basic/bot/medbot/stationary{
name = "Doctor Oktoberfest";
desc = "A little medical robot. He helps keep the individual you're performing surgery on alive"
},
/turf/open/floor/iron/showroomfloor{
name = "lab floor"
},
/area/station/science/robotics/lab)
"qDa" = (
/obj/effect/turf_decal/siding/wideplating_new{
dir = 1
Expand Down Expand Up @@ -65167,20 +65181,6 @@
/obj/structure/cable,
/turf/open/floor/carpet/red,
/area/station/service/library/artgallery)
"rlC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=4-1";
location = "4-0"
},
/mob/living/basic/bot/medbot/autopatrol,
/turf/open/floor/iron/dark/side{
dir = 9
},
/area/station/hallway/floor4/fore)
"rlI" = (
/turf/open/floor/iron/dark/textured,
/area/station/security/checkpoint/second)
Expand Down Expand Up @@ -65803,11 +65803,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/floor2/starboard/aft)
"rvE" = (
/obj/machinery/telecomms/relay/preset/station,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/circuit/telecomms,
/area/station/tcommsat/server/upper)
"rvZ" = (
/obj/effect/turf_decal/trimline/blue/corner{
dir = 8
Expand Down Expand Up @@ -85889,11 +85884,6 @@
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/pod/dark,
/area/station/maintenance/floor2/starboard)
"wXy" = (
/obj/machinery/airalarm/directional/north,
/mob/living/basic/bot/cleanbot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"wXE" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
Expand Down Expand Up @@ -85959,6 +85949,11 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron/dark,
/area/station/commons/storage/tools)
"wYv" = (
/obj/machinery/airalarm/directional/north,
/mob/living/basic/bot/cleanbot,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/turret_protected/aisat_interior)
"wYB" = (
/obj/effect/turf_decal/tile/red{
dir = 8
Expand Down Expand Up @@ -194948,7 +194943,7 @@ rMY
cJI
cJI
dbN
fwM
fMy
ilA
tJZ
kqG
Expand Down Expand Up @@ -198311,7 +198306,7 @@ lrA
kHJ
bCh
fTo
qCZ
fXE
aal
pnc
lfy
Expand Down Expand Up @@ -207799,7 +207794,7 @@ oyh
oyh
tUT
rlN
rvE
qRS
dfd
inK
oOr
Expand Down Expand Up @@ -273335,7 +273330,7 @@ ucA
ucA
tUT
rlN
rvE
qRS
kGy
inK
oOr
Expand Down Expand Up @@ -307259,7 +307254,7 @@ mqi
rUa
hJF
rEU
rlC
atO
khk
gfb
rEU
Expand Down Expand Up @@ -332958,7 +332953,7 @@ tOV
knH
rKN
aFj
wXy
wYv
oiP
mIX
rPb
Expand Down Expand Up @@ -338871,7 +338866,7 @@ ucA
ucA
tUT
rlN
rvE
qRS
vKH
inK
gMd
Expand Down
Loading

0 comments on commit f3f0034

Please sign in to comment.