From dc8151938099b7504767d725b23665f1d4f65994 Mon Sep 17 00:00:00 2001
From: Detective Google <48196179+Detective-Google@users.noreply.github.com>
Date: Mon, 22 Jun 2020 19:29:01 -0500
Subject: [PATCH] whoops me forget to hit save first

---
 _maps/RandomZLevels/away_mission/Academy.dmm | 297 ++++++++++++++++---
 1 file changed, 250 insertions(+), 47 deletions(-)

diff --git a/_maps/RandomZLevels/away_mission/Academy.dmm b/_maps/RandomZLevels/away_mission/Academy.dmm
index db3bb41746..f04cae9694 100644
--- a/_maps/RandomZLevels/away_mission/Academy.dmm
+++ b/_maps/RandomZLevels/away_mission/Academy.dmm
@@ -42,6 +42,7 @@
 /obj/structure/chair/office/light{
 	dir = 1
 	},
+/mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/carpet,
 /area/awaymission/academy/headmaster)
 "aj" = (
@@ -162,6 +163,7 @@
 "aB" = (
 /obj/structure/bed,
 /obj/item/bedsheet/purple,
+/mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/wood,
 /area/awaymission/academy/headmaster)
 "aC" = (
@@ -261,6 +263,7 @@
 /area/awaymission/academy/headmaster)
 "aV" = (
 /obj/structure/chair/office/dark,
+/mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/carpet,
 /area/awaymission/academy/headmaster)
 "aW" = (
@@ -317,6 +320,7 @@
 /area/awaymission/academy/headmaster)
 "bg" = (
 /obj/structure/table/wood,
+/obj/item/flashlight/flashdark,
 /turf/open/floor/carpet,
 /area/awaymission/academy/headmaster)
 "bh" = (
@@ -350,6 +354,7 @@
 /obj/structure/chair/office/dark{
 	dir = 1
 	},
+/mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/carpet,
 /area/awaymission/academy/headmaster)
 "bm" = (
@@ -701,6 +706,7 @@
 /turf/open/floor/plating,
 /area/awaymission/academy/headmaster)
 "cw" = (
+/obj/structure/trap/chill,
 /turf/open/floor/plating,
 /area/awaymission/academy/headmaster)
 "cx" = (
@@ -714,6 +720,7 @@
 /area/awaymission/academy/headmaster)
 "cy" = (
 /obj/structure/table,
+/obj/item/disk/design_disk/adv/cleric_mace,
 /turf/open/floor/plasteel/showroomfloor,
 /area/awaymission/academy/headmaster)
 "cz" = (
@@ -1935,6 +1942,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/trap/damage,
 /turf/open/floor/plasteel/white/side{
 	dir = 1
 	},
@@ -2349,6 +2357,7 @@
 /area/awaymission/academy/classrooms)
 "gM" = (
 /obj/item/toy/beach_ball/holoball,
+/obj/structure/trap/stun,
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "gN" = (
@@ -2635,6 +2644,7 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/trap/damage,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "hD" = (
@@ -3198,6 +3208,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "jk" = (
@@ -3223,6 +3234,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/mob/living/simple_animal/hostile/wizard,
 /turf/open/floor/plasteel/airless/white{
 	dir = 4
 	},
@@ -3828,7 +3840,7 @@
 /area/awaymission/academy/academycellar)
 "lg" = (
 /obj/structure/table/wood,
-/obj/item/guardiancreator/choose,
+/obj/item/nullrod/staff,
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academycellar)
 "lh" = (
@@ -4346,10 +4358,18 @@
 	},
 /area/awaymission/academy/headmaster)
 "ng" = (
-/turf/open/space/basic,
-/area/space)
+/obj/structure/trap/stun,
+/turf/open/floor/engine/cult,
+/area/awaymission/academy/academycellar)
 "nh" = (
-/obj/structure/fluff/divine/defensepylon,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/trap/chill,
+/turf/open/floor/carpet,
+/area/awaymission/academy/headmaster)
+"ni" = (
+/obj/structure/trap/stun,
 /turf/open/floor/plating,
 /area/awaymission/academy/academyengine)
 "nj" = (
@@ -4384,6 +4404,113 @@
 	},
 /turf/open/floor/carpet,
 /area/awaymission/academy/headmaster)
+"nv" = (
+/turf/open/space/basic,
+/area/space)
+"pp" = (
+/obj/structure/chair/wood/normal{
+	dir = 1
+	},
+/obj/structure/trap/stun,
+/turf/open/floor/wood,
+/area/awaymission/academy/classrooms)
+"qr" = (
+/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
+	},
+/obj/structure/trap/damage,
+/turf/open/floor/plasteel/dark,
+/area/awaymission/academy/headmaster)
+"sD" = (
+/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,
+/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" = (
+/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" = (
+/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,
+/area/awaymission/academy/classrooms)
 "LW" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4394,6 +4521,43 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/academy/academyaft)
+"NI" = (
+/obj/structure/cable{
+	icon_state = "4-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
+	},
+/mob/living/simple_animal/hostile/wizard,
+/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"
@@ -4404,6 +4568,45 @@
 	},
 /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" = (
