add/refactor: Conveyors Rework (#5395)

Conveyors Rework
ss220-space · Jul 13, 2024 · 5b5674b · 5b5674b
1 parent d6cebd0
commit 5b5674b
Show file tree

Hide file tree

Showing 21 changed files with 1,764 additions and 1,354 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
@@ -1284,10 +1284,11 @@
 	},
 /area/ruin/unpowered)
 "KH" = (
-/obj/machinery/conveyor/west{
+/obj/structure/plasticflaps,
+/obj/machinery/conveyor/inverted{
+	id = "mining_internal";
 	dir = 5
 	},
-/obj/structure/plasticflaps,
 /turf/simulated/floor{
 	nitrogen = 23;
 	oxygen = 14;

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
@@ -16,8 +16,9 @@
 /turf/template_noop,
 /area/template_noop)
 "es" = (
-/obj/machinery/conveyor/northeast{
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 5
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -29,16 +30,18 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
 "fU" = (
-/obj/machinery/conveyor/east{
-	id = null
-	},
 /obj/machinery/gibber/autogibber,
 /obj/structure/plasticflaps,
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 4
+	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
 "fY" = (
-/obj/machinery/conveyor/east{
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin)
@@ -53,14 +56,16 @@
 "iK" = (
 /mob/living/simple_animal/pet/dog/corgi,
 /mob/living/simple_animal/pet/dog/corgi,
-/obj/machinery/conveyor/east{
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
 "jf" = (
-/obj/machinery/conveyor/north/ccw{
-	id = null
+/obj/machinery/conveyor/inverted{
+	id = "syndiecake";
+	dir = 10
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -69,9 +74,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
 "kh" = (
-/obj/machinery/conveyor/east{
-	dir = 2;
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake"
 	},
 /turf/simulated/floor/plasteel,
 /area/space)
@@ -153,6 +157,13 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
+"rG" = (
+/mob/living/simple_animal/pet/dog/corgi,
+/obj/machinery/conveyor_switch/oneway{
+	id = "syndiecake"
+	},
+/turf/simulated/floor/plasteel,
+/area/ruin/unpowered)
 "rJ" = (
 /obj/structure/lattice,
 /turf/space,
@@ -212,6 +223,13 @@
 	},
 /turf/simulated/wall,
 /area/ruin/unpowered)
+"vV" = (
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel,
+/area/ruin/unpowered)
 "xT" = (
 /obj/machinery/door/airlock/mining/glass{
 	locked = 1;
@@ -342,8 +360,15 @@
 /area/ruin/unpowered)
 "GB" = (
 /mob/living/simple_animal/pet/dog/corgi,
-/obj/machinery/conveyor/east{
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 4
+	},
+/turf/simulated/floor/plasteel,
+/area/ruin/unpowered)
+"He" = (
+/obj/machinery/conveyor_switch/oneway{
+	id = "syndiecake"
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -447,9 +472,8 @@
 /turf/simulated/floor/plasteel/airless,
 /area/ruin)
 "QF" = (
-/obj/machinery/conveyor/east{
-	dir = 2;
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake"
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin)
@@ -501,8 +525,9 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
 "Uq" = (
-/obj/machinery/conveyor/east{
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/space)
@@ -561,8 +586,9 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
 "Zs" = (
-/obj/machinery/conveyor/east{
-	id = null
+/obj/machinery/conveyor{
+	id = "syndiecake";
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered)
@@ -659,9 +685,9 @@ Hy
 Hy
 EJ
 ob
-ho
+rG
 BI
-sN
+He
 sN
 EJ
 AH
@@ -859,8 +885,8 @@ Hy
 Hy
 EJ
 es
-jf
-jf
+vV
+vV
 jf
 sN
 EJ