Merge pull request #5034 from Heroman3003/landmarkening

Some cyborg adjustments for map
This commit is contained in:
Novacat
2019-04-16 19:42:20 -04:00
committed by GitHub
3 changed files with 145 additions and 136 deletions
+5 -8
View File
@@ -5039,6 +5039,10 @@
"lc" = (
/turf/simulated/wall/r_wall,
/area/maintenance/lower/rnd)
"ld" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/drone_fabrication)
"le" = (
/obj/structure/railing{
dir = 4
@@ -12254,13 +12258,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/drone_fabrication)
"AO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/landmark{
name = "JoinLateCyborg"
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/drone_fabrication)
"AZ" = (
/obj/structure/catwalk,
/obj/machinery/firealarm{
@@ -28633,7 +28630,7 @@ Xm
zk
zR
As
AO
ld
Bd
Tn
BK
+38 -32
View File
@@ -1023,6 +1023,11 @@
"ack" = (
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"acl" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/tether)
"acm" = (
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
@@ -2066,10 +2071,17 @@
/turf/simulated/shuttle/floor/black,
/area/shuttle/excursion/tether)
"aeq" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/tether)
/obj/machinery/computer/cryopod{
pixel_y = 32
},
/obj/effect/floor_decal/techfloor{
dir = 5
},
/obj/effect/landmark{
name = "JoinLateCyborg"
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"aer" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -3499,6 +3511,20 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/explorer_meeting)
"agz" = (
/obj/effect/floor_decal/techfloor{
dir = 6
},
/obj/machinery/firealarm{
dir = 1;
pixel_x = 0;
pixel_y = -24
},
/obj/effect/landmark{
name = "JoinLateCyborg"
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"agF" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
@@ -8128,15 +8154,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"avb" = (
/obj/machinery/computer/cryopod{
pixel_y = 32
},
/obj/effect/floor_decal/techfloor{
dir = 5
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"avc" = (
/obj/machinery/cryopod/robot,
/obj/effect/floor_decal/corner_techfloor_grid{
@@ -16333,17 +16350,6 @@
/obj/effect/floor_decal/techfloor,
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"bff" = (
/obj/effect/floor_decal/techfloor{
dir = 6
},
/obj/machinery/firealarm{
dir = 1;
pixel_x = 0;
pixel_y = -24
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"bfk" = (
/obj/structure/table/rack{
dir = 8;
@@ -33821,7 +33827,7 @@ aeo
aaq
aaq
aau
aeq
acl
avK
avN
aad
@@ -33963,7 +33969,7 @@ amF
rje
adB
aaq
aeq
acl
avK
avN
aad
@@ -34105,7 +34111,7 @@ amF
rje
adB
aaq
aeq
acl
avK
auH
aad
@@ -34957,7 +34963,7 @@ aaD
avG
tIi
aaq
aeq
acl
avK
auQ
aad
@@ -35099,7 +35105,7 @@ amL
aob
dbI
aaq
aeq
acl
avK
qgR
aad
@@ -35241,7 +35247,7 @@ aep
aeu
aev
aau
aeq
acl
avK
qgR
aad
@@ -36541,8 +36547,8 @@ asN
asN
asN
asI
avb
bff
aeq
agz
asI
bhL
aus
+102 -96
View File
@@ -3499,38 +3499,56 @@
/turf/simulated/floor/plating,
/area/engineering/shaft)
"fy" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
/obj/machinery/power/apc{
dir = 4;
name = "east bump";
pixel_x = 28
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
/obj/structure/cable/cyan{
d2 = 8;
icon_state = "0-8"
},
/obj/effect/landmark/free_ai_shell,
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload_foyer)
"fz" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
/obj/structure/cable/cyan{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/effect/landmark/start{
name = "Cyborg"
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"fA" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
/obj/machinery/hologram/holopad,
/obj/effect/landmark/start{
name = "Cyborg"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"fB" = (
/obj/structure/stairs/south,
/turf/simulated/floor/tiled,
/area/security/brig/visitation)
"fC" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/effect/landmark{
name = "JoinLateCyborg"
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"fD" = (
/obj/effect/floor_decal/industrial/warning/corner,
/obj/machinery/cryopod{
@@ -3542,6 +3560,45 @@
},
/turf/simulated/floor/tiled,
/area/security/brig)
"fE" = (
/obj/machinery/cryopod/robot,
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"fF" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"fG" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"fH" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"fI" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -3562,6 +3619,16 @@
},
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
"fJ" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"fK" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/bed/chair,
@@ -5625,18 +5692,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload_foyer)
"ku" = (
/obj/machinery/power/apc{
dir = 4;
name = "east bump";
pixel_x = 28
},
/obj/structure/cable/cyan{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload_foyer)
"kv" = (
/obj/structure/cable/cyan{
d2 = 2;
@@ -6026,32 +6081,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"lo" = (
/obj/structure/cable/cyan{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"lp" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"lq" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/effect/landmark/free_ai_shell,
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"ls" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor,
@@ -6340,10 +6369,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"lV" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
"ma" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -7640,25 +7665,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"nV" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 25;
pixel_y = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"nW" = (
/obj/structure/grille,
/obj/machinery/door/firedoor/glass,
@@ -30091,11 +30097,11 @@ AN
AN
Bw
yY
fy
fz
fz
fz
fA
fG
fH
fH
fH
fJ
yY
ac
ac
@@ -31619,7 +31625,7 @@ in
iU
jr
ka
ku
fy
ll
lS
mx
@@ -31904,7 +31910,7 @@ dE
dE
kb
kv
lo
fz
lT
kb
WG
@@ -32046,7 +32052,7 @@ iW
dE
kb
kw
lp
fA
lU
kb
nh
@@ -32188,8 +32194,8 @@ iX
dE
kb
kx
lq
lV
fC
fE
kb
ni
nQ
@@ -33755,7 +33761,7 @@ Nh
fg
nl
nU
ot
ou
oY
pE
qc
@@ -33896,7 +33902,7 @@ jx
js
fg
nr
nV
fF
oF
oY
pE