Merge pull request #4056 from deathride58/MAPCONFLICTSARETHEWORST

fixes the two mapping errors introduced in #4049
2017-11-21 19:22:15 +00:00
parent 8e095c780f 05800235b5
commit 03d67c753e
2 changed files with 3 additions and 1 deletions
@@ -57607,9 +57607,11 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/loading_area,
 /turf/open/floor/plasteel/neutral,
 /area/teleporter)
 "cmH" = (
+/obj/effect/turf_decal/loading_area,
 /turf/open/floor/plasteel/neutral,
 /area/teleporter)
 "cmI" = (
@@ -25865,7 +25865,7 @@
 	forwards = 2;
 	id = "packageSort2"
 	},
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/quartermaster/sorting)
 "bbP" = (
 /obj/structure/disposalpipe/segment,