From ca4c55a89d4ccc005dda033fe797293f21c46882 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Wed, 22 Apr 2020 10:37:56 -0400
Subject: [PATCH] Minor mapfixes

- Fixes some unreplaced walls on the Daedalus
- Fixes Daedalus reactor storage atmospherics
- Rearranges the Assault Shuttle's layout a bit. Bed moved to cockpit, ATM added to vault, permanent translocator beacon added to medical bay.
---
 maps/tether/submaps/om_ships/cruiser.dmm   | 24 ++++++++++--------
 maps/tether/submaps/om_ships/shelter_6.dmm | 29 ++++++----------------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm
index 8659aa4bb95..81f5a4f8bf4 100644
--- a/maps/tether/submaps/om_ships/cruiser.dmm
+++ b/maps/tether/submaps/om_ships/cruiser.dmm
@@ -37,14 +37,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/mothership/breakroom)
-"ae" = (
-/turf/simulated/shuttle/wall/voidcraft/blue{
-	hard_corner = 1;
-	icon_state = "void-hc";
-	name = "small craft wall hc";
-	stripe_color = "#45b3d8"
-	},
-/area/mothership/breakroom)
 "af" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/space;
@@ -2681,7 +2673,7 @@
 "fx" = (
 /obj/machinery/alarm{
 	pixel_y = 22;
-	target_temperature = 273.15
+	target_temperature = 274.15
 	},
 /obj/machinery/power/port_gen/pacman/super/potato{
 	sheets = 100
@@ -2924,6 +2916,11 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/mothership/vault)
 "fU" = (
@@ -9732,6 +9729,11 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/mothership/vault)
 "Do" = (
@@ -20058,7 +20060,7 @@ aa
 tG
 tG
 tG
-ae
+tG
 aq
 ax
 FW
@@ -20768,7 +20770,7 @@ aa
 tG
 tG
 tG
-ae
+tG
 aq
 ax
 FW
diff --git a/maps/tether/submaps/om_ships/shelter_6.dmm b/maps/tether/submaps/om_ships/shelter_6.dmm
index 702a8ee6d6e..59b011a273b 100644
--- a/maps/tether/submaps/om_ships/shelter_6.dmm
+++ b/maps/tether/submaps/om_ships/shelter_6.dmm
@@ -884,11 +884,8 @@
 /turf/simulated/floor/bluegrid,
 /area/shuttle/tabiranth)
 "aQ" = (
-/obj/item/device/perfect_tele_beacon/stationary{
-	tele_name = "Tabiranth";
-	tele_network = "centcom"
-	},
-/obj/effect/floor_decal/industrial/hatch,
+/obj/structure/bed/pod,
+/obj/item/weapon/bedsheet/rd,
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/tabiranth)
 "aR" = (
@@ -1132,6 +1129,11 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/item/device/perfect_tele_beacon/stationary{
+	tele_name = "Tabiranth";
+	tele_network = "centcom"
+	},
+/obj/effect/floor_decal/industrial/hatch,
 /turf/simulated/floor/tiled/white,
 /area/shuttle/tabiranth)
 "be" = (
@@ -1539,8 +1541,6 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/tabiranth)
 "br" = (
-/obj/structure/bed/pod,
-/obj/item/weapon/bedsheet/rd,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
@@ -1548,6 +1548,7 @@
 	dir = 4;
 	pixel_y = 0
 	},
+/obj/machinery/atm,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/tabiranth)
 "bs" = (
@@ -1726,20 +1727,6 @@
 /area/shuttle/tabiranth)
 "bI" = (
 /obj/structure/bed/chair/bay/shuttle,
-/obj/machinery/portable_atmospherics/canister/oxygen{
-	anchored = 1;
-	density = 0;
-	health = 1000;
-	layer = 2.2;
-	volume = 10000
-	},
-/obj/machinery/portable_atmospherics/canister/oxygen{
-	anchored = 1;
-	density = 0;
-	health = 1000;
-	layer = 2.2;
-	volume = 10000
-	},
 /obj/machinery/button/remote/blast_door{
 	id = "tabi-vault";
 	name = "Vault Blast Door Controls";