Finally kills off my old nemesis of the old fashioned inconsistent shuttle paths (#410)

This commit is contained in:
CitadelStationBot
2017-04-15 14:01:54 -05:00
committed by TalkingCactus
parent 74244a3d32
commit c38fa1eaa3
44 changed files with 5022 additions and 1252 deletions
+8 -8
View File
@@ -73865,7 +73865,7 @@
/turf/open/floor/plasteel/shuttle,
/area/shuttle/arrival)
"czW" = (
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"czX" = (
/obj/structure/chair/comfy{
@@ -73873,7 +73873,7 @@
icon_state = "comfychair";
dir = 1
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"czY" = (
/obj/machinery/light{
@@ -74603,7 +74603,7 @@
/obj/machinery/door/airlock/shuttle{
name = "Cockpit"
},
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"cAO" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -75173,16 +75173,16 @@
/area/hallway/secondary/entry)
"cBJ" = (
/obj/machinery/computer/arcade,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"cBK" = (
/obj/structure/closet/emcloset,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"cBL" = (
/obj/structure/table,
/obj/item/weapon/storage/firstaid/regular,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"cBM" = (
/obj/machinery/vending/cola,
@@ -75598,7 +75598,7 @@
"cCu" = (
/obj/machinery/door/airlock/shuttle,
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"cCv" = (
/obj/machinery/vending/cigarette,
@@ -77851,7 +77851,7 @@
/area/hallway/secondary/entry)
"cGm" = (
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"cGn" = (
/obj/effect/turf_decal/stripes/line{
+86 -74
View File
@@ -1530,7 +1530,7 @@
name = "Arrivals"
})
"acX" = (
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival)
"acY" = (
/obj/machinery/vending/cola/random,
@@ -1736,7 +1736,7 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival)
"adu" = (
/obj/machinery/light{
@@ -2050,7 +2050,9 @@
name = "Arrivals"
})
"aeb" = (
/obj/effect/landmark/observer_start,
/obj/effect/landmark{
name = "Observer-Start"
},
/turf/open/floor/plasteel/neutral,
/area/shuttle/arrival)
"aec" = (
@@ -10253,6 +10255,11 @@
icon_state = "0-4";
d2 = 4
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
name = "atmospherics camera";
network = list("Engine")
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"auI" = (
@@ -34879,19 +34886,19 @@
pixel_x = -31;
pixel_y = 0
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/labor)
"bpb" = (
/obj/structure/chair/office/dark{
dir = 1
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/labor)
"bpc" = (
/obj/item/weapon/folder/red,
/obj/item/weapon/restraints/handcuffs,
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/labor)
"bpd" = (
/obj/structure/cable/white{
@@ -35657,7 +35664,7 @@
/turf/open/floor/plating,
/area/shuttle/labor)
"bqy" = (
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/labor)
"bqz" = (
/obj/machinery/button/flasher{
@@ -35668,7 +35675,7 @@
req_access_txt = "1"
},
/obj/machinery/light,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/labor)
"bqA" = (
/obj/machinery/mineral/labor_claim_console{
@@ -35676,7 +35683,7 @@
pixel_x = 30;
pixel_y = 30
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/labor)
"bqB" = (
/obj/machinery/door/airlock/shuttle{
@@ -103807,11 +103814,11 @@
})
"dOQ" = (
/obj/machinery/ai_status_display,
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"dOR" = (
/obj/machinery/status_display,
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"dOS" = (
/obj/effect/turf_decal/delivery,
@@ -104501,7 +104508,7 @@
})
"dQp" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"dQq" = (
/obj/structure/bed/roller,
@@ -106671,7 +106678,7 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"dUJ" = (
/obj/machinery/door/airlock/shuttle{
@@ -107960,7 +107967,7 @@
name = "Holding Area";
req_access_txt = "2"
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dXm" = (
/obj/machinery/door/airlock/glass_command{
@@ -108398,16 +108405,16 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"dXU" = (
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dXV" = (
/obj/structure/chair,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dXW" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dXX" = (
/obj/item/weapon/twohanded/required/kirbyplants{
@@ -108751,7 +108758,7 @@
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dYG" = (
/turf/open/floor/plasteel/red/corner{
@@ -109150,18 +109157,18 @@
/obj/machinery/status_display{
pixel_x = -32
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dZu" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dZv" = (
/obj/structure/table/reinforced,
/obj/item/weapon/storage/lockbox/loyalty,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dZw" = (
/obj/structure/table/reinforced,
@@ -109376,7 +109383,7 @@
/obj/structure/chair{
dir = 1
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dZW" = (
/obj/structure/table/reinforced,
@@ -109386,7 +109393,7 @@
pixel_x = 0;
pixel_y = -26
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"dZX" = (
/obj/structure/table/reinforced,
@@ -112110,7 +112117,7 @@
name = "Arrivals Shuttle console";
pixel_y = 0
},
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival)
"ehk" = (
/obj/machinery/light{
@@ -112225,7 +112232,7 @@
dir = 1
},
/obj/machinery/light,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ehx" = (
/obj/effect/turf_decal/bot,
@@ -112233,6 +112240,29 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"ehy" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehz" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehA" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehB" = (
/obj/structure/grille,
/obj/structure/window/reinforced/highpressure/fulltile,
/turf/open/floor/plating,
/area/engine/supermatter)
"ehC" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehD" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehE" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehF" = (
/obj/machinery/power/rad_collector{
anchored = 1
},
@@ -112240,44 +112270,17 @@
icon_state = "0-4";
d2 = 4
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
name = "atmospherics camera";
network = list("Engine")
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"ehz" = (
/obj/structure/chair/office/dark{
dir = 8
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/neutral,
/area/atmos)
"ehA" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehB" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehC" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehD" = (
/obj/structure/grille,
/obj/structure/window/reinforced/highpressure/fulltile,
/turf/open/floor/plating,
/area/engine/supermatter)
"ehE" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehF" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehG" = (
/turf/closed/wall/r_wall,
/obj/machinery/power/rad_collector{
anchored = 1
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"ehH" = (
/turf/closed/wall/r_wall,
@@ -112299,6 +112302,15 @@
"ehM" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"ehN" = (
/obj/structure/chair/office/dark{
dir = 8
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/neutral,
/area/atmos)
(1,1,1) = {"
aaa
@@ -137306,11 +137318,11 @@ aoI
apK
ard
asi
ehA
ehy
auC
auC
auC
ehA
ehH
azc
aAc
aAZ
@@ -137563,13 +137575,13 @@ aoJ
apL
are
asj
ehA
ehz
auD
avP
avP
axP
ehJ
ehA
ehL
aAY
ark
aDH
@@ -138077,7 +138089,7 @@ aoK
apN
arg
asl
ehD
ehB
ebG
avQ
ebG
@@ -138334,7 +138346,7 @@ aoK
apO
arh
asm
ehA
ehC
auF
auF
auF
@@ -138591,13 +138603,13 @@ aoL
apP
ari
asn
ehA
ehD
auG
avR
avR
axT
ehJ
ehA
ehK
ehM
aBd
ark
aDL
@@ -138848,11 +138860,11 @@ aoI
apK
ebP
aso
ehA
ehy
ehE
auH
auH
ehA
ehF
ehG
ehI
azg
aAe
aBe
@@ -139142,7 +139154,7 @@ bqf
brq
bsD
aZq
ehz
ehN
bvu
byX
aIZ
+158 -213
View File
@@ -86599,11 +86599,17 @@
/area/toxins/xenobiology)
"cTA" = (
/turf/open/floor/plating,
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"cTB" = (
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"cTC" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
@@ -88150,10 +88156,7 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/shuttle{
icon_state = "swall12";
dir = 2
},
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"cWI" = (
/obj/machinery/door/airlock/titanium{
@@ -90249,7 +90252,10 @@
icon_state = "pipe-c"
},
/turf/open/floor/plating,
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"daP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -91525,7 +91531,10 @@
"dde" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"ddf" = (
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -91560,7 +91569,10 @@
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"ddi" = (
/obj/structure/rack,
/turf/open/floor/plating,
@@ -91572,7 +91584,10 @@
/turf/open/floor/plating{
icon_state = "platingdmg2"
},
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"ddk" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -91686,7 +91701,10 @@
"ddr" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dds" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -91761,7 +91779,10 @@
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
/area/toxins/xenobiology)
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"ddz" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -92453,6 +92474,11 @@
icon_state = "0-2";
d2 = 2
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 4;
network = list("Engine")
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dft" = (
@@ -94211,13 +94237,12 @@
/turf/open/floor/plating,
/area/engine/engineering)
"djv" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
/obj/machinery/door/poddoor/shutters/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/turf/open/floor/plating,
/area/engine/supermatter)
/area/engine/engineering)
"djw" = (
/obj/structure/cable{
d1 = 1;
@@ -95040,19 +95065,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"dlI" = (
/obj/machinery/power/rad_collector{
anchored = 1
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 4;
network = list("Engine")
},
/turf/open/floor/engine,
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"dlJ" = (
/turf/closed/wall/r_wall,
@@ -95067,13 +95080,13 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"dlN" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"dlO" = (
/obj/structure/grille,
/obj/structure/window/reinforced/highpressure/fulltile,
/turf/open/floor/plating,
/area/engine/supermatter)
"dlO" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"dlP" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
@@ -95084,34 +95097,42 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"dlS" = (
/turf/closed/wall/r_wall,
/obj/machinery/power/rad_collector{
anchored = 1
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dlT" = (
/turf/closed/wall/r_wall,
/obj/machinery/power/rad_collector{
anchored = 1
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dlU" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
/area/engine/supermatter)
"dlV" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dlW" = (
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dlX" = (
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
@@ -95129,16 +95150,13 @@
name = "Xeno Maintenance"
})
"dma" = (
/turf/open/floor/plating{
icon_state = "platingdmg2"
},
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmb" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
@@ -95156,8 +95174,7 @@
name = "Xeno Maintenance"
})
"dme" = (
/obj/machinery/space_heater,
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
@@ -95229,17 +95246,29 @@
name = "Xeno Maintenance"
})
"dmq" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
},
/obj/machinery/door/airlock/research{
glass = 1;
name = "Slime Euthanization Chamber";
opacity = 0;
req_access_txt = "55"
},
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
"dmr" = (
/turf/open/floor/plating,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
/obj/machinery/door/airlock/research{
glass = 1;
name = "Slime Euthanization Chamber";
opacity = 0;
req_access_txt = "55"
},
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
"dms" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
@@ -95253,7 +95282,7 @@
name = "Xeno Maintenance"
})
"dmu" = (
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
@@ -95271,120 +95300,36 @@
name = "Xeno Maintenance"
})
"dmx" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmy" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4
},
/obj/machinery/door/airlock/research{
glass = 1;
name = "Slime Euthanization Chamber";
opacity = 0;
req_access_txt = "55"
},
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmz" = (
/obj/machinery/door/airlock/research{
glass = 1;
name = "Slime Euthanization Chamber";
opacity = 0;
req_access_txt = "55"
},
/turf/open/floor/plasteel/white,
/area/toxins/xenobiology)
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmA" = (
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmB" = (
/turf/open/floor/plating,
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmC" = (
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmD" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmE" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmF" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmG" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmH" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmI" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmJ" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmK" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmL" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmM" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
name = "Xeno Maintenance"
})
"dmN" = (
/turf/closed/wall/r_wall,
/area/maintenance/aft{
icon_state = "xenomaint";
@@ -127467,10 +127412,10 @@ cRi
cRi
cRi
cRi
dlU
dlV
dlX
dlZ
dmd
dmg
dmb
aaf
aaa
aaa
@@ -127724,18 +127669,18 @@ cSh
dbs
cSn
cRi
dlV
dma
dde
ddj
cTp
dmc
dmf
dmh
dmk
dmm
dmo
dmq
dmj
dml
dmn
dmp
dmt
dmw
dmE
dmM
dmB
aaa
aaa
aai
@@ -127981,7 +127926,7 @@ cSg
cSo
cSn
cRi
dlW
cTA
cTn
cTC
cTC
@@ -127990,9 +127935,9 @@ cTC
cTC
cTC
cTC
dmx
daO
bIx
dmN
dmC
aaf
aaf
aag
@@ -128505,7 +128450,7 @@ daF
daJ
cRi
bvT
dmF
dmu
cRi
cRi
cRi
@@ -128761,8 +128706,8 @@ cSn
cSn
cSn
cRi
dmy
dmG
dmq
dmv
cZv
cZv
cRi
@@ -129789,8 +129734,8 @@ cSn
cSn
daN
cRi
dmz
dmH
dmr
dmw
cZv
dbw
cRi
@@ -130046,8 +129991,8 @@ daE
daI
daM
cRi
dmA
dmI
cTA
dmx
cRi
cRi
cRi
@@ -130303,8 +130248,8 @@ cRi
cRi
cRi
cRi
dmB
dmJ
cTA
dmy
aaf
aaa
aaa
@@ -130551,17 +130496,17 @@ cSn
cSo
cSg
cRi
dlX
ddh
ddq
ddt
ddt
ddt
ddt
ddw
dmr
dmu
dmC
dmK
cTA
cTA
ddy
dmz
aaf
aaf
aaa
@@ -130809,16 +130754,16 @@ dbt
cSF
cRi
ddi
dmb
dme
ddr
cTB
dmd
dmg
dmi
dml
dmn
dmp
dmk
dmm
dmo
dms
dmv
dmD
dmL
dmA
aaf
aaa
aaa
@@ -131065,10 +131010,10 @@ cRi
cRi
cRi
cRi
dlW
dlY
dmc
dmf
dmj
dma
dme
aaa
aaf
aaf
@@ -137639,11 +137584,11 @@ aEr
aFC
aGZ
aGZ
dlJ
dlK
aKG
aMj
aKG
dlJ
dlO
aQe
aRv
dfD
@@ -137896,11 +137841,11 @@ dej
aFC
deC
deC
dlJ
dlL
aKH
aMk
aNu
dlJ
dlP
dfp
dfp
dfE
@@ -138152,13 +138097,13 @@ aCY
dek
der
deD
dlJ
dlI
aJv
aKI
aMj
dfb
dfj
dlJ
dlR
deD
dfF
aTN
@@ -138415,7 +138360,7 @@ dbb
aMk
aNv
dfk
dlI
dfq
djt
dfG
dfQ
@@ -138672,7 +138617,7 @@ dbb
dfa
aNv
dfk
dfq
dlS
djx
dfG
cXz
@@ -138929,7 +138874,7 @@ dbb
aMk
aNv
dfm
dfq
dlT
djt
dbg
dfR
@@ -139181,12 +139126,12 @@ dem
aFD
deD
dlJ
dlJ
dlM
deV
dlO
dlN
dfc
dlJ
dlJ
dlQ
dlU
deD
dfI
dfS
+55 -43
View File
@@ -16031,11 +16031,11 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_x = -32
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"azd" = (
/obj/structure/chair,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aze" = (
/obj/structure/chair{
@@ -16046,7 +16046,7 @@
pixel_x = 0;
pixel_y = 24
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"azf" = (
/obj/structure/table/reinforced,
@@ -16530,10 +16530,10 @@
/obj/machinery/status_display{
pixel_x = -32
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aAb" = (
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aAc" = (
/obj/machinery/door/airlock/command{
@@ -17220,7 +17220,7 @@
"aBk" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aBl" = (
/obj/item/weapon/twohanded/required/kirbyplants{
@@ -17847,7 +17847,7 @@
name = "Holding Area";
req_access_txt = "2"
},
/turf/open/floor/plasteel/shuttle/red,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aCp" = (
/obj/machinery/ai_status_display,
@@ -19612,7 +19612,7 @@
})
"aFo" = (
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aFp" = (
/obj/machinery/vending/wallmed{
@@ -19622,7 +19622,7 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aFq" = (
/obj/machinery/power/emitter,
@@ -24300,6 +24300,12 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/camera{
c_tag = "Engineering Supermatter Chamber";
dir = 2;
network = list("SS13","Engine");
pixel_x = 23
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"aMS" = (
@@ -38233,7 +38239,7 @@
name = "Arrivals"
})
"bkA" = (
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival)
"bkB" = (
/obj/structure/chair{
@@ -38280,7 +38286,7 @@
req_access_txt = "0";
use_power = 0
},
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival)
"bkG" = (
/obj/structure/sign/nanotrasen,
@@ -38324,7 +38330,9 @@
},
/area/shuttle/arrival)
"bkL" = (
/obj/effect/landmark/observer_start,
/obj/effect/landmark{
name = "Observer-Start"
},
/turf/open/floor/plasteel/neutral,
/area/shuttle/arrival)
"bkM" = (
@@ -41500,7 +41508,7 @@
name = "Arrivals Shuttle console";
pixel_y = 0
},
/turf/closed/wall/shuttle/smooth/nodiagonal,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/arrival)
"buB" = (
/obj/machinery/light{
@@ -41680,22 +41688,6 @@
},
/area/tcommsat/server)
"buV" = (
/obj/machinery/power/rad_collector{
anchored = 1
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/camera{
c_tag = "Engineering Supermatter Chamber";
dir = 2;
network = list("SS13","Engine");
pixel_x = 23
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"buW" = (
/obj/structure/cable/white{
tag = "icon-0-2";
icon_state = "0-2"
@@ -41705,6 +41697,9 @@
dir = 5
},
/area/bridge)
"buW" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"buX" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
@@ -41712,23 +41707,40 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"buZ" = (
/turf/closed/wall/r_wall,
/obj/machinery/power/rad_collector{
anchored = 1
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"bva" = (
/turf/closed/wall/r_wall,
/obj/machinery/power/rad_collector{
anchored = 1
},
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"bvb" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"bvc" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"bvd" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/engine/supermatter)
"bvd" = (
"bve" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"bve" = (
"bvf" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
@@ -72433,11 +72445,11 @@ aHl
aIi
aJs
aKz
buY
buV
aMR
buX
aMR
buZ
bva
bvb
aQL
aRI
aSS
@@ -72689,12 +72701,12 @@ aGj
aHm
aIj
aJt
buX
buW
aLP
aMS
aMS
aOC
bvb
bvc
aQM
aRJ
aST
@@ -73208,7 +73220,7 @@ aLR
aMU
aOa
aMU
bvc
bvd
aQO
aRL
aSV
@@ -73722,7 +73734,7 @@ aLT
aMW
aMW
aOD
bvd
bve
aQQ
aRN
aSX
@@ -73975,11 +73987,11 @@ aHr
aIo
aJw
aKE
buZ
buY
aMX
aMX
aMX
bve
bvf
aQR
aRO
aSY
@@ -83958,7 +83970,7 @@ aav
aaH
aaQ
abb
buW
buV
abF
ack
adc
@@ -26127,7 +26127,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"baF" = (
/obj/effect/landmark/start/assistant,
/obj/effect/landmark/start{
name = "Assistant"
},
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 4;
external_pressure_bound = 101.325;
@@ -26599,7 +26601,9 @@
/turf/open/floor/plating,
/area/maintenance/apmaint)
"bbt" = (
/obj/effect/landmark/observer_start,
/obj/effect/landmark{
name = "Observer-Start"
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"bbu" = (
@@ -50235,7 +50239,9 @@
/obj/structure/chair{
dir = 8
},
/obj/effect/landmark/latejoin,
/obj/effect/landmark{
name = "JoinLate"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9;
pixel_y = 0
+14 -8
View File
@@ -58311,11 +58311,11 @@
/area/engine/engineering)
"czi" = (
/obj/machinery/door/airlock/titanium,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"czj" = (
/obj/machinery/door/airlock/glass,
/turf/open/floor/plasteel/shuttle/white,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"czk" = (
/obj/machinery/door/airlock/external{
@@ -60261,6 +60261,12 @@
d2 = 8;
icon_state = "0-8"
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 2;
network = list("Engine");
pixel_x = 23
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cEv" = (
@@ -72088,7 +72094,7 @@ cyV
cyi
cMh
cyi
czi
cye
cyi
cyi
cye
@@ -72597,7 +72603,7 @@ cyi
cyJ
cyc
cyi
czi
cye
cyi
cMe
cyi
@@ -73627,7 +73633,7 @@ cyc
cyc
cyc
cyR
czj
cza
cyR
cyc
cyc
@@ -91651,7 +91657,7 @@ ccw
ccw
ccw
cdk
cMN
cMC
cgR
ckK
clJ
@@ -91664,10 +91670,10 @@ cqg
cqE
cqZ
crt
cMG
cMH
cAm
cMG
cMK
cMN
cFO
csC
csQ
@@ -0,0 +1,215 @@
diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks)
@@ -7936,7 +7936,9 @@
/obj/structure/chair{
dir = 4
},
-/obj/effect/landmark/start/cargo_technician,
+/obj/effect/landmark/start{
+ name = "Cargo Technician"
+ },
/turf/open/floor/plasteel,
/area/quartermaster/office)
"aqV" = (
@@ -15366,7 +15368,9 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"aHt" = (
-/obj/effect/landmark/observer_start,
+/obj/effect/landmark{
+ name = "Observer-Start"
+ },
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"aHu" = (
@@ -26739,7 +26743,9 @@
/obj/structure/chair/office/light{
dir = 1
},
-/obj/effect/landmark/start/roboticist,
+/obj/effect/landmark/start{
+ name = "Roboticist"
+ },
/turf/open/floor/plasteel/white,
/area/assembly/robotics)
"biN" = (
@@ -59513,7 +59519,7 @@
anchored = 1
},
/obj/structure/light_construct,
-/turf/open/floor/plasteel/shuttle/white,
+/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"czo" = (
/turf/open/space,
@@ -64916,8 +64928,22 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"cMC" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching the Engine.";
+ dir = 8;
+ layer = 4;
+ name = "Engine Monitor";
+ network = list("Engine");
+ pixel_x = 30;
+ pixel_y = 0
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"cMD" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
@@ -64928,21 +64954,33 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"cMG" = (
-/turf/open/floor/engine,
+/turf/closed/wall/r_wall,
/area/engine/supermatter)
"cMH" = (
/turf/open/floor/engine,
/area/engine/supermatter)
"cMI" = (
-/turf/closed/wall/r_wall,
+/obj/machinery/power/rad_collector{
+ anchored = 1
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/open/floor/engine,
/area/engine/supermatter)
"cMJ" = (
-/turf/closed/wall/r_wall,
+/obj/machinery/power/rad_collector{
+ anchored = 1
+ },
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/open/floor/engine,
/area/engine/supermatter)
"cMK" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/highpressure/fulltile,
-/turf/open/floor/plating,
+/turf/open/floor/engine,
/area/engine/supermatter)
"cML" = (
/turf/closed/wall/r_wall,
@@ -64951,37 +64989,15 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"cMN" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the Engine.";
- dir = 8;
- layer = 4;
- name = "Engine Monitor";
- network = list("Engine");
- pixel_x = 30;
- pixel_y = 0
- },
-/turf/open/floor/plasteel,
-/area/engine/engineering)
+/obj/structure/grille,
+/obj/structure/window/reinforced/highpressure/fulltile,
+/turf/open/floor/plating,
+/area/engine/supermatter)
"cMO" = (
-/obj/machinery/power/rad_collector{
- anchored = 1
- },
-/obj/structure/cable/yellow{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/camera{
- c_tag = "Supermatter Chamber";
- dir = 2;
- network = list("Engine");
- pixel_x = 23
- },
-/turf/open/floor/engine,
+/turf/closed/wall/r_wall,
+/area/engine/supermatter)
+"cMP" = (
+/turf/closed/wall/r_wall,
/area/engine/supermatter)
(1,1,1) = {"
@@ -93185,11 +93201,11 @@ cpy
cDv
cDD
cqU
-cMC
-cMO
-cEu
+cMF
cEu
-cMC
+cMI
+cMJ
+cML
cFL
cGf
cGw
@@ -93441,12 +93457,12 @@ chV
cDq
cqf
cqD
-cMC
+cME
crs
cEv
cEv
cFe
-cMC
+cMM
cFM
czE
cGx
@@ -94468,13 +94484,13 @@ ccw
cii
cDq
cqi
-cMC
+cMD
cAP
crv
cEy
cEy
cFh
-cMC
+cMO
cFQ
czE
cGx
@@ -94727,11 +94743,11 @@ cDr
cDw
cDE
cEa
-cMC
+cMG
cEz
cEz
cEz
-cMC
+cMP
cFR
cGf
cGz
+1 -5
View File
@@ -7811,11 +7811,7 @@
/area/shuttle/assault_pod)
"tm" = (
/obj/machinery/computer/shuttle/syndicate/drop_pod,
/turf/closed/wall/shuttle{
tag = "icon-wall3";
icon_state = "wall3";
dir = 2
},
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"tn" = (
/obj/structure/grille,