From 46805bc872ab4b452caa58f687530b70e0a3df60 Mon Sep 17 00:00:00 2001
From: Detective Google <48196179+Detective-Google@users.noreply.github.com>
Date: Mon, 22 Jun 2020 20:11:18 -0500
Subject: [PATCH] more progress

---
 _maps/RandomZLevels/away_mission/caves.dmm    |  56 +-
 .../RandomZLevels/away_mission/challenge.dmm  | 587 +++++++-----------
 _maps/RandomZLevels/away_mission/research.dmm | 119 ++--
 3 files changed, 312 insertions(+), 450 deletions(-)

diff --git a/_maps/RandomZLevels/away_mission/caves.dmm b/_maps/RandomZLevels/away_mission/caves.dmm
index db6b1455b3..159559d0af 100644
--- a/_maps/RandomZLevels/away_mission/caves.dmm
+++ b/_maps/RandomZLevels/away_mission/caves.dmm
@@ -1708,6 +1708,9 @@
 /obj/machinery/gateway{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/awaymission/caves/listeningpost)
 "fl" = (
@@ -2038,6 +2041,9 @@
 /obj/machinery/gateway{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/awaymission/caves/listeningpost)
 "gl" = (
@@ -2275,32 +2281,26 @@
 /obj/effect/baseturf_helper/asteroid/basalt,
 /turf/closed/wall,
 /area/awaymission/caves/northblock)
-"mT" = (
+"tk" = (
+/obj/machinery/gateway{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
+"CY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
+"GV" = (
 /obj/structure/barricade/wooden,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
 /area/awaymission/caves/listeningpost)
-"zX" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/caves/listeningpost)
-"AD" = (
-/obj/machinery/gateway{
-	dir = 10
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/caves/listeningpost)
-"Nt" = (
-/obj/machinery/gateway{
-	dir = 6
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/caves/listeningpost)
-"Tk" = (
+"Hp" = (
 /obj/machinery/gateway,
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -2310,6 +2310,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/awaymission/caves/listeningpost)
+"If" = (
+/obj/machinery/gateway{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/awaymission/caves/listeningpost)
 
 (1,1,1) = {"
 aa
@@ -10726,7 +10732,7 @@ bM
 eF
 el
 fk
-AD
+If
 eJ
 eF
 ey
@@ -10983,9 +10989,9 @@ bM
 eG
 eB
 fw
-Tk
-zX
-mT
+Hp
+CY
+GV
 ez
 eO
 eJ
@@ -11240,7 +11246,7 @@ bM
 eG
 eE
 gk
-Nt
+tk
 eJ
 eG
 eA
diff --git a/_maps/RandomZLevels/away_mission/challenge.dmm b/_maps/RandomZLevels/away_mission/challenge.dmm
index bf164cb4fa..91b209ae9b 100644
--- a/_maps/RandomZLevels/away_mission/challenge.dmm
+++ b/_maps/RandomZLevels/away_mission/challenge.dmm
@@ -7,125 +7,81 @@
 	icon_state = "iron0"
 	},
 /area/awaymission/challenge/start)
-"ac" = (
-/obj/structure/girder,
-/turf/open/floor/plating/airless,
-/area/awaymission/challenge/start)
-"ad" = (
-/turf/open/floor/plating,
-/area/awaymission/challenge/start)
-"ae" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged5"
-	},
-/area/awaymission/challenge/start)
-"af" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
-/area/awaymission/challenge/start)
 "ag" = (
 /obj/item/clothing/suit/space/syndicate/blue,
 /obj/item/clothing/head/helmet/space/syndicate/blue,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
-/area/awaymission/challenge/start)
-"ah" = (
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ai" = (
 /obj/item/flashlight{
 	icon_state = "flashlight-on";
 	on = 1
 	},
-/turf/open/floor/plasteel/airless,
-/area/awaymission/challenge/start)
-"aj" = (
-/obj/effect/landmark/awaystart,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged3"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ak" = (
 /obj/effect/decal/remains/human,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged4"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "al" = (
 /obj/effect/landmark/awaystart,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "am" = (
 /obj/item/clothing/suit/space/syndicate/green,
 /obj/item/clothing/head/helmet/space/syndicate/green,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
-/area/awaymission/challenge/start)
-"an" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged3"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ao" = (
 /obj/item/clothing/suit/space/syndicate/orange,
 /obj/item/clothing/head/helmet/space/syndicate/orange,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ap" = (
 /obj/item/gun/energy/laser/retro,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "aq" = (
 /obj/item/stack/rods,
-/turf/open/floor/plasteel,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ar" = (
 /obj/effect/decal/cleanable/oil,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "as" = (
 /obj/effect/decal/remains/robot,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "at" = (
 /obj/structure/girder,
-/turf/open/floor/plating,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "au" = (
-/turf/closed/wall,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "av" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged4"
-	},
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "aw" = (
 /obj/item/stack/rods,
 /obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ax" = (
 /obj/effect/decal/cleanable/oil,
 /mob/living/simple_animal/hostile/syndicate,
-/turf/open/floor/plating,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "ay" = (
 /obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "az" = (
 /obj/item/clothing/suit/space/syndicate/black,
 /obj/item/clothing/head/helmet/space/syndicate/black,
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
-	},
+/turf/open/floor/carpet,
 /area/awaymission/challenge/start)
 "aA" = (
 /turf/closed/indestructible{
@@ -133,16 +89,18 @@
 	},
 /area/awaymission/challenge/main)
 "aB" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/awaymission/challenge/main)
+/obj/machinery/power/smes/magical,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/airless,
+/area/awaymission/challenge/start)
 "aC" = (
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "aD" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged3"
-	},
+/obj/structure/fans/tiny,
+/turf/open/floor/carpet,
 /area/awaymission/challenge/main)
 "aE" = (
 /turf/closed/wall,
@@ -151,16 +109,23 @@
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "aG" = (
-/turf/open/floor/plasteel/airless{
-	icon_state = "damaged2"
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/area/awaymission/challenge/main)
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/airless,
+/area/awaymission/challenge/start)
 "aH" = (
 /turf/open/floor/plasteel/airless,
 /area/awaymission/challenge/main)
 "aI" = (
 /obj/machinery/power/emitter/ctf{
-	dir = 2
+	active = 0
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
@@ -191,7 +156,7 @@
 "aO" = (
 /obj/structure/window/reinforced,
 /obj/machinery/power/emitter/ctf{
-	dir = 2
+	active = 0
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
@@ -210,6 +175,7 @@
 /area/awaymission/challenge/main)
 "aS" = (
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
@@ -234,6 +200,7 @@
 /area/awaymission/challenge/main)
 "aW" = (
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
@@ -294,15 +261,16 @@
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bf" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bg" = (
@@ -321,15 +289,16 @@
 /turf/open/floor/plasteel,
 /area/awaymission/challenge/main)
 "bi" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bj" = (
@@ -337,22 +306,24 @@
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bk" = (
+/obj/machinery/light,
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 1
 	},
-/obj/machinery/light,
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bl" = (
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bm" = (
@@ -363,15 +334,15 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/awaymission/challenge/main)
 "bo" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 2
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0
+	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bp" = (
@@ -420,9 +391,7 @@
 /area/awaymission/challenge/main)
 "bv" = (
 /obj/structure/window/reinforced,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
 "bw" = (
@@ -435,15 +404,6 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/challenge/main)
-"bx" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/awaymission/challenge/main)
 "by" = (
 /obj/machinery/light{
 	dir = 8
@@ -474,6 +434,7 @@
 	dir = 8
 	},
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
@@ -483,6 +444,7 @@
 	dir = 4
 	},
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
@@ -492,14 +454,10 @@
 /turf/open/floor/plasteel/airless,
 /area/awaymission/challenge/main)
 "bF" = (
-/turf/open/floor/plasteel/white/corner{
-	dir = 2
-	},
+/turf/open/floor/plasteel/white/corner,
 /area/awaymission/challenge/main)
 "bG" = (
-/turf/open/floor/plasteel/white/side{
-	dir = 2
-	},
+/turf/open/floor/plasteel/white/side,
 /area/awaymission/challenge/main)
 "bH" = (
 /turf/open/floor/plasteel/white/corner{
@@ -531,36 +489,40 @@
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bL" = (
-/obj/machinery/power/emitter/ctf{
+/obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/structure/window/reinforced{
+/obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 1
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bM" = (
 /obj/machinery/power/emitter/ctf{
+	active = 0;
 	dir = 1
 	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bN" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bO" = (
-/obj/machinery/power/emitter/ctf{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/machinery/power/emitter/ctf{
+	active = 0;
+	dir = 1
+	},
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bP" = (
@@ -570,9 +532,7 @@
 /area/awaymission/challenge/end)
 "bQ" = (
 /obj/item/gun/ballistic/revolver/russian,
-/turf/open/floor/plasteel/white/side{
-	dir = 2
-	},
+/turf/open/floor/plasteel/white/side,
 /area/awaymission/challenge/main)
 "bR" = (
 /obj/structure/table/reinforced,
@@ -602,9 +562,7 @@
 /turf/open/floor/plating/airless,
 /area/awaymission/challenge/main)
 "bU" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plasteel/white,
 /area/awaymission/challenge/main)
 "bV" = (
@@ -644,7 +602,7 @@
 	dir = 1
 	},
 /obj/structure/rack,
-/obj/item/clothing/suit/armor/heavy,
+/obj/item/clothing/suit/armor/vest/russian,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cb" = (
@@ -670,7 +628,6 @@
 "cf" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Airlock";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plating,
@@ -701,7 +658,7 @@
 /area/awaymission/challenge/end)
 "ck" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/gun/ballistic/revolver/doublebarrel/improvised,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cl" = (
@@ -758,7 +715,7 @@
 /area/awaymission/challenge/end)
 "ct" = (
 /obj/structure/rack,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced,
+/obj/item/gun/ballistic/revolver/detective,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cu" = (
@@ -773,13 +730,12 @@
 /area/awaymission/challenge/end)
 "cw" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/l6_saw,
+/obj/item/gun/ballistic/revolver/doublebarrel,
 /turf/open/floor/wood,
 /area/awaymission/challenge/end)
 "cx" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Security";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plasteel/dark,
@@ -807,7 +763,6 @@
 "cB" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Administrator";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plasteel/dark,
@@ -903,150 +858,85 @@
 /turf/open/floor/plating,
 /area/awaymission/challenge/end)
 "cR" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/closed/indestructible{
+	icon_state = "iron0"
+	},
+/area/awaymission/challenge/start)
+"cS" = (
 /obj/machinery/gateway{
 	dir = 9
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
-"cS" = (
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"cT" = (
 /obj/machinery/gateway{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
-"cT" = (
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"cV" = (
 /obj/machinery/gateway{
 	dir = 5
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
-"cV" = (
-/obj/machinery/gateway{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "cW" = (
-/obj/machinery/gateway/centeraway{
-	calibrated = 0
-	},
+/obj/item/clothing/suit/space/hardsuit/shielded/syndi,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/documents/syndicate,
+/obj/structure/safe,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "cX" = (
 /obj/machinery/gateway{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "cY" = (
+/obj/machinery/gateway/centeraway{
+	calibrated = 0
+	},
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"cZ" = (
+/obj/machinery/gateway{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
+"da" = (
 /obj/machinery/gateway{
 	dir = 10
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
-"cZ" = (
-/obj/machinery/gateway,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
-"da" = (
-/obj/machinery/gateway{
-	dir = 6
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "db" = (
 /obj/structure/window/reinforced,
 /turf/open/floor/circuit,
 /area/awaymission/challenge/end)
 "dc" = (
+/obj/machinery/gateway,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "dd" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -1077,16 +967,6 @@
 /area/awaymission/challenge/end)
 "di" = (
 /obj/structure/table,
-/obj/item/implanter/explosive,
-/obj/item/implanter/explosive{
-	pixel_y = 4
-	},
-/obj/item/implanter/explosive{
-	pixel_y = 8
-	},
-/obj/item/implanter/explosive{
-	pixel_y = 12
-	},
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "dj" = (
@@ -1099,7 +979,6 @@
 "dk" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Gateway Access";
-	opacity = 1;
 	req_access_txt = "109"
 	},
 /turf/open/floor/plasteel/dark,
@@ -1111,23 +990,20 @@
 /turf/open/floor/plating,
 /area/awaymission/challenge/end)
 "dm" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /mob/living/simple_animal/hostile/syndicate{
 	name = "Syndicate Technician"
 	},
 /turf/open/floor/plasteel/dark,
 /area/awaymission/challenge/end)
 "dn" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/gateway{
+	dir = 6
 	},
-/turf/open/floor/plasteel/dark,
-/area/awaymission/challenge/end)
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "do" = (
 /obj/machinery/light,
 /turf/open/floor/circuit,
@@ -1137,17 +1013,8 @@
 /turf/open/floor/circuit,
 /area/awaymission/challenge/end)
 "dq" = (
-/obj/structure/cable,
-/obj/machinery/power/smes/magical,
-/turf/open/floor/circuit,
-/area/awaymission/challenge/end)
-"dr" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/circuit,
-/area/awaymission/challenge/end)
+/turf/open/floor/bluespace,
+/area/awaymission/challenge/start)
 "ds" = (
 /obj/structure/closet/l3closet,
 /turf/open/floor/circuit,
@@ -27984,11 +27851,11 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
+ab
+ab
+ab
+ab
+ab
 ab
 ab
 ab
@@ -28239,20 +28106,20 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-ac
-af
-an
-ah
-ad
-an
+ab
+ab
+cS
+cX
+da
+ab
+ab
+at
+au
+au
+au
+au
+au
 ax
 aA
 aF
@@ -28496,21 +28363,21 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-ad
-aj
-an
+aB
+ab
+cT
+cY
+dc
+dq
+dq
+au
+al
+au
 ao
-af
-an
-av
+au
+au
+au
 aA
 aA
 aA
@@ -28753,23 +28620,23 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-ae
+aG
+cR
+cV
+cZ
+dn
+ab
+ab
+au
 ak
 al
-af
-ad
+au
+au
 aw
-av
-aB
-aC
+au
+aE
+aH
 aJ
 aR
 aH
@@ -29010,23 +28877,23 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
 ab
-af
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+au
 al
-ah
-af
+au
+au
 at
-af
-an
-aC
-aG
+au
+au
+aD
+aH
 aK
 aR
 aH
@@ -29072,9 +28939,9 @@ cd
 cn
 cH
 cN
-cR
-cV
-cY
+co
+co
+co
 db
 dg
 cd
@@ -29276,14 +29143,14 @@ aa
 aa
 ab
 ag
-ah
+au
 al
 ap
 au
-af
+au
 ay
 aD
-aC
+aH
 aL
 aR
 aH
@@ -29329,14 +29196,14 @@ cd
 cn
 cH
 cN
-cS
+co
 cW
-cZ
-dc
-dc
-dc
+co
+cd
+cd
+cd
 dm
-dq
+cn
 bP
 aa
 aa
@@ -29532,12 +29399,12 @@ aa
 aa
 aa
 ab
-ah
+au
 al
-ah
+au
 aq
 at
-an
+au
 az
 aE
 aH
@@ -29586,14 +29453,14 @@ cd
 cn
 cH
 cN
-cT
-cX
-da
+co
+co
+co
 db
 dh
 cd
-dn
-dr
+cd
+cn
 bP
 aa
 aa
@@ -29790,12 +29657,12 @@ aa
 aa
 ab
 ai
-ah
+au
 al
 ar
-af
-av
-ad
+au
+au
+au
 aA
 aA
 aA
@@ -30046,13 +29913,13 @@ aa
 aa
 aa
 ab
-ah
+au
 am
-ad
+au
 as
 av
-ae
-av
+au
+au
 aA
 aF
 aN
@@ -31102,7 +30969,7 @@ aV
 aV
 aV
 aV
-bx
+bC
 aV
 aV
 aV
diff --git a/_maps/RandomZLevels/away_mission/research.dmm b/_maps/RandomZLevels/away_mission/research.dmm
index c07499fb57..4365847a92 100644
--- a/_maps/RandomZLevels/away_mission/research.dmm
+++ b/_maps/RandomZLevels/away_mission/research.dmm
@@ -919,7 +919,6 @@
 /area/awaymission/research/interior/gateway)
 "ck" = (
 /obj/machinery/door/window/eastright{
-	icon_state = "right";
 	dir = 2
 	},
 /obj/effect/landmark/awaystart,
@@ -1363,16 +1362,6 @@
 "dc" = (
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
-"dd" = (
-/obj/structure/closet/crate,
-/obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
-	read_only = 1
-	},
-/obj/item/firing_pin/dna,
-/turf/open/floor/plasteel/dark,
-/area/awaymission/research/interior/secure)
 "de" = (
 /obj/structure/filingcabinet,
 /obj/structure/filingcabinet,
@@ -1391,8 +1380,8 @@
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
-/obj/item/dnainjector/xraymut,
-/obj/item/dnainjector/xraymut,
+/obj/item/dnainjector/glow,
+/obj/item/storage/toolbox/syndicate,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "dg" = (
@@ -1481,18 +1470,6 @@
 "do" = (
 /turf/closed/wall/r_wall,
 /area/awaymission/research/interior/security)
-"dp" = (
-/obj/structure/closet/crate,
-/obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
-	read_only = 1
-	},
-/obj/item/dnainjector/telemut,
-/obj/item/dnainjector/telemut,
-/obj/item/dnainjector/chavmut,
-/turf/open/floor/plasteel/dark,
-/area/awaymission/research/interior/secure)
 "dq" = (
 /obj/machinery/light{
 	dir = 8
@@ -1743,8 +1720,6 @@
 "dJ" = (
 /obj/structure/rack,
 /obj/item/clothing/suit/armor/bulletproof,
-/obj/item/clothing/suit/armor/bulletproof,
-/obj/item/clothing/head/helmet/alt,
 /obj/item/clothing/head/helmet/alt,
 /obj/machinery/light/small{
 	dir = 4
@@ -1769,19 +1744,19 @@
 /area/awaymission/research/interior/secure)
 "dL" = (
 /obj/structure/closet/crate,
-/obj/item/disk/data{
-	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastily written over it.";
-	fields = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+");
-	name = "old genetics data disk"
-	},
 /obj/item/disk/data{
 	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
-/obj/item/firing_pin/dna,
-/obj/item/dnainjector/dwarf,
-/obj/item/dnainjector/dwarf,
+/obj/item/disk/data{
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
+	read_only = 1
+	},
+/obj/item/dnainjector/insulated,
+/obj/item/gun/energy/disabler,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "dM" = (
@@ -1792,11 +1767,13 @@
 	read_only = 1
 	},
 /obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
 	read_only = 1
 	},
-/obj/item/dnainjector/chameleonmut,
+/obj/item/dnainjector/glow,
+/obj/item/storage/toolbox/syndicate,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "dN" = (
@@ -1890,7 +1867,6 @@
 "dU" = (
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/wt550,
-/obj/item/gun/ballistic/automatic/wt550,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/effect/turf_decal/tile/red{
@@ -2070,7 +2046,6 @@
 "ep" = (
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/pistol/m1911,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
 /obj/item/ammo_box/magazine/m45,
 /obj/item/ammo_box/magazine/m45,
 /obj/effect/turf_decal/tile/red{
@@ -3071,7 +3046,6 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/airlock/highsecurity{
-	aiDisabledIdScanner = 0;
 	name = "Vault Storage";
 	req_access_txt = "36"
 	},
@@ -3914,7 +3888,6 @@
 /area/awaymission/research/interior/cryo)
 "hw" = (
 /obj/machinery/computer/arcade{
-	icon_state = "arcade";
 	dir = 8
 	},
 /turf/open/floor/plasteel/yellowsiding{
@@ -4126,20 +4099,22 @@
 /area/awaymission/research/interior/security)
 "hS" = (
 /obj/structure/closet/crate,
+/obj/item/clothing/head/collectable/petehat{
+	name = "dusty hat"
+	},
 /obj/item/disk/data{
 	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
 /obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines. This one has the initials 'C.P' marked on the front. ";
-	name = "encrypted genetic data disk";
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
 	read_only = 1
 	},
-/obj/item/clothing/head/collectable/petehat{
-	name = "dusty hat"
-	},
-/obj/item/firing_pin/dna,
+/obj/item/dnainjector/gigantism,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "hT" = (
@@ -4150,12 +4125,13 @@
 	read_only = 1
 	},
 /obj/item/disk/data{
-	desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines.";
-	name = "encrypted genetic data disk";
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
 	read_only = 1
 	},
-/obj/item/firing_pin/dna,
-/obj/item/dnainjector/hulkmut,
+/obj/item/dnainjector/antenna,
+/obj/item/clothing/suit/armor/vest,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "hU" = (
@@ -4296,10 +4272,14 @@
 	name = "encrypted genetic data disk";
 	read_only = 1
 	},
-/obj/item/firing_pin/dna/dredd,
-/obj/item/firing_pin/dna/dredd,
-/obj/item/dnainjector/lasereyesmut,
-/obj/item/dnainjector/lasereyesmut,
+/obj/item/disk/data{
+	desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off.";
+	fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+");
+	name = "dusty genetics data disk";
+	read_only = 1
+	},
+/obj/item/dnainjector/gigantism,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
 "im" = (
@@ -4603,7 +4583,6 @@
 /area/awaymission/research/interior/bathroom)
 "iN" = (
 /obj/machinery/shower{
-	icon_state = "shower";
 	dir = 8
 	},
 /turf/open/floor/plasteel/freezer,
@@ -6335,7 +6314,7 @@
 /area/space/nearstation)
 "nb" = (
 /obj/structure/table/wood,
-/obj/item/book/granter/spell/random,
+/obj/item/book/granter/spell/smoke,
 /turf/open/floor/mineral/plasma,
 /area/space/nearstation)
 "nc" = (
@@ -6460,6 +6439,11 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
+"II" = (
+/obj/structure/table/wood,
+/obj/item/book/granter/crafting_recipe/bone_bow,
+/turf/open/floor/mineral/plasma,
+/area/space/nearstation)
 "Km" = (
 /obj/machinery/door/airlock/security/glass{
 	id_tag = "outerbrig";
@@ -6532,6 +6516,11 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/research/interior/escapepods)
+"TO" = (
+/obj/structure/table/wood,
+/obj/item/book/granter/action/origami,
+/turf/open/floor/mineral/plasma,
+/area/space/nearstation)
 "Uu" = (
 /obj/machinery/door/airlock/security/glass{
 	id_tag = "outerbrig";
@@ -11121,8 +11110,8 @@ ab
 ab
 na
 nb
-nb
-nb
+II
+TO
 na
 ab
 ab
@@ -31113,8 +31102,8 @@ ad
 ad
 ad
 cQ
-dd
-dp
+dL
+dL
 dL
 cQ
 dc
@@ -31126,7 +31115,7 @@ cQ
 dc
 cQ
 hS
-dM
+il
 il
 cQ
 ad
@@ -32399,7 +32388,7 @@ ad
 ad
 cQ
 df
-dd
+dM
 dM
 cQ
 dc
@@ -32412,7 +32401,7 @@ dc
 cQ
 hT
 hT
-dd
+hT
 cQ
 ad
 ad