From 026b5076be3b09a6d455ff7da48b68b284fc1c5e Mon Sep 17 00:00:00 2001
From: Rykka <sorren15@gmail.com>
Date: Wed, 16 Oct 2019 16:58:26 -0600
Subject: [PATCH] Add Discard Prob to Abandoned Outpost, minor map fixes

---
 .../submaps/underdark_pois/_templates.dm      |  1 +
 maps/tether/tether-08-mining.dmm              |  1 +
 maps/tether/tether-09-solars.dmm              | 66 +++++++++++++------
 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/maps/tether/submaps/underdark_pois/_templates.dm b/maps/tether/submaps/underdark_pois/_templates.dm
index d5230a142af..6b250fb12ed 100644
--- a/maps/tether/submaps/underdark_pois/_templates.dm
+++ b/maps/tether/submaps/underdark_pois/_templates.dm
@@ -123,6 +123,7 @@
 	mappath = 'abandonded_outpost.dmm'
 	cost = 45
 	allow_duplicates = FALSE
+	discard_prob = 35
 
 /datum/map_template/underdark/mimicry
 	name = "Underdark Mimic Death"
diff --git a/maps/tether/tether-08-mining.dmm b/maps/tether/tether-08-mining.dmm
index 4ac32fc3481..46baeb8736e 100644
--- a/maps/tether/tether-08-mining.dmm
+++ b/maps/tether/tether-08-mining.dmm
@@ -257,6 +257,7 @@
 	pixel_y = 24
 	},
 /obj/structure/cable/green{
+	d2 = 2;
 	icon_state = "0-2"
 	},
 /obj/machinery/light_switch{
diff --git a/maps/tether/tether-09-solars.dmm b/maps/tether/tether-09-solars.dmm
index 7a12cc511dc..09d6f78bbbb 100644
--- a/maps/tether/tether-09-solars.dmm
+++ b/maps/tether/tether-09-solars.dmm
@@ -6490,6 +6490,11 @@
 	dir = 8;
 	icon_state = "tube1"
 	},
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	icon_state = "extinguisher_closed";
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/anomaly_lab)
 "lN" = (
@@ -6879,6 +6884,11 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning,
+/obj/structure/extinguisher_cabinet{
+	dir = 4;
+	icon_state = "extinguisher_closed";
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/anomaly_lab)
 "my" = (
@@ -7110,8 +7120,26 @@
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/anomaly_lab)
 "mQ" = (
-/obj/machinery/light,
-/obj/machinery/artifact_scanpad,
+/obj/machinery/camera/network/research_outpost{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc{
+	cell_type = /obj/item/weapon/cell/super;
+	dir = 8;
+	name = "west bump";
+	pixel_x = -28
+	},
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	icon_state = "extinguisher_closed";
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/anomaly_lab)
 "mR" = (
@@ -7475,20 +7503,12 @@
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/anomaly_lab)
 "nE" = (
-/obj/machinery/camera/network/research_outpost{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "0-4"
-	},
-/obj/machinery/power/apc{
-	cell_type = /obj/item/weapon/cell/super;
-	dir = 8;
-	name = "west bump";
-	pixel_x = -28
+/obj/machinery/light,
+/obj/machinery/artifact_scanpad,
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	icon_state = "extinguisher_closed";
+	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/anomaly_lab)
@@ -8048,6 +8068,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/rnd/outpost/breakroom)
+"oR" = (
+/obj/structure/extinguisher_cabinet{
+	dir = 1;
+	icon_state = "extinguisher_closed";
+	pixel_y = -32
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/outpost/anomaly_lab)
 "oT" = (
 /obj/structure/bed/chair/wood{
 	dir = 8
@@ -21767,7 +21795,7 @@ jw
 nD
 nM
 kZ
-mQ
+nE
 jx
 ab
 ab
@@ -21904,7 +21932,7 @@ kx
 lA
 ka
 ol
-nE
+mQ
 jx
 no
 mD
@@ -23755,7 +23783,7 @@ ma
 nR
 mJ
 mW
-kZ
+oR
 jx
 ab
 ab