+/obj/structure/trap/fire,
+/turf/open/floor/wood,
+/area/awaymission/academy/classrooms)
+"Vg" = (
+/obj/structure/chair/stool,
+/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
+	},
+/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,
+/turf/open/floor/plasteel,
+/area/awaymission/academy/classrooms)
+"XT" = (
+/obj/structure/trap/chill,
+/turf/open/floor/wood,
+/area/awaymission/academy/classrooms)
 
 (1,1,1) = {"
 aa
@@ -6261,7 +6464,7 @@ aa
 aa
 aa
 aa
-ng
+nv
 ac
 aa
 aa
@@ -6604,7 +6807,7 @@ mN
 mN
 mN
 mN
-mN
+Ta
 mN
 mN
 mD
@@ -10185,7 +10388,7 @@ ea
 es
 bB
 bB
-bB
+ye
 bB
 es
 ea
@@ -10573,7 +10776,7 @@ de
 bE
 eb
 et
-bz
+EJ
 eK
 eT
 bz
@@ -10690,7 +10893,7 @@ bv
 bB
 bB
 cj
-bB
+zv
 bB
 bB
 bB
@@ -10845,7 +11048,7 @@ ga
 ga
 ga
 ga
-ga
+Ko
 ga
 gZ
 hc
@@ -10952,14 +11155,14 @@ bB
 bB
 bB
 bB
-bB
+zv
 cO
 cZ
 bz
 bz
 cY
 bz
-bz
+NR
 dT
 ee
 ee
@@ -11739,7 +11942,7 @@ df
 ds
 dc
 dc
-dc
+Va
 dV
 ej
 ej
@@ -11882,7 +12085,7 @@ fz
 es
 dc
 gd
-df
+AX
 ds
 gd
 df
@@ -12125,7 +12328,7 @@ bZ
 fR
 cQ
 dc
-dc
+XT
 dc
 dc
 dc
@@ -12156,7 +12359,7 @@ fD
 im
 il
 iw
-il
+tJ
 il
 il
 iw
@@ -12254,9 +12457,9 @@ bZ
 bZ
 cK
 cQ
-dc
+wt
 dg
-ds
+pp
 df
 ds
 dc
@@ -12385,7 +12588,7 @@ cC
 cC
 cR
 dd
-dc
+Va
 dc
 dc
 dc
@@ -12406,7 +12609,7 @@ dc
 dc
 dc
 dc
-dc
+wt
 dc
 fD
 ho
@@ -12806,7 +13009,7 @@ ii
 ii
 ii
 ii
-ii
+Wk
 ii
 ii
 ii
@@ -12821,7 +13024,7 @@ fF
 jG
 gF
 fN
-fN
+Pu
 hc
 jT
 jV
@@ -13015,7 +13218,7 @@ aE
 aJ
 as
 ah
-ah
+cI
 aQ
 cI
 ah
@@ -13138,7 +13341,7 @@ aa
 kF
 ae
 ah
-al
+nh
 at
 az
 aF
@@ -13171,7 +13374,7 @@ ah
 ah
 ah
 ah
-el
+BU
 ej
 el
 eN
@@ -13283,7 +13486,7 @@ ap
 ba
 bh
 bk
-ap
+vm
 bq
 ap
 ap
@@ -13439,7 +13642,7 @@ eV
 fe
 ej
 el
-fF
+Ih
 fF
 fF
 fF
@@ -13467,7 +13670,7 @@ fF
 fD
 jr
 jy
-fF
+Ih
 jH
 fF
 fN
@@ -13826,7 +14029,7 @@ ej
 ej
 eP
 ej
-fg
+sD
 ej
 ej
 bE
@@ -14069,9 +14272,9 @@ aa
 ab
 bM
 cd
-cl
+qr
 cd
-bO
+NI
 cd
 cT
 as
@@ -14108,7 +14311,7 @@ il
 iz
 il
 il
-il
+PJ
 iz
 il
 fD
@@ -14225,7 +14428,7 @@ gm
 fP
 fP
 gI
-gO
+Vg
 gJ
 gO
 fD
@@ -14328,7 +14531,7 @@ aP
 aP
 ab
 bO
-cd
+wh
 cl
 cd
 cl
@@ -14850,18 +15053,18 @@ ab
 bT
 bT
 bT
-bT
+Us
 bT
 cg
 bT
 as
 di
 bz
+ty
 bz
 bz
 bz
-bz
-bz
+Xz
 ex
 eD
 eD
@@ -15638,12 +15841,12 @@ bs
 dm
 dm
 dm
-dm
+WZ
 dR
 dZ
 dZ
 ey
-eI
+Cn
 eI
 eI
 fm
@@ -16726,7 +16929,7 @@ aG
 aG
 mc
 me
-nh
+ts
 me
 lv
 mm
@@ -16857,7 +17060,7 @@ aG
 mc
 mf
 me
-nh
+ts
 lv
 mm
 mm
@@ -16994,7 +17197,7 @@ lv
 lM
 mc
 mw
-mq
+mI
 mq
 mq
 mq
@@ -17115,7 +17318,7 @@ aa
 aG
 aG
 mc
-lv
+lC
 lv
 lv
 lv
@@ -18156,7 +18359,7 @@ aa
 aG
 md
 mg
-lt
+Gn
 lt
 lt
 md
@@ -18594,7 +18797,7 @@ kW
 dK
 dK
 gN
-dK
+ng
 dK
 le
 aL
@@ -18680,7 +18883,7 @@ aG
 aG
 aG
 mc
-mq
+RU
 lJ
 mu
 mu
@@ -19256,7 +19459,7 @@ aG
 lq
 ly
 lv
-lv
+ni
 lv
 lU
 lq