Merge pull request #13750 from EmeraldSundisk/deltacargo-129

Fixes Delta's cargo conveyor problem.
This commit is contained in:
silicons
2020-12-12 01:55:35 -07:00
committed by GitHub
+47 -53
View File
@@ -1309,6 +1309,45 @@
/obj/item/toy/poolnoodle/blue,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/pool)
"acy" = (
/obj/machinery/conveyor_switch/oneway{
dir = 8;
id = "cargounload"
},
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"acz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"acA" = (
/obj/machinery/conveyor{
dir = 9;
id = "cargounload"
},
/turf/open/floor/plating,
/area/quartermaster/storage)
"acB" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/light/floor,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"acF" = (
/obj/docking_port/stationary{
dir = 2;
@@ -12918,18 +12957,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aAH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor_switch/oneway{
dir = 8;
id = "cargounload"
},
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aAI" = (
/obj/structure/cable/white,
/obj/structure/cable/white{
@@ -13616,14 +13643,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aBZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aCa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/brown,
@@ -14264,23 +14283,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aDf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/external{
name = "Supply Dock Airlock";
req_access_txt = "31"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aDg" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -125650,14 +125652,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/department/electrical)
"hdH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
dir = 9;
id = "cargoload"
},
/turf/open/floor/plating,
/area/quartermaster/storage)
"hic" = (
/obj/structure/table/reinforced,
/obj/item/integrated_electronics/analyzer,
@@ -171852,7 +171846,7 @@ azy
aAG
aDb
aAG
aAG
acB
azy
azy
aAG
@@ -173134,7 +173128,7 @@ axk
ayB
azE
azE
aBZ
acz
azE
azE
azE
@@ -173390,9 +173384,9 @@ aoF
axl
ayC
azF
aAH
aCa
aCa
acy
aEf
aEf
aEf
aEf
aCa
@@ -173648,8 +173642,8 @@ axm
ayD
ayD
ayD
hdH
azD
acA
aEe
aaq
azD
kam
@@ -173906,7 +173900,7 @@ ayE
azG
aAI
aCb
aDf
aFk
avW
aFk
aGD