mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 12:08:28 +01:00
Merge pull request #5333 from Heroman3003/mapfixesboogaloo
Minor map fixes
This commit is contained in:
@@ -2444,6 +2444,16 @@
|
||||
/obj/random/maintenance/clean,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/lower/trash_pit)
|
||||
"aej" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/airlock/maintenance/engi{
|
||||
name = "Atmospherics Substation"
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/substation/surface_atmos)
|
||||
"aek" = (
|
||||
/obj/effect/floor_decal/techfloor,
|
||||
/obj/structure/railing{
|
||||
@@ -4982,6 +4992,17 @@
|
||||
/obj/machinery/light/small,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/storage/surface_eva)
|
||||
"aiB" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/structure/catwalk,
|
||||
/obj/machinery/door/airlock/maintenance/engi{
|
||||
name = "Atmospherics";
|
||||
req_access = list(24)
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos)
|
||||
"aiC" = (
|
||||
/obj/structure/catwalk,
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
@@ -5988,6 +6009,19 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/lower/research)
|
||||
"akl" = (
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/airlock/atmos{
|
||||
name = "Atmospherics Substation";
|
||||
req_access = list(24)
|
||||
},
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos)
|
||||
"akm" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
@@ -14044,15 +14078,6 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/substation/surface_atmos)
|
||||
"aFZ" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/airlock/maintenance/engi{
|
||||
name = "Atmospherics Substation"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/substation/surface_atmos)
|
||||
"aGb" = (
|
||||
/obj/structure/railing{
|
||||
dir = 1
|
||||
@@ -28472,18 +28497,6 @@
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/engineering/atmos)
|
||||
"lUR" = (
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/door/airlock/atmos{
|
||||
name = "Atmospherics Substation";
|
||||
req_access = list(24)
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos)
|
||||
"lVl" = (
|
||||
/obj/structure/railing{
|
||||
icon_state = "railing0";
|
||||
@@ -31913,16 +31926,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/crew_quarters/sleep/maintDorm1)
|
||||
"xJz" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/structure/catwalk,
|
||||
/obj/machinery/door/airlock/maintenance/engi{
|
||||
name = "Atmospherics";
|
||||
req_access = list(24)
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/engineering/atmos)
|
||||
"xKT" = (
|
||||
/obj/machinery/atmospherics/binary/pump{
|
||||
dir = 8
|
||||
@@ -42080,10 +42083,10 @@ aah
|
||||
aah
|
||||
aEU
|
||||
bzG
|
||||
aFZ
|
||||
aej
|
||||
aFY
|
||||
laN
|
||||
lUR
|
||||
akl
|
||||
lSd
|
||||
gts
|
||||
bPw
|
||||
@@ -43217,7 +43220,7 @@ aDJ
|
||||
aDL
|
||||
akk
|
||||
jso
|
||||
xJz
|
||||
aiB
|
||||
xoJ
|
||||
xXP
|
||||
qDb
|
||||
|
||||
@@ -3523,6 +3523,11 @@
|
||||
/area/tether/surfacebase/north_staires_two)
|
||||
"hI" = (
|
||||
/obj/machinery/door/airlock/maintenance/common,
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/tether/surfacebase/atrium_two)
|
||||
"hJ" = (
|
||||
@@ -4747,21 +4752,18 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/rdoffice)
|
||||
"kr" = (
|
||||
/obj/structure/railing{
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 4
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable,
|
||||
/obj/machinery/power/apc{
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/black{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/danger{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/maintenance/asmaint2)
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"ks" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/server)
|
||||
@@ -7369,30 +7371,19 @@
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/server)
|
||||
"pc" = (
|
||||
/obj/structure/railing{
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/disposal,
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1";
|
||||
pixel_x = 0
|
||||
icon_state = "tube1"
|
||||
},
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/black{
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
dir = 1
|
||||
},
|
||||
/obj/random/tool,
|
||||
/obj/effect/floor_decal/industrial/danger/corner{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/warning/caution{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/maintenance/asmaint2)
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"pd" = (
|
||||
/obj/structure/table/steel,
|
||||
/obj/effect/floor_decal/techfloor,
|
||||
@@ -10890,16 +10881,13 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/engineering/lower/atmos_lockers)
|
||||
"vA" = (
|
||||
/obj/machinery/door/airlock/maintenance/common,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
icon_state = "warning";
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/power/apc{
|
||||
dir = 4;
|
||||
name = "east bump";
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/turf/simulated/floor/tiled,
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"vB" = (
|
||||
/obj/machinery/light/small,
|
||||
@@ -11157,13 +11145,18 @@
|
||||
/turf/simulated/wall,
|
||||
/area/engineering/lower/atmos_lockers)
|
||||
"wd" = (
|
||||
/obj/machinery/door/airlock/maintenance/common,
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
icon_state = "warning";
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/black{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
/obj/effect/floor_decal/industrial/danger{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/maintenance/asmaint2)
|
||||
"we" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -11304,9 +11297,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/maintenance/lower/rnd)
|
||||
"wo" = (
|
||||
/turf/simulated/floor/plating,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
"wp" = (
|
||||
/obj/machinery/door/airlock/maintenance/engi{
|
||||
name = "Pump Station"
|
||||
@@ -11466,20 +11456,35 @@
|
||||
"wE" = (
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
icon_state = "tube1"
|
||||
icon_state = "tube1";
|
||||
pixel_x = 0
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/warning{
|
||||
dir = 8
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/disposal,
|
||||
/obj/structure/disposalpipe/trunk{
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/black{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/tether/surfacebase/fish_farm)
|
||||
/obj/random/tool,
|
||||
/obj/effect/floor_decal/industrial/danger/corner{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/warning/caution{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/maintenance/asmaint2)
|
||||
"wF" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/purple{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/maintenance/asmaint2)
|
||||
"wG" = (
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 2;
|
||||
@@ -25159,7 +25164,7 @@ kb
|
||||
kb
|
||||
kp
|
||||
kI
|
||||
kT
|
||||
wF
|
||||
lg
|
||||
kT
|
||||
kT
|
||||
@@ -25583,8 +25588,8 @@ ac
|
||||
ac
|
||||
kb
|
||||
kb
|
||||
kr
|
||||
pc
|
||||
wd
|
||||
wE
|
||||
kV
|
||||
lh
|
||||
lB
|
||||
@@ -25723,7 +25728,7 @@ hs
|
||||
hD
|
||||
ac
|
||||
ac
|
||||
kb
|
||||
jy
|
||||
ka
|
||||
cM
|
||||
ka
|
||||
@@ -25865,7 +25870,7 @@ ww
|
||||
ul
|
||||
ho
|
||||
ho
|
||||
ho
|
||||
jy
|
||||
bz
|
||||
cp
|
||||
il
|
||||
@@ -26007,7 +26012,7 @@ tQ
|
||||
um
|
||||
vO
|
||||
ho
|
||||
ho
|
||||
jy
|
||||
jy
|
||||
il
|
||||
jy
|
||||
@@ -26149,7 +26154,7 @@ vp
|
||||
vp
|
||||
hq
|
||||
ho
|
||||
ho
|
||||
jy
|
||||
bz
|
||||
il
|
||||
jy
|
||||
@@ -26290,8 +26295,8 @@ hq
|
||||
hq
|
||||
hq
|
||||
vW
|
||||
wd
|
||||
wo
|
||||
vA
|
||||
jx
|
||||
bz
|
||||
il
|
||||
jy
|
||||
@@ -26433,7 +26438,7 @@ hq
|
||||
hq
|
||||
hq
|
||||
ho
|
||||
ho
|
||||
jy
|
||||
bz
|
||||
il
|
||||
cF
|
||||
@@ -26575,7 +26580,7 @@ hq
|
||||
hq
|
||||
ho
|
||||
ho
|
||||
ho
|
||||
jy
|
||||
jy
|
||||
cq
|
||||
cF
|
||||
@@ -26717,7 +26722,7 @@ hq
|
||||
vB
|
||||
ho
|
||||
ho
|
||||
hD
|
||||
ii
|
||||
il
|
||||
il
|
||||
cF
|
||||
@@ -27285,7 +27290,7 @@ hr
|
||||
hq
|
||||
hq
|
||||
ho
|
||||
hD
|
||||
ii
|
||||
ii
|
||||
cE
|
||||
cF
|
||||
@@ -27427,7 +27432,7 @@ hr
|
||||
hq
|
||||
vB
|
||||
ho
|
||||
hD
|
||||
ii
|
||||
ii
|
||||
ns
|
||||
kL
|
||||
@@ -27569,7 +27574,7 @@ hr
|
||||
hq
|
||||
hq
|
||||
ho
|
||||
hD
|
||||
ii
|
||||
ii
|
||||
il
|
||||
il
|
||||
@@ -27711,7 +27716,7 @@ hq
|
||||
hq
|
||||
ho
|
||||
ho
|
||||
hD
|
||||
ii
|
||||
ke
|
||||
il
|
||||
il
|
||||
@@ -27852,8 +27857,8 @@ hq
|
||||
hq
|
||||
hq
|
||||
ho
|
||||
ho
|
||||
hD
|
||||
jy
|
||||
ii
|
||||
kf
|
||||
ku
|
||||
il
|
||||
@@ -27994,8 +27999,8 @@ tO
|
||||
tO
|
||||
hq
|
||||
ho
|
||||
ho
|
||||
hD
|
||||
jy
|
||||
ii
|
||||
ii
|
||||
kv
|
||||
jN
|
||||
@@ -28132,12 +28137,12 @@ ux
|
||||
uM
|
||||
uZ
|
||||
vj
|
||||
wE
|
||||
vA
|
||||
kr
|
||||
pc
|
||||
ho
|
||||
ho
|
||||
ho
|
||||
hD
|
||||
jy
|
||||
ii
|
||||
ii
|
||||
kw
|
||||
jx
|
||||
@@ -28277,9 +28282,9 @@ vq
|
||||
hD
|
||||
hD
|
||||
hD
|
||||
hD
|
||||
hD
|
||||
hD
|
||||
ii
|
||||
ii
|
||||
ii
|
||||
ii
|
||||
kx
|
||||
jx
|
||||
|
||||
Reference in New Issue
Block a user