From e50c9642e682fffac2a2ccd87d3942fb8d77b071 Mon Sep 17 00:00:00 2001
From: Mewchild <mercora.sama@gmail.com>
Date: Mon, 22 Jul 2019 20:15:30 -0500
Subject: [PATCH] Adds maint door, replaces alien tables, adds air alarm and
 missing APCs

---
 code/modules/tables/presets.dm     |  9 ++++
 maps/tether/tether-01-surface1.dmm | 81 +++++++++++++++++++++++++-----
 maps/tether/tether-02-surface2.dmm |  9 +++-
 3 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/code/modules/tables/presets.dm b/code/modules/tables/presets.dm
index 06fca651383..5d568d440e9 100644
--- a/code/modules/tables/presets.dm
+++ b/code/modules/tables/presets.dm
@@ -75,6 +75,15 @@
 	material = get_material_by_name("glass")
 	..()
 
+/obj/structure/table/borosilicate
+	icon_state = "plain_preview"
+	color = "#4D3EAC"
+	alpha = 77
+
+/obj/structure/table/borosilicate/New()
+	material = get_material_by_name("borosilicate glass")
+	..()
+
 /obj/structure/table/holotable
 	icon_state = "holo_preview"
 	color = "#EEEEEE"
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index d0237d58715..6f4e83c0533 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -25894,6 +25894,11 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plating,
 /area/vacant/vacant_bar)
 "crL" = (
@@ -26297,6 +26302,12 @@
 /area/engineering/atmos/processing)
 "dRx" = (
 /obj/machinery/vending/cigarette,
+/obj/machinery/power/apc{
+	cell_type = /obj/item/weapon/cell/apc;
+	dir = 8;
+	name = "west bump";
+	pixel_x = -28
+	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/sleep/maintDorm3)
 "dSz" = (
@@ -27196,6 +27207,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/public_garden)
+"hxf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/wood,
+/area/vacant/vacant_bar)
 "hAF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/freezer,
@@ -27535,6 +27555,9 @@
 	pixel_x = -24
 	},
 /obj/structure/table,
+/obj/item/stack/material/wood{
+	amount = 10
+	},
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar)
 "iNX" = (
@@ -27736,9 +27759,7 @@
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/processing)
 "jmP" = (
-/obj/structure/table/alien{
-	name = "sleek table"
-	},
+/obj/structure/table/borosilicate,
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar)
 "jod" = (
@@ -28085,6 +28106,14 @@
 /obj/effect/decal/cleanable/blood,
 /turf/simulated/floor/plating,
 /area/maintenance/lower/atmos)
+"kuB" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/material/wood{
+	amount = 10
+	},
+/turf/simulated/floor/wood,
+/area/vacant/vacant_bar)
 "kuC" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 5
@@ -28149,6 +28178,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/atrium_one)
+"kOq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 28
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/lower/atmos)
 "kOB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
@@ -28787,14 +28828,12 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/maintenance/lower/atmos)
 "mDm" = (
-/obj/structure/table/alien{
-	name = "sleek table"
-	},
 /obj/effect/immovablerod{
 	density = 0;
 	desc = "Engineered for your entertainment.";
 	name = "Dance Pole"
 	},
+/obj/structure/table/borosilicate,
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar)
 "mEg" = (
@@ -28833,6 +28872,16 @@
 /obj/machinery/atmospherics/pipe/tank/air,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos)
+"mUc" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/atmos)
 "mUG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -29215,6 +29264,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/processing)
+"ocj" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/lower/atmos)
 "ocQ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/green,
 /obj/effect/floor_decal/borderfloor{
@@ -42642,8 +42699,8 @@ aLC
 gtV
 cyE
 pGN
-cyE
-aLC
+kOq
+ocj
 aLC
 mMD
 azI
@@ -42785,7 +42842,7 @@ azI
 azI
 azI
 azI
-azI
+mUc
 azI
 azI
 azI
@@ -42927,7 +42984,7 @@ iMg
 eLg
 fLT
 foy
-taf
+hxf
 jBQ
 kMh
 nsF
@@ -44211,7 +44268,7 @@ jiZ
 uvM
 nsF
 sHx
-sHx
+kuB
 mos
 mqx
 mqx
@@ -44487,7 +44544,7 @@ eUB
 aLE
 wOg
 wle
-adK
+jiZ
 jiZ
 jiZ
 jiZ
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index d83d87c8584..68283d7a847 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -16737,6 +16737,13 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/lower/bar)
+"Mz" = (
+/obj/machinery/alarm{
+	frequency = 1441;
+	pixel_y = 22
+	},
+/turf/simulated/floor/wood,
+/area/vacant/vacant_bar_upper)
 "MA" = (
 /obj/structure/table/steel,
 /obj/item/device/nif/bad,
@@ -30574,7 +30581,7 @@ Ud
 Eu
 JU
 Ih
-Eu
+Mz
 JU
 Ud
 Eu