mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 15:47:15 +01:00
[MIRROR] Removed unnecessary/incorrectly placed space tiles on multiple ruins maps [MDB IGNORE] (#22738)
* Removed unnecessary/incorrectly placed space tiles on multiple ruins maps (#77114) ## About The Pull Request This fixes all failing instances of `/datum/unit_test/mapload_space_verification` on local machines. These never popped up on Github CI actions because the space budget is set to 0, but running unit tests on local machine will cause some ruins maps to fail the test on other z levels. This fixes all instances of the failed test and also adjusts the space ruin space tile placement to be more consistent across all maps. Space tiles should be placed whenever necessary for a map, otherwise usage of template_noop is more appropriate. This consistency is improved by removing surrounding space tiles and replacing them with template_noop on several maps. Also fixes a loose space turf inside one of the shuttles. ## Why It's Good For The Game Consistency is key also failing tests bad. Only integral changes are the 5 space tiles on one of the ruins and the singular space tile inside another, the mass space replacements with template_noop can be argued, however it mostly seems to be because of how long those templates have existed that they have the surrounding space tiles in the first place. ## Changelog :cl:Senefi fix: Replaced 5 space tiles in the wall of the anomaly research ruin with rocks. fix: Replaced the tile under the window in the mimes vs clowns ruin with plating. fix: Replaced space tile in the emergency fish shuttle with plastitanium flooring. fix: Removed space tiles from the exterior of some ruins templates. /🆑 * Removed unnecessary/incorrectly placed space tiles on multiple ruins maps * Upstream map reset * Delete gateway_test.dmm * Revert "Delete gateway_test.dmm" This reverts commit 0b25dd026d04411eb1af0657872b584f3b859648. * Revert "Upstream map reset" This reverts commit 466d20032946bc3eb276df63e58da7c98182fccb. * Upstream map reset * Upstream map reset * fixes invalid map * Puts this back to how it was --------- Co-authored-by: Senefi <20830349+Peliex@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
committed by
nevimer
co-authored by
Senefi
Giz
parent
141675869e
commit
154683383b
@@ -51,11 +51,6 @@
|
||||
/obj/modular_map_connector,
|
||||
/turf/template_noop,
|
||||
/area/ruin/space/djstation)
|
||||
"O" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/effect/spawner/random/structure/grille,
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"P" = (
|
||||
/obj/structure/rack,
|
||||
/obj/effect/spawner/random/food_or_drink/refreshing_beverage{
|
||||
@@ -94,7 +89,7 @@ e
|
||||
e
|
||||
e
|
||||
e
|
||||
O
|
||||
e
|
||||
j
|
||||
e
|
||||
a
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -93,19 +93,11 @@
|
||||
},
|
||||
/turf/open/floor/iron/white,
|
||||
/area/misc/anomaly_research)
|
||||
"dz" = (
|
||||
/turf/open/space/basic,
|
||||
/area/misc/anomaly_research)
|
||||
"dD" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/effect/spawner/random/environmentally_safe_anomaly,
|
||||
/turf/open/lava/plasma/ice_moon,
|
||||
/area/misc/anomaly_research)
|
||||
"ek" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/tile/purple/opposingcorners,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/misc/anomaly_research)
|
||||
"eq" = (
|
||||
/obj/structure/window/reinforced/spawner/directional/south,
|
||||
/obj/structure/table,
|
||||
@@ -739,6 +731,11 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
|
||||
/turf/open/floor/iron/smooth,
|
||||
/area/misc/anomaly_research)
|
||||
"tG" = (
|
||||
/obj/effect/turf_decal/tile/purple/opposingcorners,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron/white,
|
||||
/area/misc/anomaly_research)
|
||||
"tK" = (
|
||||
/obj/structure/chair/office{
|
||||
dir = 1
|
||||
@@ -2975,7 +2972,7 @@ rX
|
||||
xo
|
||||
xo
|
||||
aX
|
||||
ek
|
||||
tG
|
||||
Cl
|
||||
xE
|
||||
xE
|
||||
@@ -3013,7 +3010,7 @@ Ew
|
||||
AV
|
||||
lL
|
||||
QP
|
||||
ek
|
||||
tG
|
||||
Cl
|
||||
xE
|
||||
xE
|
||||
@@ -3051,7 +3048,7 @@ QI
|
||||
AV
|
||||
SQ
|
||||
Iw
|
||||
ek
|
||||
tG
|
||||
Cl
|
||||
Cl
|
||||
AV
|
||||
@@ -3090,8 +3087,8 @@ AV
|
||||
wz
|
||||
Iw
|
||||
Ov
|
||||
ek
|
||||
ek
|
||||
tG
|
||||
tG
|
||||
AV
|
||||
Ya
|
||||
xE
|
||||
@@ -3129,7 +3126,7 @@ GI
|
||||
Iw
|
||||
iK
|
||||
wg
|
||||
ek
|
||||
tG
|
||||
AV
|
||||
Ya
|
||||
xE
|
||||
@@ -3167,7 +3164,7 @@ ok
|
||||
Iw
|
||||
uB
|
||||
oq
|
||||
ek
|
||||
tG
|
||||
AV
|
||||
Ya
|
||||
xE
|
||||
@@ -3205,7 +3202,7 @@ sg
|
||||
Iw
|
||||
hU
|
||||
Ia
|
||||
ek
|
||||
tG
|
||||
AV
|
||||
Ya
|
||||
Ya
|
||||
@@ -3282,7 +3279,7 @@ Iw
|
||||
Iw
|
||||
iq
|
||||
Iw
|
||||
ek
|
||||
tG
|
||||
xQ
|
||||
AV
|
||||
nA
|
||||
@@ -3356,7 +3353,7 @@ kY
|
||||
oK
|
||||
ip
|
||||
ii
|
||||
ek
|
||||
tG
|
||||
Iw
|
||||
fe
|
||||
YA
|
||||
@@ -3394,7 +3391,7 @@ Gr
|
||||
mC
|
||||
nh
|
||||
cA
|
||||
ek
|
||||
tG
|
||||
ZL
|
||||
Ng
|
||||
Ox
|
||||
@@ -3462,7 +3459,7 @@ Ya
|
||||
RT
|
||||
RT
|
||||
Ya
|
||||
dz
|
||||
Ya
|
||||
Ya
|
||||
AV
|
||||
hq
|
||||
@@ -3499,8 +3496,8 @@ Ya
|
||||
(43,1,1) = {"
|
||||
RT
|
||||
RT
|
||||
dz
|
||||
dz
|
||||
Ya
|
||||
Ya
|
||||
Ya
|
||||
AV
|
||||
uN
|
||||
@@ -3510,7 +3507,7 @@ ut
|
||||
cA
|
||||
Cf
|
||||
sE
|
||||
ek
|
||||
tG
|
||||
xQ
|
||||
AV
|
||||
jN
|
||||
@@ -3537,7 +3534,7 @@ Ya
|
||||
(44,1,1) = {"
|
||||
RT
|
||||
Ya
|
||||
dz
|
||||
Ya
|
||||
Ya
|
||||
Ya
|
||||
AV
|
||||
@@ -3575,7 +3572,7 @@ RT
|
||||
(45,1,1) = {"
|
||||
RT
|
||||
Ya
|
||||
dz
|
||||
Ya
|
||||
Ya
|
||||
Ya
|
||||
AV
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -271,7 +271,7 @@
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/effect/mapping_helpers/damaged_window,
|
||||
/obj/effect/decal/cleanable/blood/splatter/over_window,
|
||||
/turf/template_noop,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/ruin)
|
||||
"XA" = (
|
||||
/obj/machinery/computer/old{
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
/turf/open/floor/iron/dark/smooth_edge,
|
||||
/area/ruin/space/has_grav/powered/space_phone_booth)
|
||||
"e" = (
|
||||
/turf/open/space/basic,
|
||||
/turf/template_noop,
|
||||
/area/ruin/space/has_grav/powered/space_phone_booth)
|
||||
"k" = (
|
||||
/obj/machinery/vending/snack/green{
|
||||
@@ -35,7 +35,7 @@
|
||||
"v" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/structure/billboard/Phone_booth,
|
||||
/turf/open/space/basic,
|
||||
/turf/template_noop,
|
||||
/area/ruin/space/has_grav/powered/space_phone_booth)
|
||||
"z" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
|
||||
@@ -65,7 +65,7 @@
|
||||
/area/ruin/space/has_grav/powered/space_phone_booth)
|
||||
"V" = (
|
||||
/obj/structure/lattice,
|
||||
/turf/open/space/basic,
|
||||
/turf/template_noop,
|
||||
/area/ruin/space/has_grav/powered/space_phone_booth)
|
||||
"W" = (
|
||||
/obj/machinery/vending/cigarette{
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -397,7 +397,7 @@
|
||||
id = "oldship_ruin_gun";
|
||||
name = "Pod Bay Door"
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/turf/open/floor/iron/textured,
|
||||
/area/ruin/space/has_grav/whiteship/box)
|
||||
"lO" = (
|
||||
/obj/effect/turf_decal/siding/wideplating{
|
||||
|
||||
@@ -3074,7 +3074,7 @@
|
||||
/obj/machinery/power/shuttle_engine/propulsion/right{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/space,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/research/interior/engineering)
|
||||
"va" = (
|
||||
/obj/machinery/door/airlock/research{
|
||||
@@ -3652,7 +3652,7 @@
|
||||
/obj/machinery/power/shuttle_engine/propulsion/left{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/space,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/research/interior/engineering)
|
||||
"Mo" = (
|
||||
/obj/item/stack/rods,
|
||||
|
||||
@@ -3733,6 +3733,11 @@
|
||||
/obj/effect/mapping_helpers/broken_floor,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/snowdin/post/garage)
|
||||
"la" = (
|
||||
/obj/machinery/power/apc/auto_name/directional/north,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/snowdin/post/mining_dock)
|
||||
"lb" = (
|
||||
/obj/machinery/light/directional/west,
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
|
||||
@@ -9031,6 +9036,10 @@
|
||||
},
|
||||
/turf/open/floor/iron,
|
||||
/area/awaymission/snowdin/post/mining_dock)
|
||||
"Fs" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron,
|
||||
/area/awaymission/snowdin/post/mining_dock)
|
||||
"Ft" = (
|
||||
/obj/structure/fence/door,
|
||||
/turf/open/misc/asteroid/snow,
|
||||
@@ -10564,11 +10573,6 @@
|
||||
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
|
||||
/turf/open/misc/asteroid/snow,
|
||||
/area/awaymission/snowdin/outside)
|
||||
"NK" = (
|
||||
/obj/machinery/power/apc/auto_name/directional/north,
|
||||
/obj/structure/cable,
|
||||
/turf/open/floor/plating,
|
||||
/area/awaymission/snowdin/post/mining_dock)
|
||||
"NL" = (
|
||||
/obj/machinery/airalarm/directional/north,
|
||||
/obj/structure/spider/stickyweb,
|
||||
@@ -11586,9 +11590,6 @@
|
||||
/mob/living/simple_animal/hostile/bear/snow,
|
||||
/turf/open/misc/asteroid/snow,
|
||||
/area/awaymission/snowdin/outside)
|
||||
"Tg" = (
|
||||
/turf/open/floor/iron,
|
||||
/area/awaymission/snowdin/post/mining_dock)
|
||||
"Tk" = (
|
||||
/obj/effect/turf_decal/weather/snow/corner,
|
||||
/turf/open/misc/asteroid/snow{
|
||||
@@ -11647,10 +11648,6 @@
|
||||
/obj/effect/decal/cleanable/blood/old,
|
||||
/turf/open/misc/asteroid/snow,
|
||||
/area/awaymission/snowdin/cave)
|
||||
"Tx" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/iron,
|
||||
/area/awaymission/snowdin/post/mining_dock)
|
||||
"Ty" = (
|
||||
/obj/machinery/light/broken/directional/east,
|
||||
/turf/open/floor/iron,
|
||||
@@ -11895,6 +11892,9 @@
|
||||
/obj/structure/flora/rock/pile/icy/style_random,
|
||||
/turf/open/misc/asteroid/snow/ice,
|
||||
/area/awaymission/snowdin/cave/cavern)
|
||||
"UZ" = (
|
||||
/turf/open/floor/iron,
|
||||
/area/awaymission/snowdin/post/mining_dock)
|
||||
"Va" = (
|
||||
/obj/structure/fence{
|
||||
dir = 4
|
||||
@@ -58719,17 +58719,17 @@ xW
|
||||
wL
|
||||
xN
|
||||
li
|
||||
Tx
|
||||
Fs
|
||||
xy
|
||||
Tg
|
||||
UZ
|
||||
wL
|
||||
wL
|
||||
le
|
||||
TF
|
||||
Ow
|
||||
tj
|
||||
Tx
|
||||
Tg
|
||||
Fs
|
||||
UZ
|
||||
xy
|
||||
xy
|
||||
wD
|
||||
@@ -58987,7 +58987,7 @@ Eh
|
||||
AB
|
||||
wL
|
||||
xy
|
||||
Tg
|
||||
UZ
|
||||
xy
|
||||
wD
|
||||
eJ
|
||||
@@ -59231,7 +59231,7 @@ OU
|
||||
wL
|
||||
Lj
|
||||
xy
|
||||
Tg
|
||||
UZ
|
||||
xy
|
||||
Xz
|
||||
fq
|
||||
@@ -59244,7 +59244,7 @@ wD
|
||||
wD
|
||||
wD
|
||||
tj
|
||||
Tx
|
||||
Fs
|
||||
Md
|
||||
wD
|
||||
eJ
|
||||
@@ -59490,9 +59490,9 @@ Lj
|
||||
xy
|
||||
xy
|
||||
wL
|
||||
Tg
|
||||
Tx
|
||||
Tg
|
||||
UZ
|
||||
Fs
|
||||
UZ
|
||||
kD
|
||||
wD
|
||||
wM
|
||||
@@ -59758,7 +59758,7 @@ Qz
|
||||
wL
|
||||
YS
|
||||
tj
|
||||
Tx
|
||||
Fs
|
||||
xy
|
||||
wD
|
||||
eJ
|
||||
@@ -60009,7 +60009,7 @@ ya
|
||||
ya
|
||||
yN
|
||||
wD
|
||||
NK
|
||||
la
|
||||
wD
|
||||
Xr
|
||||
qJ
|
||||
@@ -60530,9 +60530,9 @@ tn
|
||||
tn
|
||||
rg
|
||||
wL
|
||||
Tx
|
||||
Fs
|
||||
wL
|
||||
Tg
|
||||
UZ
|
||||
wD
|
||||
bh
|
||||
bh
|
||||
|
||||
@@ -283,10 +283,6 @@
|
||||
},
|
||||
/turf/open/floor/iron/grimy,
|
||||
/area/awaymission/undergroundoutpost45/central)
|
||||
"bd" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/space,
|
||||
/area/awaymission/undergroundoutpost45/central)
|
||||
"bf" = (
|
||||
/obj/item/storage/belt/security,
|
||||
/obj/item/assembly/flash/handheld,
|
||||
@@ -4440,7 +4436,7 @@
|
||||
/area/awaymission/undergroundoutpost45/engineering)
|
||||
"qK" = (
|
||||
/obj/machinery/computer/atmos_control/noreconnect{
|
||||
atmos_chambers = list("uo45air"="Air Supply")
|
||||
atmos_chambers = list("uo45air"="Air Supply")
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue/opposingcorners{
|
||||
dir = 1
|
||||
@@ -4970,7 +4966,7 @@
|
||||
"sp" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/computer/atmos_control/noreconnect{
|
||||
atmos_chambers = list("uo45mix"="Mix Chamber");
|
||||
atmos_chambers = list("uo45mix"="Mix Chamber");
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/turf_decal/tile/green/anticorner/contrasted{
|
||||
@@ -5465,7 +5461,7 @@
|
||||
/area/awaymission/undergroundoutpost45/engineering)
|
||||
"un" = (
|
||||
/obj/machinery/computer/atmos_control/noreconnect{
|
||||
atmos_chambers = list("uo45n2"="Nitrogen Supply");
|
||||
atmos_chambers = list("uo45n2"="Nitrogen Supply");
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
|
||||
@@ -5490,7 +5486,7 @@
|
||||
/area/awaymission/undergroundoutpost45/engineering)
|
||||
"uq" = (
|
||||
/obj/machinery/computer/atmos_control/noreconnect{
|
||||
atmos_chambers = list("uo45o2"="Oxygen Supply");
|
||||
atmos_chambers = list("uo45o2"="Oxygen Supply");
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
|
||||
@@ -5539,7 +5535,7 @@
|
||||
/area/awaymission/undergroundoutpost45/crew_quarters)
|
||||
"uA" = (
|
||||
/obj/machinery/computer/atmos_control/fixed{
|
||||
atmos_chambers = list("uo45air"="Air Supply","uo45mix"="Mix Chamber","uo45n2"="Nitrogen Supply","uo45o2"="Oxygen Supply");
|
||||
atmos_chambers = list("uo45air"="Air Supply","uo45mix"="Mix Chamber","uo45n2"="Nitrogen Supply","uo45o2"="Oxygen Supply");
|
||||
dir = 4;
|
||||
name = "Chamber Atmospherics Monitoring"
|
||||
},
|
||||
@@ -40840,7 +40836,7 @@ al
|
||||
bq
|
||||
dc
|
||||
aD
|
||||
bd
|
||||
aP
|
||||
dZ
|
||||
aS
|
||||
aP
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
|
||||
/turf/open/space/basic,
|
||||
/turf/open/floor/mineral/plastitanium,
|
||||
/area/shuttle/escape)
|
||||
"iA" = (
|
||||
/obj/structure/chair/pew/right{
|
||||
|
||||
Reference in New Issue
Block a user