From 5b0886a1502757decaf5d21a6ca528ac390cf25b Mon Sep 17 00:00:00 2001
From: Detective Google <48196179+Detective-Google@users.noreply.github.com>
Date: Mon, 22 Jun 2020 20:32:12 -0500
Subject: [PATCH] and that's all folks (for now)

---
 _maps/RandomZLevels/away_mission/Academy.dmm | 378 ++++++++++---------
 1 file changed, 194 insertions(+), 184 deletions(-)

diff --git a/_maps/RandomZLevels/away_mission/Academy.dmm b/_maps/RandomZLevels/away_mission/Academy.dmm
index f04cae9694..832e4f23fa 100644
--- a/_maps/RandomZLevels/away_mission/Academy.dmm
+++ b/_maps/RandomZLevels/away_mission/Academy.dmm
@@ -2833,6 +2833,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
+"ig" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/structure/trap/chill,
+/turf/open/floor/plasteel/cafeteria,
+/area/awaymission/academy/classrooms)
 "ih" = (
 /obj/structure/rack,
 /obj/item/stack/sheet/mineral/plasma{
@@ -3559,12 +3572,14 @@
 /area/awaymission/academy/academygate)
 "ki" = (
 /obj/item/stack/cable_coil/random,
+/obj/effect/landmark/awaystart,
 /turf/open/floor/plating,
 /area/awaymission/academy/academygate)
 "kj" = (
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/effect/landmark/awaystart,
 /turf/open/floor/plating,
 /area/awaymission/academy/academygate)
 "kk" = (
@@ -4404,17 +4419,22 @@
 	},
 /turf/open/floor/carpet,
 /area/awaymission/academy/headmaster)
-"nv" = (
-/turf/open/space/basic,
-/area/space)
-"pp" = (
-/obj/structure/chair/wood/normal{
-	dir = 1
-	},
+"nr" = (
 /obj/structure/trap/stun,
-/turf/open/floor/wood,
+/turf/open/floor/plating/asteroid/snow,
+/area/awaymission/academy/academycellar)
+"ox" = (
+/mob/living/simple_animal/hostile/wizard,
+/turf/open/floor/plating,
 /area/awaymission/academy/classrooms)
-"qr" = (
+"qF" = (
+/obj/structure/trap/fire,
+/turf/open/floor/grass,
+/area/awaymission/academy/academyaft)
+"qO" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -4425,91 +4445,81 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/structure/trap/damage,
+/mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/academy/headmaster)
-"sD" = (
+"qT" = (
+/obj/structure/trap/fire,
+/turf/open/floor/carpet,
+/area/awaymission/academy/academyaft)
+"rz" = (
+/obj/structure/trap/damage,
+/turf/open/floor/plasteel/cafeteria,
+/area/awaymission/academy/academyaft)
+"rU" = (
+/obj/structure/trap/fire,
+/turf/open/floor/plating,
+/area/awaymission/academy/classrooms)
+"sI" = (
+/obj/structure/trap/stun,
+/turf/open/floor/vault,
+/area/awaymission/academy/academyengine)
+"tH" = (
+/obj/structure/table/wood,
+/obj/item/disk/design_disk/adv/knight_gear,
+/turf/open/floor/wood,
+/area/awaymission/academy/classrooms)
+"yV" = (
+/obj/structure/chair/wood/normal{
+	dir = 1
+	},
+/obj/structure/trap/stun,
+/turf/open/floor/wood,
+/area/awaymission/academy/classrooms)
+"Ao" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/plating,
+/area/awaymission/academy/academygate)
+"Ck" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/trap/chill,
+/turf/open/floor/plasteel,
+/area/awaymission/academy/classrooms)
+"Cu" = (
+/obj/structure/trap/fire,
+/turf/open/floor/plasteel,
+/area/awaymission/academy/classrooms)
+"Dd" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/trap/damage,
+/turf/open/floor/carpet,
+/area/awaymission/academy/headmaster)
+"Di" = (
+/obj/structure/trap/stun,
+/turf/open/floor/plasteel,
+/area/awaymission/academy/academyengine)
+"Fh" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/structure/trap/damage,
 /turf/open/floor/plasteel/grimy,
 /area/awaymission/academy/classrooms)
