Merge pull request #6479 from Citadel-Station-13/upstream-merge-37325

[MIRROR] Delta ORM position
This commit is contained in:
LetterJay
2018-04-22 22:22:25 -05:00
committed by GitHub

View File

@@ -28115,6 +28115,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"blS" = (
@@ -100523,15 +100524,6 @@
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel/brown,
/area/quartermaster/office)
"ehK" = (
/obj/machinery/mineral/ore_redemption{
input_dir = 4;
output_dir = 8
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/miningoffice)
"ehL" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -100933,6 +100925,12 @@
dir = 6
},
/area/science/circuit)
"rUL" = (
/obj/machinery/mineral/ore_redemption,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/plasteel/neutral,
/area/quartermaster/miningoffice)
"saw" = (
/turf/closed/wall,
/area/science/circuit)
@@ -144365,7 +144363,7 @@ bgK
bii
bjU
blR
baU
rUL
boO
bqZ
bsT
@@ -144877,7 +144875,7 @@ baU
bfw
bgG
bik
ehK
baU
baQ
baQ
boW