From e3ad2643b21b4e7d141978f978decbbf0ba60bec Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 12 Feb 2018 20:30:05 -0500
Subject: [PATCH] maps first

---
 _maps/RandomRuins/SpaceRuins/caravanambush.dmm    | 7 ++++++-
 _maps/RandomRuins/SpaceRuins/listeningstation.dmm | 2 --
 _maps/map_files/BoxStation/BoxStation.dmm         | 2 +-
 _maps/shuttles/whiteship_delta.dmm                | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index 1081a01b03..8bf0ab8c89 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -70,6 +70,7 @@
 	name = "Pirate Cutter";
 	port_direction = 8;
 	preferred_direction = 4;
+	timid = 0;
 	width = 22
 	},
 /turf/open/floor/plating,
@@ -3264,6 +3265,7 @@
 	name = "Syndicate Drop Ship";
 	port_direction = 8;
 	preferred_direction = 4;
+	timid = 0;
 	width = 15
 	},
 /turf/open/floor/plating,
@@ -3431,6 +3433,7 @@
 	name = "Syndicate Fighter";
 	port_direction = 2;
 	preferred_direction = 4;
+	timid = 0;
 	width = 9
 	},
 /turf/open/floor/plating,
@@ -3577,6 +3580,7 @@
 	name = "Syndicate Fighter";
 	port_direction = 2;
 	preferred_direction = 1;
+	timid = 0;
 	width = 9
 	},
 /turf/open/floor/plating,
@@ -3605,6 +3609,7 @@
 	name = "Small Freighter";
 	port_direction = 8;
 	preferred_direction = 4;
+	timid = 0;
 	width = 27
 	},
 /turf/open/floor/plating,
@@ -8929,4 +8934,4 @@ aa
 aa
 aa
 aa
-"}
\ No newline at end of file
+"}
diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index b586f7e8f8..8ca1f1529a 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -179,7 +179,6 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -651,7 +650,6 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/mob/living/simple_animal/hostile/syndicate/ranged,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "bc" = (
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 035e336660..22e82524cb 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -37500,6 +37500,7 @@
 /turf/open/floor/plating,
 /area/engine/atmos)
 "bPb" = (
+/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/research/glass{
 	name = "Circuitry Lab";
 	req_access_txt = "47"
@@ -37513,7 +37514,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
 "bPc" = (
diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm
index 57adba831c..2c818c2ece 100644
--- a/_maps/shuttles/whiteship_delta.dmm
+++ b/_maps/shuttles/whiteship_delta.dmm
@@ -1518,7 +1518,7 @@
 	name = "White-Ship";
 	port_direction = 8;
 	preferred_direction = 8;
-	timid = 1;
+	timid = 0;
 	width = 32
 	},
 /turf/open/floor/plasteel/neutral,