shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-15 15:01:54 -04:00
committed by TalkingCactus
parent 74244a3d32
commit c38fa1eaa3
44 changed files with 5022 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/OmegaStation/OmegaStation.dmm
+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