Merge pull request #6371 from Heroman3003/minor-mapfix

Minor mapfixes
This commit is contained in:
Novacat
2019-12-26 01:34:03 -05:00
committed by GitHub
3 changed files with 90 additions and 71 deletions
-1
View File
@@ -5534,7 +5534,6 @@
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"alw" = (
/obj/effect/floor_decal/rust,
/obj/structure/cable{
icon_state = "1-2"
},
+1 -1
View File
@@ -5311,7 +5311,7 @@
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/turf/simulated/floor/tiled,
/area/crew_quarters/recreation_area_restroom)
"aiI" = (
/obj/structure/sink{
+89 -69
View File
@@ -2899,13 +2899,27 @@
/turf/simulated/floor/tiled,
/area/engineering/engine_monitoring)
"afl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/floor_decal/steeldecal/steel_decals4{
/obj/machinery/light{
dir = 1
},
/obj/effect/floor_decal/borderfloor{
dir = 1;
pixel_y = 0
},
/obj/effect/floor_decal/corner/blue/border{
dir = 1
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 9
/obj/effect/floor_decal/borderfloor/corner2{
dir = 1
},
/obj/effect/floor_decal/corner/blue/bordercorner2{
dir = 4
},
/obj/effect/floor_decal/corner/blue/bordercorner2{
dir = 1
},
/turf/simulated/floor/tiled,
/area/bridge/secondary)
@@ -3090,19 +3104,16 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 4;
icon_state = "borderfloorcorner2";
pixel_y = 0
/obj/structure/table/reinforced,
/obj/item/device/radio{
pixel_x = -2;
pixel_y = -2
},
/obj/effect/floor_decal/corner/blue/bordercorner2{
dir = 4
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
/obj/item/device/radio{
pixel_x = 2;
pixel_y = 2
},
/obj/machinery/camera/network/command,
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"afx" = (
@@ -3319,26 +3330,16 @@
/obj/effect/floor_decal/corner/blue/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 1
},
/obj/effect/floor_decal/corner/blue/bordercorner2{
dir = 1
},
/obj/structure/table/reinforced,
/obj/item/device/radio{
pixel_x = -2;
pixel_y = -2
},
/obj/item/device/radio{
pixel_x = 2;
pixel_y = 2
},
/obj/machinery/camera/network/command,
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"afS" = (
@@ -4280,9 +4281,17 @@
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"ahh" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 4
},
/turf/simulated/floor/tiled,
@@ -4295,15 +4304,23 @@
/turf/simulated/wall/r_wall,
/area/bridge/secondary/teleporter)
"ahk" = (
/obj/structure/disposalpipe/trunk{
dir = 8
/obj/structure/table/reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Secondary Command Office"
},
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloor{
dir = 6
dir = 5
},
/obj/effect/floor_decal/corner/blue/border{
dir = 6
dir = 5
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 4;
icon_state = "borderfloorcorner2";
pixel_y = 0
},
/obj/effect/floor_decal/corner/blue/bordercorner2{
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/secondary)
@@ -8077,6 +8094,8 @@
dir = 2;
icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"aon" = (
@@ -10402,17 +10421,16 @@
/area/crew_quarters/sleep/cryo)
"asM" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"asN" = (
@@ -12261,15 +12279,18 @@
/turf/simulated/floor/tiled,
/area/tether/station/visitorhallway)
"awg" = (
/obj/structure/table/reinforced,
/obj/machinery/photocopier/faxmachine{
department = "Secondary Command Office"
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/floor_decal/borderfloor{
dir = 5
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/effect/floor_decal/corner/blue/border{
dir = 5
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
icon_state = "map-scrubbers";
dir = 4
},
/turf/simulated/floor/tiled,
/area/bridge/secondary)
@@ -14185,13 +14206,18 @@
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"azd" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/structure/cable/green{
d1 = 2;
d2 = 8;
icon_state = "2-8"
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloor{
dir = 6
},
/obj/effect/floor_decal/corner/blue/border{
dir = 6
},
/obj/effect/floor_decal/borderfloor/corner2,
/obj/effect/floor_decal/corner/blue/bordercorner2,
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"aze" = (
@@ -14973,12 +14999,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/bridge/secondary/hallway)
"aAv" = (
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled,
/area/bridge/secondary)
"aAw" = (
/obj/structure/cable{
d1 = 4;
@@ -34221,7 +34241,7 @@ acT
aCX
aCr
acV
aAv
afl
agn
agn
agn
@@ -34653,7 +34673,7 @@ aep
aeJ
aeT
acV
afR
afw
agE
azc
ahe
@@ -34795,9 +34815,9 @@ aeu
aej
aeY
afh
afl
ahh
azd
afR
agE
asM
azg
ahn
avY
@@ -34937,9 +34957,9 @@ aej
aeK
aeZ
afv
afw
ahh
aom
asM
awg
axL
afV
aqx
@@ -35079,10 +35099,10 @@ aev
aej
afa
afx
awg
ahk
agt
agG
ahk
azd
acV
awh
asF