From b45ef3701854f196bb162de520d899f08b36a425 Mon Sep 17 00:00:00 2001
From: fernerr <35879136+fernerr@users.noreply.github.com>
Date: Wed, 2 Sep 2020 06:30:34 +0200
Subject: [PATCH] Fixes the burglar shuttle being unable to dock at blue dock
 properly (#9855)

---
 .../Ferner-200901-bugfix_burglarblue.yml      |   4 +
 maps/aurora/aurora-1_centcomm.dmm             | 114 +++++++++---------
 2 files changed, 61 insertions(+), 57 deletions(-)
 create mode 100644 html/changelogs/Ferner-200901-bugfix_burglarblue.yml

diff --git a/html/changelogs/Ferner-200901-bugfix_burglarblue.yml b/html/changelogs/Ferner-200901-bugfix_burglarblue.yml
new file mode 100644
index 00000000000..5115d2736ba
--- /dev/null
+++ b/html/changelogs/Ferner-200901-bugfix_burglarblue.yml
@@ -0,0 +1,4 @@
+author: Ferner
+delete-after: True
+changes: 
+  - bugfix: "Fixed the burglar shuttle getting stuck when docking at blue dock."
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index d0e554dadbf..10baf1268a9 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -256,6 +256,22 @@
 	},
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/specops)
+"aaz" = (
+/obj/structure/closet/secure_closet{
+	req_access = list(150)
+	},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	frequency = 1337;
+	id_tag = "burglar_shuttle";
+	name = "airlock controller";
+	pixel_x = 23;
+	pixel_y = -8;
+	tag_door = "burglar_shuttle_hatch"
+	},
+/obj/item/storage/secure/briefcase,
+/obj/item/storage/briefcase/aluminium,
+/turf/simulated/floor/shuttle/black,
+/area/shuttle/burglar)
 "aaA" = (
 /obj/item/stool/padded,
 /turf/unsimulated/floor{
@@ -279,6 +295,43 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/merchant_station)
+"aaD" = (
+/obj/machinery/door/blast/regular/open{
+	dir = 2;
+	id = "burglar_blast";
+	name = "blast door"
+	},
+/obj/machinery/door/airlock/hatch{
+	frequency = 1337;
+	icon_state = "door_locked";
+	id_tag = "burglar_shuttle_hatch";
+	locked = 1;
+	req_access = list(150)
+	},
+/obj/machinery/button/remote/blast_door{
+	dir = 1;
+	id = "burglar_blast";
+	layer = 3;
+	name = "blast door";
+	pixel_y = -21;
+	req_access = list(150)
+	},
+/turf/simulated/floor/shuttle/black,
+/area/shuttle/burglar)
+"aaE" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	frequency = 1337;
+	id_tag = "burglar_hideout";
+	name = "hangar controller";
+	pixel_x = -1;
+	pixel_y = 26;
+	tag_door = "burglar_hideout_hatch"
+	},
+/turf/unsimulated/floor{
+	dir = 4;
+	icon_state = "ramptop"
+	},
+/area/antag/burglar)
 "aaM" = (
 /turf/template_noop,
 /area/template_noop)
@@ -18431,29 +18484,6 @@
 	icon_state = "wood"
 	},
 /area/centcom/distress_prep)
-"egD" = (
-/obj/machinery/door/blast/regular/open{
-	dir = 2;
-	id = "burglar_blast";
-	name = "blast door"
-	},
-/obj/machinery/door/airlock/hatch{
-	frequency = 1331;
-	icon_state = "door_locked";
-	id_tag = "burglar_shuttle_hatch";
-	locked = 1;
-	req_access = list(150)
-	},
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "burglar_blast";
-	layer = 3;
-	name = "blast door";
-	pixel_y = -21;
-	req_access = list(150)
-	},
-/turf/simulated/floor/shuttle/black,
-/area/shuttle/burglar)
 "eit" = (
 /obj/structure/bed/chair/office/bridge/pilot,
 /obj/structure/extinguisher_cabinet{
@@ -28039,20 +28069,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/merchant)
-"mzx" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1331;
-	id_tag = "burglar_hideout";
-	name = "hangar controller";
-	pixel_x = -1;
-	pixel_y = 26;
-	tag_door = "burglar_hideout_hatch"
-	},
-/turf/unsimulated/floor{
-	dir = 4;
-	icon_state = "ramptop"
-	},
-/area/antag/burglar)
 "mAd" = (
 /obj/machinery/door/airlock/hatch{
 	frequency = 1337;
@@ -28938,22 +28954,6 @@
 	},
 /turf/unsimulated/floor,
 /area/centcom/legion/hangar5)
-"nlb" = (
-/obj/structure/closet/secure_closet{
-	req_access = list(150)
-	},
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1331;
-	id_tag = "burglar_shuttle";
-	name = "airlock controller";
-	pixel_x = 23;
-	pixel_y = -8;
-	tag_door = "burglar_shuttle_hatch"
-	},
-/obj/item/storage/secure/briefcase,
-/obj/item/storage/briefcase/aluminium,
-/turf/simulated/floor/shuttle/black,
-/area/shuttle/burglar)
 "nlp" = (
 /obj/machinery/computer/shuttle_control{
 	req_access = list(38);
@@ -37216,7 +37216,7 @@
 	desc = "A polaroid camera. This one has 'Kismet' scribled into the casing."
 	},
 /obj/item/device/camera{
-	desc = "A polaroid camera. This one has 'Kismet' scribled into the casing."
+	desc = "A polaroid camera. This one has 'Petr' scribled into the casing."
 	},
 /obj/item/device/flashlight/lamp{
 	pixel_x = 3;
@@ -56572,7 +56572,7 @@ xVl
 xVl
 xVl
 xVl
-mzx
+aaE
 xVl
 dPn
 fkb
@@ -57852,7 +57852,7 @@ rZt
 huB
 twH
 wCa
-nlb
+aaz
 fAY
 teP
 qlg
@@ -58110,7 +58110,7 @@ lPX
 rtH
 jbu
 wLg
-egD
+aaD
 xUR
 kBQ
 ucV