-"ts" = (
-/obj/structure/fluff/divine/defensepylon,
-/turf/open/floor/plating,
-/area/awaymission/academy/academyengine)
-"ty" = (
-/mob/living/simple_animal/hostile/wizard,
+"Im" = (
+/obj/structure/trap/damage,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/classrooms)
-"tJ" = (
-/obj/structure/trap/damage,
-/turf/open/floor/plasteel/cafeteria,
-/area/awaymission/academy/academyaft)
-"vm" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/trap/damage,
-/turf/open/floor/carpet,
-/area/awaymission/academy/headmaster)
-"wh" = (
-/mob/living/simple_animal/hostile/wizard,
-/turf/open/floor/plasteel/dark,
-/area/awaymission/academy/headmaster)
-"wt" = (
+"Kw" = (
 /obj/structure/trap/damage,
 /turf/open/floor/wood,
 /area/awaymission/academy/classrooms)
-"ye" = (
-/obj/structure/trap/fire,
-/turf/open/floor/plating,
-/area/awaymission/academy/classrooms)
-"zv" = (
+"KR" = (
 /mob/living/simple_animal/hostile/wizard,
-/turf/open/floor/plating,
-/area/awaymission/academy/classrooms)
-"AX" = (
-/obj/structure/table/wood,
-/obj/item/disk/design_disk/adv/knight_gear,
-/turf/open/floor/wood,
-/area/awaymission/academy/classrooms)
-"BU" = (
-/obj/structure/trap/chill,
-/turf/open/floor/carpet,
-/area/awaymission/academy/classrooms)
-"Cn" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/structure/trap/chill,
-/turf/open/floor/plasteel/cafeteria,
-/area/awaymission/academy/classrooms)
-"EJ" = (
-/obj/structure/trap/chill,
-/turf/open/floor/plasteel,
-/area/awaymission/academy/classrooms)
-"Gn" = (
-/obj/structure/trap/stun,
-/turf/open/floor/vault,
-/area/awaymission/academy/academyengine)
-"Ih" = (
-/obj/structure/trap/fire,
-/turf/open/floor/carpet,
-/area/awaymission/academy/academyaft)
-"Ko" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/trap/chill,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/white,
 /area/awaymission/academy/classrooms)
 "LW" = (
 /obj/structure/cable{
@@ -4521,10 +4531,11 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/academy/academyaft)
-"NI" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
+"Mx" = (
+/obj/structure/trap/chill,
+/turf/open/floor/plasteel/grimy,
+/area/awaymission/academy/academyaft)
+"Nj" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -4535,48 +4546,30 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/mob/living/simple_animal/hostile/wizard,
+/obj/structure/trap/damage,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/academy/headmaster)
-"NR" = (
-/obj/structure/trap/fire,
-/turf/open/floor/plasteel,
-/area/awaymission/academy/classrooms)
-"Pu" = (
-/obj/structure/trap/chill,
-/turf/open/floor/plasteel/grimy,
-/area/awaymission/academy/academyaft)
-"PJ" = (
-/obj/structure/trap/fire,
-/turf/open/floor/plasteel/cafeteria,
-/area/awaymission/academy/academyaft)
-"RU" = (
-/obj/structure/trap/stun,
-/turf/open/floor/plasteel,
-/area/awaymission/academy/academyengine)
-"Ta" = (
-/obj/structure/trap/stun,
-/turf/open/floor/plating/asteroid/snow,
-/area/awaymission/academy/academycellar)
-"Tk" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/door/airlock/maintenance_hatch,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/awaymission/academy/academyaft)
-"Us" = (
-/mob/living/simple_animal/hostile/wizard,
-/turf/open/floor/plasteel/showroomfloor,
-/area/awaymission/academy/headmaster)
-"Va" = (
+"NK" = (
+/obj/effect/landmark/awaystart,
+/turf/open/floor/carpet,
+/area/awaymission/academy/academygate)
+"Oj" = (
 /obj/structure/trap/fire,
 /turf/open/floor/wood,
 /area/awaymission/academy/classrooms)
-"Vg" = (
+"Oq" = (
+/obj/structure/trap/chill,
+/turf/open/floor/wood,
+/area/awaymission/academy/classrooms)
+"Rg" = (
+/mob/living/simple_animal/hostile/wizard,
+/turf/open/floor/plasteel/showroomfloor,
+/area/awaymission/academy/headmaster)
+"RB" = (
+/mob/living/simple_animal/hostile/wizard,
+/turf/open/floor/plasteel/dark,
+/area/awaymission/academy/headmaster)
+"Sd" = (
 /obj/structure/chair/stool,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -4591,21 +4584,38 @@
 /mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/plasteel/dark,
 /area/awaymission/academy/classrooms)
-"Wk" = (
-/obj/structure/trap/fire,
-/turf/open/floor/grass,
-/area/awaymission/academy/academyaft)
-"WZ" = (
-/mob/living/simple_animal/hostile/wizard,
-/turf/open/floor/plasteel/white,
-/area/awaymission/academy/classrooms)
-"Xz" = (
-/obj/structure/trap/damage,
+"Sz" = (
+/obj/structure/trap/chill,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/classrooms)
-"XT" = (
+"Tk" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/maintenance_hatch,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/awaymission/academy/academyaft)
+"Va" = (
+/mob/living/simple_animal/hostile/wizard,
+/turf/open/floor/plasteel,
+/area/awaymission/academy/classrooms)
+"Wy" = (
+/obj/structure/fluff/divine/defensepylon,
+/turf/open/floor/plating,
+/area/awaymission/academy/academyengine)
+"WZ" = (
+/turf/open/space/basic,
+/area/space)
+"XX" = (
+/obj/structure/trap/fire,
+/turf/open/floor/plasteel/cafeteria,
+/area/awaymission/academy/academyaft)
+"YK" = (
 /obj/structure/trap/chill,
-/turf/open/floor/wood,
+/turf/open/floor/carpet,
 /area/awaymission/academy/classrooms)
 
 (1,1,1) = {"
@@ -6464,7 +6474,7 @@ aa
 aa
 aa
 aa
-nv
+WZ
 ac
 aa
 aa
@@ -6807,7 +6817,7 @@ mN
 mN
 mN
 mN
-Ta
+nr
 mN
 mN
 mD
@@ -10388,7 +10398,7 @@ ea
 es
 bB
 bB
-ye
+rU
 bB
 es
 ea
@@ -10776,7 +10786,7 @@ de
 bE
 eb
 et
-EJ
+Sz
 eK
 eT
 bz
@@ -10893,7 +10903,7 @@ bv
 bB
 bB
 cj
-zv
+ox
 bB
 bB
 bB
@@ -11048,7 +11058,7 @@ ga
 ga
 ga
 ga
-Ko
+Ck
 ga
 gZ
 hc
@@ -11155,14 +11165,14 @@ bB
 bB
 bB
 bB
-zv
+ox
 cO
 cZ
 bz
 bz
 cY
 bz
-NR
+Cu
 dT
 ee
 ee
@@ -11942,7 +11952,7 @@ df
 ds
 dc
 dc
-Va
+Oj
 dV
 ej
 ej
@@ -12085,7 +12095,7 @@ fz
 es
 dc
 gd
-AX
+tH
 ds
 gd
 df
@@ -12328,7 +12338,7 @@ bZ
 fR
 cQ
 dc
-XT
+Oq
 dc
 dc
 dc
@@ -12359,7 +12369,7 @@ fD
 im
 il
 iw
-tJ
+rz
 il
 il
 iw
@@ -12457,9 +12467,9 @@ bZ
 bZ
 cK
 cQ
-wt
+Kw
 dg
-pp
+yV
 df
 ds
 dc
@@ -12588,7 +12598,7 @@ cC
 cC
 cR
 dd
-Va
+Oj
 dc
 dc
 dc
@@ -12609,7 +12619,7 @@ dc
 dc
 dc
 dc
-wt
+Kw
 dc
 fD
 ho
@@ -13009,7 +13019,7 @@ ii
 ii
 ii
 ii
-Wk
+qF
 ii
 ii
 ii
@@ -13024,7 +13034,7 @@ fF
 jG
 gF
 fN
-Pu
+Mx
 hc
 jT
 jV
@@ -13033,10 +13043,10 @@ jY
 jW
 jW
 ki
-kf
-kf
-kf
-jW
+Ao
+Ao
+Ao
+NK
 kx
 jS
 mE
@@ -13166,7 +13176,7 @@ kj
 km
 kp
 ks
-kf
+Ao
 kf
 ky
 kf
@@ -13292,11 +13302,11 @@ jV
 jY
 kc
 jW
-kf
+Ao
 kn
 kI
 kt
-kf
+Ao
 kf
 ky
 mF
@@ -13374,7 +13384,7 @@ ah
 ah
 ah
 ah
-BU
+YK
 ej
 el
 eN
@@ -13422,11 +13432,11 @@ jV
 jY
 kc
 jW
-kf
+Ao
 ko
 kr
 ku
-kf
+Ao
 kf
 ky
 kf
@@ -13486,7 +13496,7 @@ ap
 ba
 bh
 bk
-vm
+Dd
 bq
 ap
 ap
@@ -13552,11 +13562,11 @@ jW
 ka
 kc
 kf
-kf
-kf
-kf
-kf
-kf
+Ao
+Ao
+Ao
+Ao
+Ao
 kf
 ky
 mG
@@ -13642,7 +13652,7 @@ eV
 fe
 ej
 el
-Ih
+qT
 fF
 fF
 fF
@@ -13670,7 +13680,7 @@ fF
 fD
 jr
 jy
-Ih
+qT
 jH
 fF
 fN
@@ -14029,7 +14039,7 @@ ej
 ej
 eP
 ej
-sD
+Fh
 ej
 ej
 bE
@@ -14272,9 +14282,9 @@ aa
 ab
 bM
 cd
-qr
+Nj
 cd
-NI
+qO
 cd
 cT
 as
@@ -14311,7 +14321,7 @@ il
 iz
 il
 il
-PJ
+XX
 iz
 il
 fD
@@ -14428,7 +14438,7 @@ gm
 fP
 fP
 gI
-Vg
+Sd
 gJ
 gO
 fD
@@ -14531,7 +14541,7 @@ aP
 aP
 ab
 bO
-wh
+RB
 cl
 cd
 cl
@@ -15053,18 +15063,18 @@ ab
 bT
 bT
 bT
-Us
+Rg
 bT
 cg
 bT
 as
 di
 bz
-ty
+Va
 bz
 bz
 bz
-Xz
+Im
 ex
 eD
 eD
@@ -15841,12 +15851,12 @@ bs
 dm
 dm
 dm
-WZ
+KR
 dR
 dZ
 dZ
 ey
-Cn
+ig
 eI
 eI
 fm
@@ -16929,7 +16939,7 @@ aG
 aG
 mc
 me
-ts
+Wy
 me
 lv
 mm
@@ -17060,7 +17070,7 @@ aG
 mc
 mf
 me
-ts
+Wy
 lv
 mm
 mm
@@ -18359,7 +18369,7 @@ aa
 aG
 md
 mg
-Gn
+sI
 lt
 lt
 md
@@ -18883,7 +18893,7 @@ aG
 aG
 aG
 mc
-RU
+Di
 lJ
 mu
 mu