From 97d62585ab4e342aaa328912d2437f0ceabd3b75 Mon Sep 17 00:00:00 2001
From: klaasjared <86997650+GhostActual@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:17:24 -0400
Subject: [PATCH] Base Commit

---
 maps/tether/tether-03-surface3.dmm | 140 ++++++++++++++++++-----------
 1 file changed, 89 insertions(+), 51 deletions(-)

diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index b6eab2fc168..3d83e9bcd72 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -7434,12 +7434,12 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_three_hall)
 "all" = (
-/obj/machinery/shower{
-	pixel_y = 8
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/structure/mirror{
+	pixel_y = 38
 	},
-/obj/item/weapon/soap/deluxe,
-/obj/structure/curtain/open/shower,
-/obj/item/weapon/bikehorn/rubberducky,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/captain)
 "alm" = (
@@ -9843,6 +9843,22 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/sign/directions/engineering{
+	dir = 8;
+	pixel_y = -40
+	},
+/obj/structure/sign/directions/security{
+	dir = 8;
+	pixel_y = -34
+	},
+/obj/structure/sign/directions/science{
+	dir = 8;
+	pixel_y = -28
+	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	pixel_y = -22
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_three_hall)
 "apE" = (
@@ -13529,16 +13545,13 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/captain)
 "awj" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = -12;
-	pixel_y = -3
-	},
-/obj/structure/mirror{
+/obj/machinery/shower{
 	dir = 4;
-	pixel_x = -25;
-	pixel_y = 5
+	pixel_x = 5
 	},
+/obj/item/weapon/soap/deluxe,
+/obj/structure/curtain/open/shower,
+/obj/item/weapon/bikehorn/rubberducky,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/captain)
 "awk" = (
@@ -15611,11 +15624,17 @@
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/triage)
 "azv" = (
-/obj/structure/sign/double/barsign{
-	dir = 8
+/obj/effect/floor_decal/corner/lightgrey{
+	dir = 9
 	},
-/turf/simulated/wall,
-/area/crew_quarters/bar)
+/obj/effect/floor_decal/corner/lightgrey{
+	dir = 6
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -32
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/surface_three_hall)
 "azw" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -16116,9 +16135,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/camera/network/tether{
-	dir = 9
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/third_south)
 "aAg" = (
@@ -28516,24 +28532,28 @@
 /turf/simulated/wall,
 /area/tether/surfacebase/entertainment/backstage)
 "aWD" = (
-/obj/structure/sign/directions/medical{
-	dir = 4;
-	pixel_y = 8
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/structure/sign/directions/science{
-	dir = 8;
-	pixel_y = 3
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
 	},
-/obj/structure/sign/directions/security{
-	dir = 8;
-	pixel_y = -4
+/obj/effect/floor_decal/corner/beige/border{
+	dir = 4
 	},
-/obj/structure/sign/directions/engineering{
-	dir = 8;
-	pixel_y = -10
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 10
 	},
-/turf/simulated/wall,
-/area/tether/surfacebase/entertainment/backstage)
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 9
+	},
+/obj/machinery/camera/network/tether{
+	dir = 9
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/lower/third_south)
 "aWF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -30717,16 +30737,16 @@
 /obj/machinery/button/windowtint{
 	id = "hop_office";
 	layer = 3.3;
-	pixel_x = 3;
-	pixel_y = -29
+	pixel_x = 31;
+	pixel_y = -24
 	},
 /obj/machinery/button/remote/blast_door{
 	desc = "A remote control-switch for shutters.";
 	id = "hop_office_desk";
 	layer = 3.3;
 	name = "Desk Privacy Shutter";
-	pixel_x = 10;
-	pixel_y = -29
+	pixel_x = 23;
+	pixel_y = -24
 	},
 /obj/structure/cable/green{
 	d1 = 2;
@@ -30789,7 +30809,8 @@
 "bav" = (
 /obj/machinery/photocopier,
 /obj/machinery/firealarm{
-	pixel_x = -30
+	dir = 8;
+	pixel_x = -24
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
@@ -31196,10 +31217,6 @@
 /turf/simulated/floor/lino,
 /area/tether/surfacebase/entertainment/backstage)
 "bbe" = (
-/obj/machinery/firealarm{
-	layer = 3.3;
-	pixel_y = 26
-	},
 /obj/machinery/vending/loadout/accessory,
 /obj/machinery/alarm{
 	dir = 8;
@@ -32657,9 +32674,6 @@
 /obj/effect/floor_decal/corner/lightgrey{
 	dir = 6
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -32
-	},
 /obj/item/device/radio/intercom/entertainment{
 	pixel_y = -23
 	},
@@ -42060,6 +42074,30 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/carpet,
 /area/tether/surfacebase/security/hos)
+"rpJ" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/beige/border{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 10
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 9
+	},
+/obj/structure/sign/double/barsign{
+	dir = 8;
+	pixel_x = 32
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/lower/third_south)
 "rrG" = (
 /obj/structure/table/steel,
 /obj/item/weapon/folder/red{
@@ -56320,7 +56358,7 @@ aXB
 bbF
 ajM
 apD
-aWD
+aWC
 baZ
 bfI
 bfH
@@ -57434,7 +57472,7 @@ avG
 akn
 alk
 bbt
-alk
+azv
 ayx
 ayx
 aTy
@@ -58169,8 +58207,8 @@ aKx
 awU
 aCJ
 axw
-axw
-axw
+aWD
+rpJ
 aAf
 aCJ
 axw
@@ -58312,7 +58350,7 @@ aru
 avd
 aru
 arJ
-azv
+arJ
 arJ
 aCS
 avK