From dccac29d1e4d1ed8e6b2e49d228c6d269dd93492 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 26 Jun 2019 09:43:57 +1000 Subject: [PATCH] Minor map fixes --- maps/tether/tether-03-surface3.dmm | 22 +++++++++---------- maps/tether/tether-06-station2.dmm | 35 ++++++++++++++++-------------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index da0405e8de9..8ee2e9d762b 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -11826,7 +11826,7 @@ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/camera/network/northern_star, +/obj/machinery/camera/network/tether, /obj/item/device/radio/intercom{ dir = 1; pixel_y = 24; @@ -12768,7 +12768,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "wh" = ( -/obj/machinery/camera/network/northern_star{ +/obj/machinery/camera/network/tether{ dir = 1 }, /obj/effect/floor_decal/borderfloor, @@ -14334,7 +14334,7 @@ /area/rnd/research/researchdivision) "yw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/camera/network/northern_star{ +/obj/machinery/camera/network/tether{ dir = 9 }, /obj/effect/floor_decal/borderfloor{ @@ -15647,7 +15647,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "At" = ( -/obj/machinery/camera/network/northern_star{ +/obj/machinery/camera/network/tether{ dir = 1 }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -19122,7 +19122,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "Fs" = ( -/obj/machinery/camera/network/northern_star, +/obj/machinery/camera/network/tether, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -20129,7 +20129,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) "GU" = ( -/obj/machinery/camera/network/northern_star{ +/obj/machinery/camera/network/tether{ dir = 1 }, /obj/effect/floor_decal/borderfloor, @@ -21609,7 +21609,7 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "PJ" = ( -/obj/machinery/camera/network/northern_star{ +/obj/machinery/camera/network/tether{ dir = 9 }, /turf/simulated/floor/tiled, @@ -21712,7 +21712,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "Ql" = ( -/obj/machinery/camera/network/northern_star{ +/obj/machinery/camera/network/tether{ dir = 1 }, /obj/effect/floor_decal/borderfloor, @@ -32236,9 +32236,9 @@ ac ac ac ac -ab -ab -ab +ac +ac +ac ab ab ab diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index d49a55c42f3..8b48b9980ea 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -6163,7 +6163,7 @@ name = "Engineering Workshop"; req_one_access = list(14,24) }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/engineering/locker_room) "jd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -19799,28 +19799,21 @@ /turf/simulated/floor, /area/maintenance/station/sec_lower) "EE" = ( +/turf/simulated/floor/tiled, +/area/tether/elevator) +"EF" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_l" }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station{ - base_turf = /turf/simulated/mineral/floor/vacuum - }) -"EF" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 - }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) "EG" = ( /obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" + dir = 8 }, /turf/space, /turf/simulated/shuttle/plating/airless/carry, @@ -19835,6 +19828,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"EI" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) "EZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -31717,7 +31720,7 @@ fu fu fu fu -fq +EE oS kj eN @@ -32597,11 +32600,11 @@ AN Ci Bw yY -EE -EF -EF EF EG +EG +EG +EI yY ac ac