Conveyor update (OracleStation#1115)

variableundefined · Jul 31, 2018 · 745210d · 745210d
1 parent 0e38262
commit 745210d
Show file tree

Hide file tree

Showing 11 changed files with 1,086 additions and 8,888 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -8,16 +8,6 @@
 "ac" = (
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered/no_grav)
-"ad" = (
-/turf/closed/mineral/random/low_chance,
-/area/asteroid/cave{
-	name = "Asteroid - Space"
-	})
-"ae" = (
-/turf/open/floor/plating/asteroid/airless,
-/area/asteroid/cave{
-	name = "Asteroid - Space"
-	})
 "af" = (
 /turf/closed/wall/mineral/iron{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -40,50 +30,37 @@
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/kitchen)
-"aj" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage/crusher)
 "ak" = (
-/obj/machinery/conveyor{
-	dir = 4;
+/obj/machinery/conveyor/east{
 	id = "bunkerrecycle"
 	},
 /turf/open/floor/plating{
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/crusher)
 "al" = (
-/obj/machinery/conveyor{
-	dir = 4;
-	id = "bunkerrecycle"
-	},
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/machinery/conveyor/east{
+	id = "bunkerrecycle"
+	},
 /turf/open/floor/plating{
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/crusher)
 "am" = (
 /obj/machinery/recycler/deathtrap,
-/obj/machinery/conveyor{
-	dir = 4;
+/obj/machinery/conveyor/east{
 	id = "bunkerrecycle"
 	},
 /turf/open/floor/plating{
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/crusher)
 "an" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "bunkerrecycle";
-	movedir = 2
+/obj/machinery/conveyor/southeast{
+	id = "bunkerrecycle"
 	},
 /turf/open/floor/plating{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -138,24 +115,11 @@
 	},
 /area/ruin/space/has_grav/deepstorage/crusher)
 "au" = (
-/obj/machinery/conveyor_switch{
-	id = "bunkerrecycle"
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage/crusher)
-"av" = (
-/obj/structure/window/plasma/reinforced{
-	dir = 8
-	},
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "bunkerrecycle";
-	movedir = 2
+/obj/machinery/conveyor_switch/oneway{
+	id = "bunkerrecycle"
 	},
 /turf/open/floor/plating{
 	baseturf = /turf/open/floor/plating/asteroid/airless
@@ -232,19 +196,6 @@
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/crusher)
-"aF" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "bunkerrecycle";
-	movedir = 2
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage/crusher)
 "aG" = (
 /obj/structure/closet/cardboard,
 /obj/item/stack/sheet/mineral/silver,
@@ -1721,16 +1672,6 @@
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage)
-"do" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = 24
-	},
-/turf/open/floor/plasteel/floorgrime{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage)
 "dp" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/mineral/iron{
@@ -3454,22 +3395,6 @@
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage)
-"go" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/open/floor/plasteel/floorgrime{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage)
-"gp" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/turf/closed/wall/mineral/iron{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage/power)
 "gq" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4";
@@ -3493,19 +3418,6 @@
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/power)
-"gs" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/floorgrime{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage/power)
 "gt" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
 /obj/structure/cable/yellow{
@@ -3760,23 +3672,6 @@
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/power)
-"gS" = (
-/obj/structure/grille,
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/airless
-	},
-/area/ruin/space/has_grav/deepstorage/power)
 "gT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
 	dir = 5
@@ -4021,6 +3916,14 @@
 	baseturf = /turf/open/floor/plating/asteroid/airless
 	},
 /area/ruin/space/has_grav/deepstorage/power)
+"Ce" = (
+/obj/machinery/conveyor{
+	id = "bunkerrecycle"
+	},
+/turf/open/floor/plating{
+	baseturf = /turf/open/floor/plating/asteroid/airless
+	},
+/area/ruin/space/has_grav/deepstorage/crusher)
 
 (1,1,1) = {"
 aa
@@ -5647,8 +5550,8 @@ ab
 ab
 ag
 an
-an
-an
+Ce
+Ce
 aQ
 bh
 bB