Alien Ruin fix, various cherrypicked upstream fixes

Also adds new buildmode

_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm

@@ -16,12 +16,12 @@
 	team_number = 100
 	},
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "k" = (
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "l" = (
@@ -29,59 +29,59 @@
 	team_number = 100
 	},
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "o" = (
 /obj/item/hemostat/alien,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "p" = (
 /obj/effect/mob_spawn/human/abductor,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "q" = (
 /obj/structure/closet/abductor,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "s" = (
 /obj/structure/table/optable/abductor,
 /obj/item/cautery/alien,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "t" = (
 /obj/structure/table/abductor,
 /obj/item/storage/box/alienhandcuffs,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "v" = (
 /obj/item/scalpel/alien,
 /obj/item/surgical_drapes,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "w" = (
 /obj/item/retractor/alien,
 /obj/item/paper/guides/antag/abductor,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "y" = (
 /obj/machinery/abductor/gland_dispenser,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "z" = (
@@ -89,13 +89,13 @@
 /obj/item/surgicaldrill/alien,
 /obj/item/circular_saw/alien,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 "A" = (
 /obj/structure/bed/abductor,
 /turf/open/floor/plating/abductor{
-	initial_gas_mix = "o2=16;n2=23;TEMP=300"
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
 	},
 /area/ruin/unpowered)
 
@@ -458,4 +458,4 @@ b
 b
 b
 a
-"}
+"}

_maps/RandomRuins/SpaceRuins/gasthelizards.dmm

@@ -136,20 +136,26 @@
 	dir = 1;
 	layer = 2.9
 	},
-/turf/open/floor/plasteel{
-	dir = 1;
-	icon_state = "blue"
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
 	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/ruin/space/has_grav/gasthelizard)
 "q" = (
 /obj/machinery/door/window/brigdoor/northleft,
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 1
 	},
-/turf/open/floor/plasteel{
-	dir = 1;
-	icon_state = "blue"
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
 	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/ruin/space/has_grav/gasthelizard)
 "r" = (
 /turf/open/floor/plasteel/airless/dark,

_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm

@@ -153,10 +153,17 @@
 "aB" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/head/ushanka,
-/turf/open/floor/plasteel{
-	dir = 4;
-	icon_state = "darkredfull"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 4
 	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ruin/space/has_grav/turretedoutpost)
 "aC" = (
 /obj/structure/table/reinforced,
@@ -221,12 +228,6 @@
 /obj/machinery/door/airlock/public/glass,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/turretedoutpost)
-"aJ" = (
-/turf/open/floor/plasteel{
-	dir = 4;
-	icon_state = "darkredfull"
-	},
-/area/ruin/space/has_grav/turretedoutpost)
 "aK" = (
 /obj/structure/bed,
 /obj/item/bedsheet/orange,
@@ -285,10 +286,17 @@
 "aR" = (
 /obj/structure/table/reinforced,
 /obj/item/paper/crumpled,
-/turf/open/floor/plasteel{
-	dir = 4;
-	icon_state = "darkredfull"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 4
 	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ruin/space/has_grav/turretedoutpost)
 "aS" = (
 /obj/structure/table/reinforced,
@@ -360,6 +368,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/turretedoutpost)
+"tK" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/turretedoutpost)
 "Nu" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -598,8 +619,8 @@ ad
 ad
 ad
 aB
-aJ
-aJ
+tK
+tK
 aR
 ad
 al

_maps/shuttles/emergency_asteroid.dmm

@@ -402,6 +402,7 @@
 /obj/item/retractor,
 /obj/item/hemostat,
 /obj/item/scalpel,
+/obj/item/surgicaldrill,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/escape)
 "bG" = (

_maps/shuttles/emergency_bar.dmm

@@ -305,11 +305,11 @@
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "aU" = (
-/mob/living/simple_animal/hostile/alien/maid/barmaid,
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
+/mob/living/simple_animal/hostile/alien/maid/barmaid,
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "aW" = (
@@ -320,11 +320,11 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/mob/living/simple_animal/drone/snowflake/bardrone,
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
+/mob/living/simple_animal/drone/snowflake/bardrone,
 /turf/open/floor/plasteel,
 /area/shuttle/escape)
 "aY" = (
@@ -472,6 +472,8 @@
 /obj/item/hemostat,
 /obj/item/retractor,
 /obj/item/scalpel,
+/obj/item/surgicaldrill,
+/obj/item/cautery,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "bC" = (

_maps/shuttles/emergency_cere.dmm

@@ -525,7 +525,6 @@
 /area/shuttle/escape)
 "bb" = (
 /obj/machinery/mech_bay_recharge_port{
-	icon_state = "recharge_port";
 	dir = 2
 	},
 /turf/open/floor/plasteel,

_maps/shuttles/emergency_clown.dmm

@@ -15,7 +15,7 @@
 "ae" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/fire,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "af" = (
 /obj/structure/chair/comfy/shuttle{
@@ -34,13 +34,13 @@
 	pixel_y = 3
 	},
 /obj/item/crowbar,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "ai" = (
 /obj/machinery/computer/atmos_alert{
 	dir = 4
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aj" = (
 /obj/structure/chair/comfy/shuttle{
@@ -62,13 +62,13 @@
 /obj/machinery/computer/security{
 	dir = 8
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "an" = (
 /obj/machinery/computer/crew{
 	dir = 4
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "ao" = (
 /obj/structure/chair/comfy/shuttle{
@@ -96,10 +96,10 @@
 /obj/machinery/computer/communications{
 	dir = 8
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "as" = (
-/obj/machinery/door/airlock/public/glass{
+/obj/machinery/door/airlock/bananium/glass{
 	name = "Emergency Shuttle Premium Lounge"
 	},
 /turf/open/floor/bluespace,
@@ -115,15 +115,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/noslip,
-/area/shuttle/escape)
-"aw" = (
-/turf/open/floor/noslip,
-/area/shuttle/escape)
-"ax" = (
-/obj/structure/closet/emcloset,
-/obj/item/toy/sword,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "ay" = (
 /obj/structure/table,
@@ -133,7 +125,7 @@
 	pixel_y = 3
 	},
 /obj/item/crowbar,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "az" = (
 /obj/item/greentext/quiet{
@@ -142,31 +134,25 @@
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
 "aA" = (
-/obj/machinery/door/airlock/public/glass{
+/obj/machinery/door/airlock/bananium/glass{
 	name = "Emergency Shuttle Greentext"
 	},
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
-"aB" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/open/floor/noslip,
-/area/shuttle/escape)
 "aC" = (
 /obj/structure/chair/comfy/shuttle,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aD" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aE" = (
 /obj/structure/table,
 /obj/item/multitool/ai_detect,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aF" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -177,15 +163,15 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aH" = (
 /obj/structure/table,
 /obj/item/toy/sword,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aI" = (
-/obj/machinery/door/airlock/titanium{
+/obj/machinery/door/airlock/bananium{
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency{
@@ -221,7 +207,7 @@
 "aM" = (
 /obj/structure/bed,
 /obj/item/bedsheet/random,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aN" = (
 /obj/structure/window/reinforced{
@@ -229,7 +215,7 @@
 	},
 /obj/structure/bed,
 /obj/item/bedsheet/random,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aO" = (
 /obj/structure/window/reinforced{
@@ -237,7 +223,7 @@
 	},
 /obj/structure/bed,
 /obj/item/bedsheet/random,
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aP" = (
 /obj/structure/bed,
@@ -245,10 +231,10 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aQ" = (
-/obj/machinery/door/airlock/titanium{
+/obj/machinery/door/airlock/bananium{
 	name = "Emergency Shuttle Airlock"
 	},
 /turf/open/floor/plating,
@@ -266,13 +252,13 @@
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "aT" = (
-/obj/machinery/door/airlock/titanium{
+/obj/machinery/door/airlock/bananium{
 	name = "Emergency Shuttle Cargo"
 	},
 /turf/open/floor/bluespace,
 /area/shuttle/escape)
 "aU" = (
-/obj/machinery/door/airlock/public/glass{
+/obj/machinery/door/airlock/bananium/glass{
 	name = "Emergency Shuttle Infirmary"
 	},
 /turf/open/floor/bluespace,
@@ -290,7 +276,7 @@
 /obj/machinery/sleeper{
 	dir = 8
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "aY" = (
 /obj/machinery/light/small{
@@ -305,13 +291,6 @@
 	},
 /turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
-"ba" = (
-/obj/machinery/light/small{
-	brightness = 3;
-	dir = 8
-	},
-/turf/open/floor/noslip,
-/area/shuttle/escape)
 "bb" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/fire,
@@ -326,7 +305,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/turf/open/floor/noslip,
+/turf/open/floor/mineral/bananium,
 /area/shuttle/escape)
 "bc" = (
 /obj/structure/closet/crate/trashcart{
@@ -359,6 +338,11 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
+"Zf" = (
+/obj/structure/closet/emcloset,
+/obj/item/toy/sword,
+/turf/open/floor/mineral/bananium,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -522,9 +506,9 @@ aN
 aN
 ak
 ac
-ax
-ba
-ax
+Zf
+aY
+Zf
 bf
 bg
 "}
@@ -534,7 +518,7 @@ ah
 al
 al
 at
-aw
+aV
 ak
 aE
 aH
@@ -546,9 +530,9 @@ aO
 aO
 ak
 aU
-aw
-aw
-aw
+aV
+aV
+aV
 bf
 bg
 "}
@@ -558,7 +542,7 @@ ad
 am
 ar
 ab
-ax
+Zf
 ak
 ak
 ak
@@ -570,9 +554,9 @@ ak
 ak
 ak
 ac
-aw
-aw
-aw
+aV
+aV
+aV
 bf
 bg
 "}
@@ -583,9 +567,9 @@ ab
 ab
 ab
 ay
-aB
-aw
-aw
+aZ
+aV
+aV
 aL
 aM
 aM

_maps/shuttles/emergency_delta.dmm

@@ -176,6 +176,8 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/item/surgicaldrill,
+/obj/item/cautery,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "an" = (

_maps/shuttles/emergency_imfedupwiththisworld.dmm

@@ -55,7 +55,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/vending/boozeomat,
+/obj/machinery/vending/boozeomat{
+	req_access = null
+	},
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1

_maps/shuttles/emergency_meta.dmm

@@ -593,6 +593,8 @@
 	name = "Station Intercom (General)";
 	pixel_x = -27
 	},
+/obj/item/surgicaldrill,
+/obj/item/cautery,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "bI" = (

_maps/shuttles/emergency_omega.dmm

@@ -805,6 +805,8 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/item/cautery,
+/obj/item/surgicaldrill,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "bo" = (

_maps/shuttles/emergency_raven.dmm

@@ -238,6 +238,8 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/obj/item/surgicaldrill,
+/obj/item/cautery,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "aC" = (
@@ -440,9 +442,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark{
-	icon_state = "darkyellow"
-	},
+/turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "bb" = (
 /obj/item/clothing/suit/hazardvest{
@@ -553,9 +553,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark{
-	icon_state = "darkyellow"
-	},
+/turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "bg" = (
 /obj/structure/table/reinforced,
@@ -592,9 +590,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark{
-	icon_state = "darkyellow"
-	},
+/turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "bk" = (
 /obj/machinery/suit_storage_unit/standard_unit,
@@ -670,17 +666,17 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/escape)
 "bp" = (
-/mob/living/simple_animal/bot/medbot{
-	name = "\improper emergency medibot";
-	pixel_x = -3;
-	pixel_y = 2
-	},
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/mob/living/simple_animal/bot/medbot{
+	name = "\improper emergency medibot";
+	pixel_x = -3;
+	pixel_y = 2
+	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/escape)
 "bq" = (

_maps/shuttles/emergency_supermatter.dmm

@@ -68,10 +68,6 @@
 	},
 /turf/open/floor/noslip,
 /area/shuttle/escape)
-"aq" = (
-/obj/machinery/status_display/evac,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/escape)
 "ar" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -313,6 +309,36 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/escape)
+"hD" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space,
+/area/shuttle/escape)
+"pb" = (
+/obj/structure/closet/radiation{
+	anchored = 1
+	},
+/obj/item/clothing/glasses/meson/engine,
+/obj/machinery/status_display/evac{
+	pixel_x = 32
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"Bi" = (
+/obj/structure/closet/radiation{
+	anchored = 1
+	},
+/obj/item/clothing/glasses/meson/engine,
+/obj/machinery/status_display/evac{
+	pixel_x = -32
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"UA" = (
+/obj/machinery/status_display/evac{
+	pixel_y = -32
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
 
 (1,1,1) = {"
 aa
@@ -343,13 +369,13 @@ ae
 ae
 ad
 ac
-aq
+ae
 ad
 ax
 ai
 aD
-ai
-aq
+UA
+ae
 aa
 aa
 aN
@@ -357,7 +383,7 @@ aM
 aR
 aU
 aX
-at
+aM
 ba
 bc
 be
@@ -367,7 +393,7 @@ ac
 ag
 ag
 bi
-ag
+Bi
 ag
 ag
 ai
@@ -376,12 +402,12 @@ ai
 ad
 aa
 aa
-at
+aM
 aa
 aS
 aV
 aY
-at
+aM
 ba
 bc
 be
@@ -400,13 +426,13 @@ ar
 aI
 aw
 aa
-at
+aM
 aa
 aT
 aW
 aZ
 aa
-aM
+hD
 aa
 aa
 "}
@@ -423,11 +449,11 @@ as
 as
 bk
 ad
-at
+aM
 aO
 aa
 aa
-aM
+hD
 aa
 aa
 aR
@@ -449,11 +475,11 @@ at
 aL
 aM
 aM
-aM
-aM
-aM
-aM
-aM
+hD
+hD
+hD
+hD
+hD
 bb
 bd
 aY
@@ -471,11 +497,11 @@ au
 au
 bl
 ad
-at
+aM
 aP
 aa
 aa
-aM
+hD
 aa
 aa
 aT
@@ -496,13 +522,13 @@ av
 aI
 aw
 aa
-at
+aM
 aa
 aR
 aU
 aX
 aa
-aM
+hD
 aa
 aa
 "}
@@ -511,7 +537,7 @@ ac
 ag
 ag
 bj
-ag
+pb
 ag
 ag
 ai
@@ -520,12 +546,12 @@ ai
 ad
 aa
 aa
-at
+aM
 aa
 aS
 aV
 aY
-at
+aM
 ba
 bc
 be
@@ -535,13 +561,13 @@ ae
 ae
 ad
 ac
-aq
+ae
 ad
 ax
 ai
 aE
-ai
-aq
+UA
+ae
 aa
 aa
 aQ
@@ -549,7 +575,7 @@ aM
 aT
 aW
 aZ
-at
+aM
 ba
 bc
 be