From b1b7d3414c9623f016129b9eeec803e4c191c756 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Tue, 21 Apr 2020 00:07:13 -0400 Subject: [PATCH 1/2] Remove spare APC to stop the APC fight --- maps/tether/submaps/om_ships/aro2.dmm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/maps/tether/submaps/om_ships/aro2.dmm b/maps/tether/submaps/om_ships/aro2.dmm index 1e424a835c0..95b05ab4f67 100644 --- a/maps/tether/submaps/om_ships/aro2.dmm +++ b/maps/tether/submaps/om_ships/aro2.dmm @@ -1298,11 +1298,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/aro2/bighallway) "cD" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/floor_decal/techfloor/orange{ dir = 4 }, @@ -1520,11 +1515,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/effect/floor_decal/techfloor/orange/corner{ icon_state = "techfloororange_corners"; dir = 4 @@ -1925,11 +1915,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/aro2/bighallway) "dU" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ icon_state = "intact-supply"; dir = 8 @@ -2526,12 +2511,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/aro2/bighallway) "eV" = ( -/obj/structure/cable/cyan, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, /obj/effect/floor_decal/techfloor/orange{ icon_state = "techfloororange_edges"; dir = 6 From 6431e11d5dcc660902b68f874a33457a045aa6f6 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Tue, 21 Apr 2020 00:26:57 -0400 Subject: [PATCH 2/2] Vendvend --- maps/tether/submaps/om_ships/aro2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/submaps/om_ships/aro2.dmm b/maps/tether/submaps/om_ships/aro2.dmm index 95b05ab4f67..6ea287e94b9 100644 --- a/maps/tether/submaps/om_ships/aro2.dmm +++ b/maps/tether/submaps/om_ships/aro2.dmm @@ -1313,7 +1313,7 @@ /area/aro2/cafe) "cF" = ( /obj/effect/floor_decal/spline/plain, -/obj/machinery/vending/food, +/obj/machinery/vending/food/arojoan, /turf/simulated/floor/wood, /area/aro2/cafe) "cG" = (