From 1330ad2a077243607f0d97e64bd4d1b0c41d9e98 Mon Sep 17 00:00:00 2001 From: RadiantFlash7 Date: Sun, 14 Apr 2019 15:37:22 -0400 Subject: [PATCH] Fixing broken code from merge\ Fixing missing map animals and missing icon files. --- code/game/objects/items/devices/defib.dm | 8 +- .../crates_lockers/closets/secure/cargo.dm | 2 +- .../subtypes/animal/space/animals_yw.dm | 168 ++++++++++++++++++ code/modules/power/lighting.dm | 4 +- icons/mob/animal_yw.dmi | Bin 0 -> 694 bytes icons/obj/mining_yw.dmi | Bin 0 -> 1018 bytes maps/yw/Centcom.dmm | 157 ++++++++-------- maps/yw/cryogaia.dmm | 95 +++++----- maps/yw/cryogaia_borealismajoris.dm | 10 +- maps/yw/cryogaia_lowerlevel.dmm | 24 +-- maps/yw/cryogaia_mining.dmm | 56 +++--- maps/yw/cryogaia_telecomms.dm | 2 +- maps/yw/cryogaia_turfs.dm | 2 +- maps/yw/submaps/_tether_submaps.dm | 21 +-- maps/yw/submaps/aerostat/_aerostat.dm | 18 +- maps/yw/submaps/alienship/_alienship.dm | 4 +- maps/yw/submaps/beach/_beach.dm | 17 +- maps/yw/tether_phoronlock.dm | 6 +- maps/yw/tether_things.dm | 46 ++--- vorestation.dme | 4 +- 20 files changed, 408 insertions(+), 236 deletions(-) create mode 100644 code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm create mode 100644 icons/mob/animal_yw.dmi create mode 100644 icons/obj/mining_yw.dmi diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index e685ab1a2c..26fb1b69aa 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -496,12 +496,12 @@ apply_brain_damage(M, deadtime) /obj/item/weapon/shockpaddles/proc/apply_brain_damage(mob/living/carbon/human/H, var/deadtime) - if(deadtime < DEFIB_TIME_LOSS) return + if(deadtime < DEFIB_TIME_LOSS) return - if(!H.should_have_organ(O_BRAIN)) return //no brain + if(!H.should_have_organ(O_BRAIN)) return //no brain - var/obj/item/organ/internal/brain/brain = H.internal_organs_by_name[O_BRAIN] - if(!brain) return //no brain + var/obj/item/organ/internal/brain/brain = H.internal_organs_by_name[O_BRAIN] + if(!brain) return //no brain var/brain_damage = CLAMP((deadtime - DEFIB_TIME_LOSS)/(DEFIB_TIME_LIMIT - DEFIB_TIME_LOSS)*brain.max_damage, H.getBrainLoss(), brain.max_damage) H.setBrainLoss(brain_damage) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 489a34dbe6..c292a548be 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -123,7 +123,7 @@ /obj/item/clothing/shoes/boots/winter/mining, /obj/item/stack/marker_beacon/thirty) -/obj/structure/closet/lumber/initialize() +/obj/structure/closet/lumber/Initialize() if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/industrial else diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm new file mode 100644 index 0000000000..dae695168f --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/animals_yw.dm @@ -0,0 +1,168 @@ +/mob/living/simple_mob/animal/passive/gaslamp/snow //Frostlamnp + name = "Frostlit Lamp" + desc = "Some sort of floaty alien with a surprisingly warm glow. This creature is looks like an evolutionary offshute of the Gaslamp family." + tt_desc = "Semaeostomeae virginus" + icon = 'icons/mob/cryogaia32x64.dmi' + icon_state = "gaslamp" + icon_living = "gaslamp" + icon_dead = "gaslamp-dead" + + faction = "virgo3b" + maxHealth = 100 + health = 100 + movement_cooldown = 12 + + say_list_type = /datum/say_list/gaslamp + ai_holder_type = /datum/ai_holder/simple_mob/gaslamp + +// speed = 2 Virgo coders making my life hell. This conflicts with their new system + + melee_damage_lower = 30 // Because fuck anyone who hurts this sweet, innocent creature. + melee_damage_upper = 30 + attacktext = list("thrashed") + friendly = "caressed" + + response_help = "brushes" // If clicked on help intent + response_disarm = "pushes" // If clicked on disarm intent + response_harm = "swats" // If clicked on harm intent + + minbodytemp = 0 + maxbodytemp = 350 + + min_oxy = 1 //Needs Oxy to survive on cryogaia + max_oxy = 0 // Hopefully no Max oxy + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + +//Code for chaplains pet. +/mob/living/simple_mob/clockwork + name = "Clockwork Marauder" + desc = "The stalwart apparition of a clockwork flame guardian. It's eternal flame glows a firey-red." + tt_desc = "Aeterna flamma armis" + icon = 'icons/mob/clockwork_mobs.dmi' + icon_state = "clockwork_marauder" + item_state = "clockwork_marauder" + icon_living = "clockwork_marauder" + icon_dead = "fallen_armor" + icon_rest = "clockwork_marauder" + + movement_cooldown = 0.5 SECONDS + + see_in_dark = 6 // Not sure if this actually works. + + + response_help = "pats" + response_disarm = "gently pushes aside" + response_harm = "kicks" + + min_oxy = 16 //Require atleast 16kPA oxygen + minbodytemp = 223 //Below -50 Degrees Celcius + maxbodytemp = 323 //Above 50 Degrees Celcius + + has_langs = list("Occursus") +/* speak_chance = 1 + speak = list("Heretics!","Burn them!","Protect believers!","Hail Helios") + speak_emote = list("crackles", "burns") + emote_hear = list("crackles","burns") + emote_see = list("twists their sword", "adjusts their shield") + say_maybe_target = list("Who?","Strange.") + say_got_target = list("Purge!","Cleanse!","Burn!") */ + + meat_amount = 0 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + + var/turns_since_scan = 0 + var/mob/flee_target + +/mob/living/simple_mob/clockwork/handle_special() + if(!stat && prob(2)) // spooky + var/mob/observer/dead/spook = locate() in range(src, 5) + if(spook) + var/turf/T = get_turf(spook) + var/list/visible = list() + for(var/obj/O in T.contents) + if(!O.invisibility && O.name) + visible += O + if(visible.len) + var/atom/A = pick(visible) + visible_emote("suddenly stops and stares at something unseen[istype(A) ? " near [A]":""].") + + + +//Basic friend AI +/*/mob/living/simple_animal/clockwork/fluff + var/mob/living/carbon/human/friend + var/befriend_job = null + +/mob/living/simple_animal/clockwork/fluff/Life() + . = ..() + if(!. || ai_inactive || !friend) return + + var/friend_dist = get_dist(src,friend) + + if (friend_dist <= 4) + if(stance == STANCE_IDLE) + if(set_follow(friend)) + handle_stance(STANCE_FOLLOW) + + if (friend_dist <= 1) + if (friend.stat >= DEAD || friend.health <= config.health_threshold_softcrit) + if (prob((friend.stat < DEAD)? 50 : 15)) + var/verb = pick("meows", "mews", "mrowls") + audible_emote(pick("[verb] in distress.", "[verb] anxiously.")) + else + if (prob(5)) + visible_emote(pick("nuzzles [friend].", + "brushes against [friend].", + "rubs against [friend].", + "purrs.")) + else if (friend.health <= 50) + if (prob(10)) + var/verb = pick("meows", "mews", "mrowls") + audible_emote("[verb] anxiously.") + +/mob/living/simple_animal/cat/fluff/verb/become_friends() + set name = "Become Friends" + set category = "IC" + set src in view(1) + + if(!friend) + var/mob/living/carbon/human/H = usr + if(istype(H) && (!befriend_job || H.job == befriend_job)) + friend = usr + . = 1 + else if(usr == friend) + . = 1 //already friends, but show success anyways + + if(.) + set_dir(get_dir(src, friend)) + visible_emote(pick("nuzzles [friend].", + "brushes against [friend].", + "rubs against [friend].", + "purrs.")) + else + usr << "[src] ignores you." + return */ + +/mob/living/simple_mob/clockwork/fluff/Ignis + name = "Ignis" + desc = "The stalwart apparition of a clockwork flame guardian. This one appears to be to be have been somehow modified to be 'docile', it's living fire turned blue." +// tt_desc = "Aeterna flamma armis" //Chaplains new pet! + icon = 'icons/mob/clockwork_mobs.dmi' + icon_state = "ignis" + item_state = "ignis" +// icon_living = "ignis" +// icon_dead = "fallen_armor" +// icon_rest = "ignis" +// retaliate = 1 // In theory this will make Ignis fight back. Maybe. -RF + +/mob/living/simple_mob/animal/passive/mouse/mining + body_color = "brown" + icon = 'icons/mob/animal_yw.dmi' + icon_state = "mouse_miner" + name = "Cooper" + desc = "A lonely miner's best friend." \ No newline at end of file diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 3b7855c66e..57a4139075 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -902,7 +902,7 @@ /obj/machinery/light/trailblazer - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_yw.dmi' icon_state = "redtrail_light_on" base_state = "redtrail_light_on" fitting = "bulb" @@ -916,7 +916,7 @@ var/lamp_shade = 0 /obj/machinery/light/trailblazerb - icon = 'icons/obj/mining.dmi' + icon = 'icons/obj/mining_yw.dmi' icon_state = "bluetrail_light_on" base_state = "bluetrail_light_on" fitting = "bulb" diff --git a/icons/mob/animal_yw.dmi b/icons/mob/animal_yw.dmi new file mode 100644 index 0000000000000000000000000000000000000000..32cb0614cceab95698e36dffdec301acfef462a3 GIT binary patch literal 694 zcmV;n0!jUeP)}pdcJQ=t4Y<@P zMW^1LX90k-?N5~GtMVTPDgOb-Q^KtS>$lbc-{VInU@++o*Eq+Ezp8=1?3&3T8&I6; z@c_of+IfcYvEsf-N08&+CIjb=nGB{Q6Vbpfi;J`0mH@ literal 0 HcmV?d00001 diff --git a/icons/obj/mining_yw.dmi b/icons/obj/mining_yw.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d0fe7e0355c5db702251916efaa73f1bacb9002c GIT binary patch literal 1018 zcmVV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#G}a!ON6iV`z(;&U?7GfI@WI8!opl%p9RpPxsf4R~}YE4cc(D7g4~asdEt%}j560V~J=00SyXL_t(|ob6gcYZE~f z{>F$Ky68bE7KEOq*Fd2jYT~WLgUt^Ry;iUndubu1P(74hD%gt$J$Oz}H8;shX+_wZ zh<`v3iZ&2Jn1s!G*xji}DdwAT2b%d#kA;2TdvD&pnPfiEYPB%VxMVv3+i(T29e{0I zW?x)iUynV{0{}=Vv9Ylsj760rKivVrNflB`NGTDVR9QDP>Or9R>p?*Kp*sMB_G#jS zHtmK*2&lwE0JEeYx&uDFewQRZXeV~gm_L|Ch$Q*>gK63i-vNM?#Q%g&;u*$%7oZF9 zqkZj6J1>~x*ZKr(ByO6Y?tllY56`so!qxj<&a_8`);6dTx3mqG(!{N7gO#ZxwGCFL zj#xJ|nw5&$2Ah=%?T79F&+|~ed5Ga~2+y0K1JL1rUoK-f9AY9p5;LF+(ChU8073|5 z=Lu8%TIT>yqw*$Tf}bvc=XsD)B8nm_g)qfW7eGo004Nj+%FYv}_~`-^i$zuWVzEdE zV4I&VfbaY0_xp(B7{2e*0odlJ3m}9*9LEqsK!{xb3^K}37ogMWs21#WI&=WG`RQ{& zHh7{avN{BH`L%{1kW67)L(l}j))35E(AE$%!A}>U+wH0$)a`cZ0BrM91!y!HvG4n8 z68pZ7MxznaQCQ@s3Q()n#NXRctyarzFEq(7-0kp~!xg}G0Jh-@U^@WYaQXl?fQzCJ zpbBt&YkoD;2LvZoV9-vU<%GM}Z#>EL0ren2m_B2Cu^q5j-P+vEE=H~ zE6rtfF|yKJ27nUdXylV%y3&hpzo7siyAqmvbQ=+Xy~*z%Uoe6EE7FxNp?~-o$6u3& zlQY1TJ8uAl!LOgMM)9Y0I}Bh>^L;%`&S<+B`4c#Ah5z^J1HgGJJnHHL{0!K`Y5OC! z_eft1Le>5NQafZE(Z2@EPd~@i=g)QlV1I3Usr7O;*K6k$zUcG;aQXnJ4*;A#K-qc2=>wcT!07{=KEMRO(+99G oI(>lC2RMCz(+6AxjQ!oj?cNmi(92mk;807*qoM6N<$f|P~L>Hq)$ literal 0 HcmV?d00001 diff --git a/maps/yw/Centcom.dmm b/maps/yw/Centcom.dmm index b60729aff4..ba5d3e553a 100644 --- a/maps/yw/Centcom.dmm +++ b/maps/yw/Centcom.dmm @@ -379,7 +379,7 @@ "ho" = (/obj/structure/table/steel_reinforced,/obj/random/tool,/obj/random/tool,/obj/random/tool,/obj/random/tool,/obj/random/tool,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hp" = (/obj/structure/table/steel_reinforced,/obj/random/toolbox,/obj/random/toolbox,/obj/random/toolbox,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hq" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) -"hr" = (/obj/vehicle/train/cargo/engine,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hr" = (/obj/structure/closet/secure_closet/security/engine,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hs" = (/turf/simulated/shuttle/floor/darkred,/area/shuttle/trade/centcom) "ht" = (/obj/machinery/door/airlock/glass_medical{name = "Medical Bay"; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hu" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -395,7 +395,7 @@ "hE" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hF" = (/obj/structure/table/steel_reinforced,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/item/weapon/weldpack,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hG" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) -"hH" = (/obj/vehicle/train/cargo/trolley,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) +"hH" = (/obj/vehicle/train/trolley,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hI" = (/obj/machinery/light,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hJ" = (/obj/machinery/vending/medical{pixel_y = -32; req_access = null},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) "hK" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 4; req_access = list(160)},/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -438,7 +438,7 @@ "iv" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/airless,/area/shuttle/arrival/pre_game) "iw" = (/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "tradebridgeshutters"; name = "Blast Shutters"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/shuttle/trade/centcom) "ix" = (/obj/structure/frame/computer,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) -"iy" = (/obj/machinery/light{dir = 4},/obj/structure/sign/kiddieplaque{desc = "A plaque commemorating the construction of the cargo ship Beruang."; name = "Beruang"; pixel_x = 32},/mob/living/simple_animal/corgi/tamaskan/spice,/turf/simulated/shuttle/floor/darkred,/area/shuttle/trade/centcom) +"iy" = (/obj/machinery/light{dir = 4},/obj/structure/sign/kiddieplaque{desc = "A plaque commemorating the construction of the cargo ship Beruang."; name = "Beruang"; pixel_x = 32},/mob/living/simple_mob/animal/passive/dog/tamaskan/Spice,/turf/simulated/shuttle/floor/darkred,/area/shuttle/trade/centcom) "iz" = (/obj/machinery/door/airlock/silver{name = "Toilet"},/turf/simulated/shuttle/floor/white,/area/shuttle/trade/centcom) "iA" = (/obj/machinery/door/airlock/silver{name = "Restroom"},/turf/simulated/shuttle/floor/white,/area/shuttle/trade/centcom) "iB" = (/obj/structure/undies_wardrobe,/turf/simulated/shuttle/floor/black,/area/shuttle/trade/centcom) @@ -660,7 +660,7 @@ "mJ" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) "mK" = (/obj/structure/lattice,/turf/space,/area/space) "mL" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"mM" = (/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/weapon/screwdriver,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/weapon/screwdriver,/obj/item/weapon/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"mM" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mN" = (/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mO" = (/obj/effect/floor_decal/corner/blue{dir = 9},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "mP" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/item/weapon/pinpointer/advpinpointer,/obj/item/weapon/stamp/centcomm,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -685,7 +685,7 @@ "ni" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/beanbags,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nj" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/handcuffs{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nk" = (/obj/structure/table/reinforced,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nl" = (/obj/structure/table/reinforced,/obj/item/weapon/wrench,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nl" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/wrench,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nm" = (/obj/structure/table/rack,/obj/item/rig_module/device/drill,/obj/item/rig_module/device/drill,/obj/item/rig_module/maneuvering_jets,/obj/item/rig_module/maneuvering_jets,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nn" = (/obj/structure/table/rack,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "no" = (/obj/structure/table/rack,/obj/item/rig_module/grenade_launcher,/obj/item/rig_module/grenade_launcher,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) @@ -711,7 +711,7 @@ "nI" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/obj/item/clothing/accessory/holster/hip,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nJ" = (/obj/structure/table/rack,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/obj/item/clothing/accessory/holster/armpit,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nK" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nL" = (/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/weapon/screwdriver,/obj/item/weapon/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nL" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nM" = (/obj/machinery/porta_turret{anchored = 0; check_records = 0; enabled = 0; req_one_access = list(103); use_power = 0},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nN" = (/obj/machinery/vending/snack{name = "hacked Getmore Chocolate Corp"; prices = list()},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "nO" = (/obj/structure/closet/wardrobe/ert,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -755,7 +755,7 @@ "oA" = (/obj/structure/sign/securearea{name = "\improper ARMORY"; pixel_y = 32},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oB" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; listening = 0; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oC" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oD" = (/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/weapon/screwdriver,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oD" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/screwdriver,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oE" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/donut,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oF" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oG" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "ASSAULT1"; name = "Launch Bay #1"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) @@ -772,7 +772,7 @@ "oR" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/centcom/specops) "oS" = (/obj/effect/floor_decal/corner/white{dir = 5},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oT" = (/obj/structure/table/reinforced,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"oU" = (/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"oU" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oV" = (/obj/structure/table/reinforced,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/obj/item/device/paicard,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oW" = (/obj/machinery/cell_charger,/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "oX" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -909,7 +909,7 @@ "ry" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) "rz" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "specops_shuttle_fore"; name = "forward docking hatch controller"; pixel_x = 0; pixel_y = -25; tag_door = "specops_shuttle_fore_hatch"},/turf/simulated/shuttle/floor{icon_state = "floor_red"},/area/shuttle/specops/centcom) "rA" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "specops_shuttle_fore_hatch"; locked = 1; name = "Forward Docking Hatch"; req_access = list(13)},/turf/simulated/shuttle/plating,/area/shuttle/specops/centcom) -"rB" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/mob/living/simple_animal/corgi/puppy{name = "Bockscar"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) +"rB" = (/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/obj/effect/floor_decal/corner/red/diagonal,/mob/living/simple_mob/animal/passive/dog/corgi/puppy{name = "Bockscar"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/specops) "rC" = (/obj/structure/table/standard,/obj/item/stack/material/glass{amount = 15},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "rD" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1},/obj/machinery/light,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "rE" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 8},/obj/item/weapon/pen{pixel_y = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) @@ -981,7 +981,7 @@ "sS" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) "sT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "sU" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"sV" = (/obj/structure/table/rack,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sV" = (/obj/structure/table/rack,/obj/item/weapon/banner/red,/obj/item/weapon/banner/red,/obj/item/weapon/banner/red,/obj/item/weapon/banner/red,/obj/item/weapon/banner/red,/obj/item/weapon/banner/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "sW" = (/obj/structure/table/rack,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "sX" = (/obj/structure/table/rack,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/maglight,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "sY" = (/obj/structure/table/rack,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera_film,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/obj/item/device/camera,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) @@ -1079,7 +1079,7 @@ "uM" = (/obj/machinery/vending/cigarette{name = "hacked cigarette machine"; prices = list(); products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uN" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/button/flasher{id = "syndieflash"; name = "Flasher"; pixel_x = 27; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uO" = (/obj/machinery/button/remote/blast_door{id = "smindicate"; name = "ship lockdown control"; pixel_x = -25},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"uP" = (/mob/living/simple_animal/cat/kitten{name = "Enola"},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"uP" = (/obj/item/weapon/holder/cat/kitten{name = "Enola"},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uQ" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 4; start_pressure = 740.5},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uR" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/meter,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "uS" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1331; master_tag = "merc_shuttle"; name = "interior access button"; pixel_x = 25; pixel_y = 25; req_access = list(150)},/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) @@ -1123,7 +1123,7 @@ "vE" = (/turf/unsimulated/wall,/area/centcom/terminal) "vF" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "CREED"; name = "Ready Room"; p_open = 0},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "vG" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) -"vH" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"vH" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/syndicate_station/start) "vI" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "admin_shuttle_bay"; name = "shuttle bay controller"; pixel_x = 25; pixel_y = 0; tag_door = "admin_shuttle_bay_door"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "vJ" = (/obj/machinery/optable,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "vK" = (/obj/structure/table/reinforced,/obj/machinery/librarycomp,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) @@ -1133,7 +1133,7 @@ "vO" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "syndieshutters_infirmary"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "vP" = (/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "vQ" = (/obj/item/device/radio/intercom{desc = "Talk through this. Evilly"; frequency = 1213; name = "Syndicate Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"vR" = (/obj/structure/table/standard,/obj/item/weapon/screwdriver,/obj/effect/spawner/newbomb/timer/syndicate,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"vR" = (/obj/structure/table/standard,/obj/item/weapon/tool/screwdriver,/obj/effect/spawner/newbomb/timer/syndicate,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vS" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "syndieshutters_workshop"; name = "Blast Shutters"; opacity = 0},/turf/simulated/shuttle/plating,/area/syndicate_station/start) "vT" = (/obj/structure/table/rack,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/obj/item/device/suit_cooling_unit,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "vU" = (/obj/structure/table/rack,/obj/item/weapon/rig/merc/empty,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) @@ -1212,7 +1212,7 @@ "xp" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "xq" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile/latex,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/white,/area/syndicate_station/start) "xr" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) -"xs" = (/obj/item/weapon/crowbar,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"xs" = (/obj/item/weapon/tool/crowbar,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xt" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xu" = (/obj/structure/sign/nosmoking_2{pixel_x = 32},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xv" = (/obj/machinery/door/airlock/external,/obj/effect/forcefield{desc = "You can't get in. Heh."; layer = 1; name = "Blocker"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/terminal) @@ -1240,7 +1240,7 @@ "xR" = (/obj/machinery/teleport/hub,/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "xS" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xT" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) -"xU" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/syndicate_station/start) +"xU" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/syndicate_station/start) "xV" = (/obj/structure/bed/chair{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xW" = (/obj/effect/floor_decal/corner/orange,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xX" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) @@ -1252,9 +1252,9 @@ "yd" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/bananapeel,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "ye" = (/obj/structure/bed/chair/comfy/teal{dir = 8},/obj/effect/floor_decal/carpet{dir = 4},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "yf" = (/obj/machinery/door/airlock/centcom{name = "Living Quarters"; opacity = 1; req_access = list(105)},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) -"yg" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/syndicate_station/start) -"yh" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"},/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) -"yi" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) +"yg" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"},/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) +"yh" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) +"yi" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"},/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) "yj" = (/obj/structure/table/woodentable{dir = 5},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "yk" = (/obj/structure/device/piano{dir = 4},/obj/effect/floor_decal/corner/yellow/diagonal,/obj/effect/floor_decal/corner/blue/diagonal{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "yl" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "mining_shuttle_hatch"; locked = 1; name = "Shuttle Hatch"},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/command) @@ -1267,9 +1267,9 @@ "ys" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "yt" = (/obj/machinery/computer/pod{id = "NTrasen"; name = "Hull Door Control"},/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1441; name = "Spec Ops Intercom"; pixel_y = 28},/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) "yu" = (/obj/machinery/door/airlock/centcom{name = "Courthouse"; opacity = 1},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/command) -"yv" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"},/turf/simulated/shuttle/plating/airless/carry{icon_state = "platform"; dir = 1},/area/supply/dock) -"yw" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) -"yx" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) +"yv" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) +"yw" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) +"yx" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "yy" = (/obj/structure/table/reinforced,/obj/item/clothing/head/greenbandana,/obj/effect/floor_decal/corner/orange{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yz" = (/obj/structure/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "yA" = (/obj/structure/closet/secure_closet/hos,/turf/unsimulated/floor{dir = 2; icon_state = "dark"},/area/centcom/command) @@ -1333,7 +1333,7 @@ "zG" = (/obj/structure/table/reinforced,/obj/machinery/recharger{pixel_y = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "zH" = (/turf/simulated/shuttle/wall,/area/shuttle/transport1/centcom) "zI" = (/obj/structure/grille,/obj/structure/shuttle/window,/turf/simulated/shuttle/plating,/area/shuttle/transport1/centcom) -"zJ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) +"zJ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "zK" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "centcom_shuttle_bay"; name = "shuttle bay controller"; pixel_x = -24; pixel_y = 0; tag_door = "centcom_shuttle_bay_door"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/terminal) "zL" = (/obj/machinery/computer/arcade/battle,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "zM" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/orange{dir = 10},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) @@ -1350,14 +1350,14 @@ "zX" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor,/area/shuttle/transport1/centcom) "zY" = (/obj/structure/bed/chair,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/transport1/centcom) "zZ" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/plating/airless,/area/shuttle/transport1/centcom) -"Aa" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_l"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) +"Aa" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/escape/centcom) "Ab" = (/obj/effect/floor_decal/corner/red{dir = 9},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Ac" = (/obj/effect/floor_decal/corner/red,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Ad" = (/obj/effect/floor_decal/corner/red/full{dir = 4},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Ae" = (/obj/structure/closet/secure_closet/bar,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/restaurant) "Af" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/white/diagonal,/obj/machinery/cash_register/civilian{icon_state = "register_idle"; dir = 8},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "Ag" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/white/diagonal,/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) -"Ah" = (/obj/machinery/computer/ordercomp,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) +"Ah" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Ai" = (/obj/machinery/button/remote/blast_door{id = "crescent_checkpoint_access"; name = "Crescent Checkpoint Access"; pixel_x = -6; pixel_y = -24; req_access = list(101)},/obj/machinery/button/remote/blast_door{id = "crescent_thunderdome"; name = "Thunderdome Access"; pixel_x = 6; pixel_y = -24; req_access = list(101)},/obj/machinery/button/remote/blast_door{id = "crescent_vip_shuttle"; name = "VIP Shuttle Access"; pixel_x = 6; pixel_y = -34; req_access = list(101)},/obj/machinery/turretid{pixel_x = 28; pixel_y = -28; req_access = list(101)},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Aj" = (/obj/machinery/computer/shuttle_control{req_access = list(101); shuttle_tag = "Centcom"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "Ak" = (/obj/machinery/computer/communications,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) @@ -1379,7 +1379,7 @@ "AA" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor,/area/shuttle/transport1/centcom) "AB" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/light,/turf/simulated/shuttle/floor,/area/shuttle/transport1/centcom) "AC" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating/airless,/area/shuttle/transport1/centcom) -"AD" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/escape/centcom) +"AD" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) "AE" = (/obj/effect/floor_decal/corner/red{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "AF" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/red{dir = 5},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "AG" = (/obj/machinery/computer/secure_data,/obj/effect/floor_decal/corner/red/full{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) @@ -1401,7 +1401,7 @@ "AW" = (/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) "AX" = (/obj/structure/bed/chair,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) "AY" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/tram) -"AZ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) +"AZ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) "Ba" = (/obj/machinery/computer/security,/obj/effect/floor_decal/corner/red{dir = 6},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "Bb" = (/obj/structure/bed/chair,/obj/effect/floor_decal/corner/white/diagonal,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/restaurant) "Bc" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/main_hall) @@ -1710,7 +1710,7 @@ "GT" = (/obj/machinery/door/airlock{name = "Unit 4"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "GU" = (/obj/machinery/door/airlock{name = "Unit 5"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) "GV" = (/obj/machinery/door/airlock{name = "Unit 6"},/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/centcom/bathroom) -"GW" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/item/weapon/crowbar,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"GW" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 3},/obj/item/weapon/extinguisher,/obj/item/weapon/tool/crowbar,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "GX" = (/obj/machinery/door/airlock/glass_security{name = "Escape Shuttle Cell"; req_access = list(1)},/turf/simulated/shuttle/floor/red,/area/shuttle/escape/centcom) "GY" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/material/ashtray/bronze{pixel_x = -1; pixel_y = 1},/obj/machinery/camera/network/crescent{c_tag = "Crescent Bar East"; dir = 4},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) "GZ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/flame/lighter/zippo,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/material/ashtray/bronze{pixel_x = -1; pixel_y = 1},/turf/unsimulated/floor{icon_state = "wood"},/area/centcom/bar) @@ -1783,7 +1783,7 @@ "Io" = (/obj/machinery/bodyscanner{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Ip" = (/obj/machinery/body_scanconsole,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Iq" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/o2,/obj/effect/floor_decal/corner/green{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) -"Ir" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 5; pixel_y = 5},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/wrench,/obj/effect/floor_decal/corner/blue/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) +"Ir" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 5; pixel_y = 5},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/tool/wrench,/obj/effect/floor_decal/corner/blue/full,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Is" = (/obj/effect/floor_decal/corner/blue{dir = 8},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "It" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/effect/floor_decal/corner/blue,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "Iu" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/effect/floor_decal/corner/blue/full{dir = 4},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1849,7 +1849,7 @@ "JC" = (/obj/machinery/atmospherics/unary/cryo_cell{layer = 3.3},/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JD" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JE" = (/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) -"JF" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/wrench,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) +"JF" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JG" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/OMinus,/turf/simulated/shuttle/floor/white,/area/shuttle/escape/centcom) "JH" = (/obj/structure/closet/hydrant{pixel_x = -30; pixel_y = 0},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) "JI" = (/obj/structure/closet/walllocker/emerglocker{pixel_x = 28},/turf/simulated/shuttle/floor/yellow,/area/shuttle/escape/centcom) @@ -1904,7 +1904,7 @@ "KF" = (/obj/machinery/door/blast/regular{id = "thunderdome"; name = "Thunderdome Blast Door"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) "KG" = (/obj/effect/landmark{name = "tdome1"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome/tdome1) "KH" = (/obj/structure/table/rack,/obj/item/clothing/under/color/green,/obj/item/clothing/shoes/brown,/obj/item/clothing/suit/armor/tdome/green,/obj/item/clothing/head/helmet/thunderdome,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/energy/sword/green,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/tdome) -"KI" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) +"KI" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) "KJ" = (/obj/structure/table/standard,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/effect/floor_decal/corner/pink{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KK" = (/obj/machinery/computer/operating,/obj/effect/floor_decal/corner/pink{dir = 6},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) "KL" = (/obj/machinery/computer/centrifuge,/obj/effect/floor_decal/corner/green{dir = 9},/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical) @@ -1955,7 +1955,7 @@ "LE" = (/obj/structure/bed/chair{dir = 1},/obj/structure/disposalpipe/segment,/obj/effect/landmark{name = "tdomeadmin"},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LF" = (/obj/machinery/computer/security/telescreen,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LG" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/sleeping_agent{pixel_x = 1},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) -"LH" = (/obj/item/weapon/wrench,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) +"LH" = (/obj/item/weapon/tool/wrench,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LI" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) "LJ" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/turf/unsimulated/floor{icon_state = "lino"},/area/tdome) "LK" = (/obj/structure/bed/chair,/turf/unsimulated/floor{icon_state = "lino"},/area/tdome/tdomeadmin) @@ -1994,12 +1994,12 @@ "Mr" = (/obj/machinery/dna_scannernew,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Ms" = (/obj/machinery/atmospherics/unary/cryo_cell{layer = 3.3},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Mt" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"Mu" = (/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/wrench,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/turf/simulated/shuttle/floor/white,/area/centcom/evac) +"Mu" = (/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Mv" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/nanopaste,/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/mask/surgical,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Mw" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/snacks/chips,/turf/unsimulated/beach/sand,/area/beach) "Mx" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/obj/item/weapon/reagent_containers/food/drinks/cans/cola,/turf/unsimulated/beach/sand,/area/beach) "My" = (/obj/item/weapon/beach_ball,/turf/unsimulated/beach/sand,/area/beach) -"Mz" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/centcom/evac) +"Mz" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/skipjack_station/start) "MA" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating/airless,/area/centcom/evac) "MB" = (/obj/machinery/portable_atmospherics/powered/scrubber,/turf/simulated/shuttle/plating,/area/centcom/evac) "MC" = (/obj/machinery/vending/engineering,/turf/simulated/shuttle/plating,/area/centcom/evac) @@ -2012,7 +2012,6 @@ "MJ" = (/obj/machinery/atmospherics/pipe/manifold/visible,/turf/simulated/shuttle/floor/white,/area/centcom/evac) "MK" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 9},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "ML" = (/obj/machinery/computer/operating,/turf/simulated/shuttle/floor/white,/area/centcom/evac) -"MM" = (/turf/space,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/skipjack_station/start) "MN" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "MO" = (/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "MP" = (/obj/machinery/bodyscanner{dir = 8},/turf/simulated/shuttle/floor/white,/area/centcom/evac) @@ -2031,7 +2030,7 @@ "Nc" = (/obj/structure/morgue{icon_state = "morgue1"; dir = 8},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Nd" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "endgame_exit"},/obj/item/toy/plushie/mouse{desc = "A plushie of a small fuzzy rodent."; name = "Woodrat"},/turf/unsimulated/beach/sand,/area/beach) "Ne" = (/obj/structure/bed/chair,/obj/effect/landmark{name = "endgame_exit"},/turf/unsimulated/beach/sand,/area/beach) -"Nf" = (/mob/living/simple_animal/crab/Coffee,/turf/unsimulated/beach/sand,/area/beach) +"Nf" = (/mob/living/simple_mob/animal/passive/crab/Coffee,/turf/unsimulated/beach/sand,/area/beach) "Nh" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_2_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 02"; req_access = list(13)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "Ni" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -30; pixel_y = 0},/turf/simulated/shuttle/floor/white,/area/centcom/evac) "Nj" = (/obj/item/clothing/head/collectable/paper,/turf/unsimulated/beach/sand,/area/beach) @@ -2253,7 +2252,7 @@ "Rr" = (/obj/machinery/media/jukebox,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "Rs" = (/obj/machinery/vending/hydronutrients,/turf/unsimulated/floor{icon_state = "grass0"; name = "grass"},/area/wizard_station) "Rt" = (/obj/structure/closet{icon_closed = "cabinet_closed"; icon_opened = "cabinet_open"; icon_state = "cabinet_closed"},/obj/item/clothing/under/psysuit,/obj/item/clothing/suit/wizrobe/psypurple,/obj/item/clothing/head/wizard/amp,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/wizard_station) -"Ru" = (/mob/living/simple_animal/mouse/gray{desc = "He looks kingly."; name = "Arthur"},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) +"Ru" = (/turf/simulated/floor/tiled/old_cargo/gray{desc = "He looks kingly."; name = "Arthur"},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Rv" = (/obj/structure/flora/pottedplant{icon_state = "plant-24"},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Rw" = (/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Rx" = (/turf/simulated/shuttle/plating,/area/skipjack_station/start) @@ -2301,8 +2300,8 @@ "Sn" = (/obj/structure/table/steel,/obj/item/clothing/glasses/regular,/obj/item/clothing/glasses/regular,/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "So" = (/obj/structure/bed/chair{dir = 8},/obj/machinery/light/small{dir = 4},/turf/simulated/shuttle/floor/red,/area/skipjack_station/start) "Sp" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Sq" = (/obj/item/weapon/wrench,/obj/item/weapon/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start) -"Sr" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/weapon/crowbar,/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Sq" = (/obj/item/weapon/tool/wrench,/obj/item/weapon/mop,/turf/simulated/shuttle/plating,/area/skipjack_station/start) +"Sr" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/item/weapon/tool/crowbar,/obj/item/device/suit_cooling_unit,/turf/simulated/shuttle/plating,/area/skipjack_station/start) "Ss" = (/obj/machinery/computer/shuttle,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "St" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "Su" = (/obj/machinery/door/airlock/maintenance_hatch,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/wizard_station) @@ -2514,33 +2513,33 @@ afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmDtbtbmDafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafrOsssssssOsOsOsOsOsOsOtRtuvetuuXssssssssssssssuYvfvfvfvfvfvfvfvfvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafmcmcmcmcmcafafafafpLvhqLqLqLviqLqLqLvjqLqLqLvkpLafafafafafafafafafmcmcmcmcmcmchVvdfVfVvdhVmcmcmcmcmc afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmDtbtbmDafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafrOsssssOsOvlvmvnvlvosOtututuvpuXssssssssssssssuYvfvqvqvqvqvqvqvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafmcmcmcmcafafafafpLpLpLpLpLpLrQqLqLqLrQpLpLpLpLpLpLafafafafafmJafmKmcmcmcmcmcmchVvdfVfVvdhVmcmcmcmcmc afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmDtbtbmDafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafrOrOrOrOrOsssssmuktutututututStutusOsOsOsOsOsOsOsOssssuYvfvqvrvrvrvrvrvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafmcmcmcmcafafafafpLvsvtvuvvvwpLvxqLvypLvzvAvAvBvCpLafafafafafmJmKmcmcmcmcmcmcmchVvdfVfVvdhVmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvDvDvDvDafafafafafafafafafafafafafafafafafvDvDvDvDvDafafafafafafafafafafafafafafafafafafvDvDvDvDvDvEvEvEvEvDvDvDvDvEvFvFvErOvGvGrOrOvGvGrOrOvGvGvGvGrOrOrOrOvGvGvGvGrOrOrOrOvGvGrOrOrOrOrOrOvHvHvIrOssssujukvJtutututusOtututututusOtuvKvLsOssssuYvfvqvMvrvrvrvNvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafmcmcmcafafafafafvOvPvPvPvPvPpLqLqLqLpLvQqLqLqLvRvSafafafafafnEafmcmcmcmcmcmcmchVhVvTvUhVhVmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvVvWvVvDafafafafafafafafafafafafafafafafafvDvVvVvVvDafafafafafafafafafafafafafafafafafvDvDvXvYvYvYvYvYvYvYvYvYvYvYvYvYvYvZvGvHvHvHvHvHvHvGvHvHvHvHvHvHwavHvHvHvHvHvHvHvHwavHvHvHwbvHvHvHvHvHvHvHvHwcsssssOsOsOwdwewfwgsOtRwfwfwftutStututusOssssuYvfvqvrvrwhwhwhwivfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafmcmcafafafafafafwjwkwlvPvPvPwmqLqLqLwnqLqLqLwowpwqafafafafafmJmKmKmcmcmcmcmcmcmchVhVhVhVmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafwrvDvDvDwrafafafafafafafafafafafafafafafafafwrvDvDvDwrvEvEvEvEwrafafafafafafafafafafafafvDvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYwsvHvHvHvHvHvHwsvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHwbvHvHvHvHvHvHvHvHwcsssssssOsOtutututusOtuwfwfwftusOwtsOsOsOssssuYvfvqvrvrvrvrvrwuvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafwvvPvPvPvPvPwwqLqLqLwxqLqLqLqLwywzafafafafafmJafafmKmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEmKmKmKmKafafafafafafafafafmKmKmKmKvEvYvYvYvEmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYwsvHvHvHvHvHvHwsvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHrOrOrOrOrOrOrOrOrOrOsssssssssOsOwAwBwCsOtututututusOsOsOsOssssssuYvfvqvrvrvrvrwDvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLwEvPvPvPwFrQuwwGuwpLwHwIwJqLwKpLafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafmKmKmKmKmKmKmKmKmKmKmKafafafvEvYvYvYvEmKafafafafafafafafafafafafafafmKmKvEvYvYvYwLwLwLwLwLwLwLwLwLwLwLwLwLwLwLwLvGvGwMvGvGrOvGvGvGvGvGwNwNvGvGrOrOvGvGvGvGrOrOvHvHrOwOwPrOwOwPrOwOwPrOsssssssssssOsOsOsOsOsOsOsOsOsOsOsOssssssssssuYvfvqvrvrvrvrvrwuvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLwQwRwSwTwUpLwVqLwWpLwXrQpLwYpLpLafafafafafafafmJafmKmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvDafafafafafafafafafafafafafafafvDvDvDvYvYvYwLwZxaxaxaxaxaxaxaxaxaxbxcxdxewLxfxfxfxgxhrOwNwNwNwNwNwNwNxixjrOxkxkxkxkxkxkrOvHvHrOxlxmrOxlxmrOxlxmrOssssssssssssssssssssssssssssssssssssssssssssuYvfvqvrvrxnxnxnxovfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLxpvPxqrQpLpLxrqLxspLpLpLxtqLxupLafafafafafafafmJmKmKmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvDafafafafafafafafafafafafafafafxxxwxvvYvYvYwLxyxzxzxzxAxAxzxzxzxzxBxzxzxCwLxDxfxfxfxfrOwNxExFxGxEwNwNwNwNrOxkxHxIxIxJxkvGvHvHrOxKxLrOxKxLrOxKxLrOssssssssssssssssssssssssssssssssssssssssssssuYvfvqvMvrvrvrvNvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLxMxNxOpLafpLxPxPxPpLafpLqqxQxRpLafafafafafafafmJafmKafmcmcmcmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvDafafafafafafafafafafafafafafafxxxwxxvYvYvYwLxyxzxzxSxTyoxVxzxzxWxbxXxYxZwLyaxfxfxfxfrOwNxEybybxEwNwNwNwNrOxkycuKydyexkvGvHvHrOyfrOrOyfrOrOyfrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOuYvfvqvqvrvrvrvqvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLxPxPxPpLafpLuIxUygpLafpLxPxPxPpLafafafafafafafmJmKmKmKmKmKmcmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvDafafafafafafafafafafafafafafafvDvDvDvYvYvYwLxyxzxzxSyoyoxVxzxzxCwLwLwLwLwLyjyjyjxfxfrOwNwNwNwNwNwNwNykxErOxkycuKuKyexkrOvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHylssssylvgvfvqvqymymymvqvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafmcmcafafafpLuIxUygpLafafafafafafafpLuIxUygpLafafafafafafafmJafmKafmKafafmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvEmKafafafafafafafafafafafafafafmKmKvEvYvYvYwLynxzxzxSyoypxVxzxzyqxbxcxdxewLyrysytxfxfrOwNxEybxGxEwNwNwNwNrOxkycuKuKyexkyuvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHvHylssssylvgvfvfyhyiyiyiyvvfvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafmcmcmcafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKvEvYvYvYvEmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYwLyyxzxzxzyzyzxzxzxzxzxBxzxzxCwLyAxfxfxfxfrOwNxEybyBxEwNwNwNwNrOxkycuKuKyexkrOvHvHrOvGvGvGvGvGvGvGvGvGrOrOrOrOrOrOrOrOrOrOrOrOvHvHrOrOrOrOrOrOrOrOuYvfvfvfvfvfvfvfvfvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafmcmcafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvEvEvEvEvEwrafafafafafafafafafafafafvDvYvYvYwLyCyDyEyFxzxzxzxWyEyExbxXxYxZyGyGyGyGyGyGyGyGyGyGyGyGyGyGyGyGrOxkycuKyHyexkvGvHvHrOvHyIyJyKyLvHyMyNyOrOyPyPyPyPyPyPyPyPyPyPrOvHvHrOafafafafafafafuYuYuYuYuYuYuYuYuYuYuYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvEmKafafafafafafafafafafafafafafafafvEvYvYvYwLwLwLwLyQxzxzyRySwLwLwLwLwLwLyGyTyUyVyGyWyXyXyXyXyXyXyXyXyYyZrOxkxKzazazbxkvGvHvHvGvHyIzczdyLvHzezfzgrOyPyPyPyPyPyPyPyPyPyPrOvHvHrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvEmKafafafafafafafafafafafafafafafafvDvYvYvYwLzhzixbzjxzxzxzzkwLzlzmznznzoyGyTyUzpyGyXyXyXyXzqzryXyXyXyXyXrOxkxkxkxkxkxkrOvHvHvGvHvHvHvHvHvHvHvHzsrOrOrOrOrOrOrOrOrOyPyPrOvHvHrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvEvEvEvEvEwrmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYwLyQxzztxzxzxzyRzuwLzvxSyoxVzwyGyUyUyUzxyXyXzyyXzqzryXzzzAzByXrOrOvGvGvGvGrOrOvHvHzCvHvHvHvHzDzEzFvHvHrOvHvHvHvHvHvHzGrOyPyPrOvHvHrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvEmKafafzHzHzHzHzHzHzIzIzIzHzHywmKmKvEzKvYvYwLzjxzztxWyEzLzMzNwLzOzPyoxzzwyGyUyUzQyGzRyXzSyXzqzryXzzzAzByXyGvHvHvHvHvHvHvHvHvHvGvHvHvHvHzFzFzGvHvHzTvHzUvHvHzUvHzFrOyPyPrOvHvHrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvDafafzHzHzVzWzHzXzYzXzXzXzYzZyxvDvDvDvYvYvYwLztztxbxbxbxbxbxbwLxbAbxzAcAdyGAeyUzQyGzRyXyXyXAfzryXzzAgzByXyGvHvHvHvHvHvHvHvHvHvGAhyLvHvHvHvHvHAivHrOzcAjAkzFAlvHzsrOyPyPrOvHvHrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvDafafzIzWAmzWAnzWzWzWzWzWzWzWAoApxwApvYvYvYwLzPxzAqArArArArArAsxbxbAtxbxbyGyGyGyGyGzqzqzqzqzqzryXzzAuzByXyGvGvGAvvGvGrOwavHvHrOAwyLvHvHvHvHvHrOrOrOrOvGvGvGvGvGrOrOAxAxrOvHvHrOafafafafAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcafafafafafafafafafafafafafmcmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEmKmKmKafafafafafafafafafafafmKmKmKvEvYvYvYvDafafzHzHAzzWzHAAABAAAAAAABACzJvDvDvDvYvYvYwLAbxzxzxzxzxzxzxzAqArAExzAqAFAGyGyXyXyXzrzrzrzrzryXyXyXyXyXyXyGAHAIvHAJAKrOALAMANAxAxAOAxrOvGAPvGrOAQAQAQARASATAUAVAQAQAQAxwavHvHrOafafafAyAyAWAWAWAWAWAWAXAXAXAWAWAWAWAXAXAXAYafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcafafafafafafafafafafafafafmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDafafmKafafafafafafafafafafafmKafafvDvYvYvYvEmKafafzHzHzHzHzHzHzIzIzIzHzHAamKmKvEvYvYvYwLAbxzxzyRyRyRyRyRxzxzxzxzxzyRBayGBbyXyXyXyXyXyXyXyXyXyXyXyXBbyGvHvHvHvHvHrOvHvHvHBcAQAQBdrOvHvHvHrOAQAQAQARBeBfBgAVAQAQAQAxvHvHvHrOafafafAyAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAYafafafafafafafafafafafafafafafafafafafafafafafafafafafBhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcafafafafafafafafafafafafafmcmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDafafmKafafafafafafafafafafafmKafafvDvYvYvYvEvEvEvEvEwrmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYwLAbxzxzBiBiBiBiBixzxzxzxzxzxzzwyGzAyXzzzAzAzByXyXzzzAzAzByXzAyGvHvHvHvHvHrOvHvHvHBcBjBkBlrOvHvHvHrOAQAQAQBmBnBoBpBqAQAQAQAxvHvHvHrOafafafAyAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAYafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcafafafafafafafafafafafafafmcmcmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDafafmKafafafafafafafafafafafmKafafvDvYvYvYvEmKafafafafafafafafafafafafafafafafvDvYvYvYwLAbxzxzyoxzxzxzyoxzAcBrzPxzxzzwyGBsyXzzAuAgzByXyXzzAuAgzByXBsyGvHBtBuBvBwrOvGBxvGAxByBzAxrOBABBBCrOAQAQAQAQAQAQAQAQAQAQAQAxvHvHvHrOafafafAyAWAWAWBDAyAyAyAYAYAYAyBEBEAyAYAYAYAyAyAyAyAYAYAYAyAyAYAYAYAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcafafafafafafafafafafafafafafmcmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEBFBFBFvEvEafmKafafafafafafafafafafafmKafvEvEBFBFBFvEvEafafafafafafafafafafafafafafafvEvEBFBFBFwLAbxzAczPxzxzAcBrzPzwwLwLBGBGwLyGBbyXyXyXyXyXyXyXyXyXyXyXyXBbyGBHrOrOrOrOrOAQAQAQAxBcBcAxrOrOrOrOrOAQAQAQAQAQAQAQAQAQAQAQAxvHvHvHrOafafafAyBIAWAWAyAyBJBJBKBJBKBJBLBLBJBKBJBKBJBJBMBMBMBMBMBMBMBMBMBMAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcafafafafafafafafafafafafafafmc -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYBNvYvYvEvEmKafafafafafafafafafafafmKvEvEvYBOBPBQvYvEvEafafafafafafafafafafafafafvEvEvYvYBPBQwLAExzzwwLAtAtwLwLAbzwwLBRxzxzBSyGzAyXzzzAzAzByXyXzzzAzAzByXzAyGrOrOAQAQAQAQAQAQAQAQAQAQAQAxAxrOrOAxAQAQAQAQAQAQAQAQAQAQAQAxvHvHvHrOafafafAyBIAWAWAyBJBJBTBTBTBTBUBVBVBWBTBTBTBUBJBJBXBXBXBXBXBXBXBXBXAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcafafafafafafafafafafafafafafaf -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYBYvYvYvXvEvEafafafafafafafafafafafvEvEvXvYvYBZvYvYvXvEvEafafafafafafafafafafafvEvEvXvYvYCaBQztxzxzzwwLzPxzzwwLAbzwwLCbxzxzBSyGBsyXzzAuAgzByXyXzzAuAgzByXBsyGrOCcAQAQAQAQAQAQAQAQAQAQAQCcAxAxrOAxCdAQAQAQAQAQAQAQAQAQCdAxwavHvHAyAyAyAyAyBIAWAWAYCeCfBVBVBVBVBVBVBVBVBVBVBVBVCgCeChChChChChChChChChAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcafafafafafafafafafafafafafafaf -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvDvYCavYvYvYvYvEvEvEvEvDvDvDvDvDvEvEvEvEvYvYvYCaBPCivYvYvYvEvEvEvEvDvDvDvDvDvEvEvEvEvYvYvYvYBPvYztxzxzzwwLAbxzCjwLAbzwwLCkxzxzBSyGyGClClClClyGCmCmyGClClClClyGyGAQAQAQAQCnCoCpCpCpCqCrAQAQAQAQAxAxAxAxAxAxAxAQAQAQAxAxAxAxAxrOvHvHCsAWAWAWAyBIAWAWAYCtCfBVBVBVBVBVBVBVBVBVBVBVBVCgCtBXBXBXBXBXBXBXBXBXAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcafafafafafafafafafafafafafafafafafaf -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvYvYvYvYCuxwCvCuxwCwCxCyxwCvCuxwCvvYvYvYvYvYvYvYvYvYCuxwCvCuxwCwCxCyxwCvCuxwCvvYvYvYvYvYvYwLCzxzAqxbAbCACBxbAEAqwLCCBrBrCDwLCECFCGCFCGBcAQAQBcCFCHCFCFCIAxAQAQAQCJCKCLCLCLCLCLCMCNAQAQAQAxCFCGCFCECGBcAQAQAQBcCGCFCFCOrOvHvHAyCPAWCQAYBIAWAWAyBJBJCRCRCRCRCSBVBVCTCRCRCRCSBJBJChChChChChChChChChAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvDvDvDvDafafafafafafafafafafafafafafafafafvDvDvDvDvDafafafafafafafafafafafafafafafafafafvDvDvDvDvDvEvEvEvEvDvDvDvDvEvFvFvErOvGvGrOrOvGvGrOrOvGvGvGvGrOrOrOrOvGvGvGvGrOrOrOrOvGvGrOrOrOrOrOrOAhAhvIrOssssujukvJtutututusOtututututusOtuvKvLsOssssuYvfvqvMvrvrvrvNvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafmcmcmcafafafafafvOvPvPvPvPvPpLqLqLqLpLvQqLqLqLvRvSafafafafafnEafmcmcmcmcmcmcmchVhVvTvUhVhVmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvVvWvVvDafafafafafafafafafafafafafafafafafvDvVvVvVvDafafafafafafafafafafafafafafafafafvDvDvXvYvYvYvYvYvYvYvYvYvYvYvYvYvYvZvGAhAhAhAhAhAhvGAhAhAhAhAhAhwaAhAhAhAhAhAhAhAhwaAhAhAhwbAhAhAhAhAhAhAhAhwcsssssOsOsOwdwewfwgsOtRwfwfwftutStututusOssssuYvfvqvrvrwhwhwhwivfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafmcmcafafafafafafwjwkwlvPvPvPwmqLqLqLwnqLqLqLwowpwqafafafafafmJmKmKmcmcmcmcmcmcmchVhVhVhVmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafwrvDvDvDwrafafafafafafafafafafafafafafafafafwrvDvDvDwrvEvEvEvEwrafafafafafafafafafafafafvDvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYwsAhAhAhAhAhAhwsAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhwbAhAhAhAhAhAhAhAhwcsssssssOsOtutututusOtuwfwfwftusOwtsOsOsOssssuYvfvqvrvrvrvrvrwuvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafwvvPvPvPvPvPwwqLqLqLwxqLqLqLqLwywzafafafafafmJafafmKmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEmKmKmKmKafafafafafafafafafmKmKmKmKvEvYvYvYvEmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYwsAhAhAhAhAhAhwsAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhrOrOrOrOrOrOrOrOrOrOsssssssssOsOwAwBwCsOtututututusOsOsOsOssssssuYvfvqvrvrvrvrwDvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLwEvPvPvPwFrQuwwGuwpLwHwIwJqLwKpLafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafmKmKmKmKmKmKmKmKmKmKmKafafafvEvYvYvYvEmKafafafafafafafafafafafafafafmKmKvEvYvYvYwLwLwLwLwLwLwLwLwLwLwLwLwLwLwLwLvGvGwMvGvGrOvGvGvGvGvGwNwNvGvGrOrOvGvGvGvGrOrOAhAhrOwOwPrOwOwPrOwOwPrOsssssssssssOsOsOsOsOsOsOsOsOsOsOsOssssssssssuYvfvqvrvrvrvrvrwuvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLwQwRwSwTwUpLwVqLwWpLwXrQpLwYpLpLafafafafafafafmJafmKmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvDafafafafafafafafafafafafafafafvDvDvDvYvYvYwLwZxaxaxaxaxaxaxaxaxaxbxcxdxewLxfxfxfxgxhrOwNwNwNwNwNwNwNxixjrOxkxkxkxkxkxkrOAhAhrOxlxmrOxlxmrOxlxmrOssssssssssssssssssssssssssssssssssssssssssssuYvfvqvrvrxnxnxnxovfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLxpvPxqrQpLpLxrqLxspLpLpLxtqLxupLafafafafafafafmJmKmKmcmcmcmcmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvDafafafafafafafafafafafafafafafxxxwxvvYvYvYwLxyxzxzxzxAxAxzxzxzxzxBxzxzxCwLxDxfxfxfxfrOwNxExFxGxEwNwNwNwNrOxkxHxIxIxJxkvGAhAhrOxKxLrOxKxLrOxKxLrOssssssssssssssssssssssssssssssssssssssssssssuYvfvqvMvrvrvrvNvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLxMxNxOpLafpLxPxPxPpLafpLqqxQxRpLafafafafafafafmJafmKafmcmcmcmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvDafafafafafafafafafafafafafafafxxxwxxvYvYvYwLxyxzxzxSxTyoxVxzxzxWxbxXxYxZwLyaxfxfxfxfrOwNxEybybxEwNwNwNwNrOxkycuKydyexkvGAhAhrOyfrOrOyfrOrOyfrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOrOuYvfvqvqvrvrvrvqvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafpLxPxPxPpLafpLuIvHxUpLafpLxPxPxPpLafafafafafafafmJmKmKmKmKmKmcmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvDafafafafafafafafafafafafafafafvDvDvDvYvYvYwLxyxzxzxSyoyoxVxzxzxCwLwLwLwLwLyjyjyjxfxfrOwNwNwNwNwNwNwNykxErOxkycuKuKyexkrOAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhylssssylvgvfvqvqymymymvqvqvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafmcmcafafafpLuIvHxUpLafafafafafafafpLuIvHxUpLafafafafafafafmJafmKafmKafafmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvEmKafafafafafafafafafafafafafafmKmKvEvYvYvYwLynxzxzxSyoypxVxzxzyqxbxcxdxewLyrysytxfxfrOwNxEybxGxEwNwNwNwNrOxkycuKuKyexkyuAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhAhylssssylvgvfvfygyhyhyhyivfvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafmcmcmcafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKvEvYvYvYvEmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYwLyyxzxzxzyzyzxzxzxzxzxBxzxzxCwLyAxfxfxfxfrOwNxEybyBxEwNwNwNwNrOxkycuKuKyexkrOAhAhrOvGvGvGvGvGvGvGvGvGrOrOrOrOrOrOrOrOrOrOrOrOAhAhrOrOrOrOrOrOrOrOuYvfvfvfvfvfvfvfvfvfvgafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafmcmcafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvEvEvEvEvEwrafafafafafafafafafafafafvDvYvYvYwLyCyDyEyFxzxzxzxWyEyExbxXxYxZyGyGyGyGyGyGyGyGyGyGyGyGyGyGyGyGrOxkycuKyHyexkvGAhAhrOAhyIyJyKyLAhyMyNyOrOyPyPyPyPyPyPyPyPyPyPrOAhAhrOafafafafafafafuYuYuYuYuYuYuYuYuYuYuYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvEmKafafafafafafafafafafafafafafafafvEvYvYvYwLwLwLwLyQxzxzyRySwLwLwLwLwLwLyGyTyUyVyGyWyXyXyXyXyXyXyXyXyYyZrOxkxKzazazbxkvGAhAhvGAhyIzczdyLAhzezfzgrOyPyPyPyPyPyPyPyPyPyPrOAhAhrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvEmKafafafafafafafafafafafafafafafafvDvYvYvYwLzhzixbzjxzxzxzzkwLzlzmznznzoyGyTyUzpyGyXyXyXyXzqzryXyXyXyXyXrOxkxkxkxkxkxkrOAhAhvGAhAhAhAhAhAhAhAhzsrOrOrOrOrOrOrOrOrOyPyPrOAhAhrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYxvxwxxafafafafafafafafafafafafafxxxwxvvYvYvYvEvEvEvEvEwrmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYwLyQxzztxzxzxzyRzuwLzvxSyoxVzwyGyUyUyUzxyXyXzyyXzqzryXzzzAzByXrOrOvGvGvGvGrOrOAhAhzCAhAhAhAhzDzEzFAhAhrOAhAhAhAhAhAhzGrOyPyPrOAhAhrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDvDvDafafafafafafafafafafafafafvDvDvDvYvYvYvEmKafafzHzHzHzHzHzHzIzIzIzHzHyvmKmKvEzKvYvYwLzjxzztxWyEzLzMzNwLzOzPyoxzzwyGyUyUzQyGzRyXzSyXzqzryXzzzAzByXyGAhAhAhAhAhAhAhAhAhvGAhAhAhAhzFzFzGAhAhzTAhzUAhAhzUAhzFrOyPyPrOAhAhrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvDafafzHzHzVzWzHzXzYzXzXzXzYzZywvDvDvDvYvYvYwLztztxbxbxbxbxbxbwLxbAbxzAcAdyGAeyUzQyGzRyXyXyXAfzryXzzAgzByXyGAhAhAhAhAhAhAhAhAhvGAhyLAhAhAhAhAhAiAhrOzcAjAkzFAlAhzsrOyPyPrOAhAhrOafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafafafafafafafafafafafafafafafafvEvYvYvYvDafafzIzWAmzWAnzWzWzWzWzWzWzWAoApxwApvYvYvYwLzPxzAqArArArArArAsxbxbAtxbxbyGyGyGyGyGzqzqzqzqzqzryXzzAuzByXyGvGvGAvvGvGrOwaAhAhrOAwyLAhAhAhAhAhrOrOrOrOvGvGvGvGvGrOrOAxAxrOAhAhrOafafafafAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyAyafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcafafafafafafafafafafafafafmcmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEmKmKmKafafafafafafafafafafafmKmKmKvEvYvYvYvDafafzHzHAzzWzHAAABAAAAAAABACyxvDvDvDvYvYvYwLAbxzxzxzxzxzxzxzAqArAExzAqAFAGyGyXyXyXzrzrzrzrzryXyXyXyXyXyXyGAHAIAhAJAKrOALAMANAxAxAOAxrOvGAPvGrOAQAQAQARASATAUAVAQAQAQAxwaAhAhrOafafafAyAyAWAWAWAWAWAWAXAXAXAWAWAWAWAXAXAXAYafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcafafafafafafafafafafafafafmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDafafmKafafafafafafafafafafafmKafafvDvYvYvYvEmKafafzHzHzHzHzHzHzIzIzIzHzHzJmKmKvEvYvYvYwLAbxzxzyRyRyRyRyRxzxzxzxzxzyRBayGBbyXyXyXyXyXyXyXyXyXyXyXyXBbyGAhAhAhAhAhrOAhAhAhBcAQAQBdrOAhAhAhrOAQAQAQARBeBfBgAVAQAQAQAxAhAhAhrOafafafAyAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAYafafafafafafafafafafafafafafafafafafafafafafafafafafafBhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcafafafafafafafafafafafafafmcmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDafafmKafafafafafafafafafafafmKafafvDvYvYvYvEvEvEvEvEwrmKmKmKmKmKmKmKmKmKmKmKafvDvYvYvYwLAbxzxzBiBiBiBiBixzxzxzxzxzxzzwyGzAyXzzzAzAzByXyXzzzAzAzByXzAyGAhAhAhAhAhrOAhAhAhBcBjBkBlrOAhAhAhrOAQAQAQBmBnBoBpBqAQAQAQAxAhAhAhrOafafafAyAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAYafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcafafafafafafafafafafafafafmcmcmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvDafafmKafafafafafafafafafafafmKafafvDvYvYvYvEmKafafafafafafafafafafafafafafafafvDvYvYvYwLAbxzxzyoxzxzxzyoxzAcBrzPxzxzzwyGBsyXzzAuAgzByXyXzzAuAgzByXBsyGAhBtBuBvBwrOvGBxvGAxByBzAxrOBABBBCrOAQAQAQAQAQAQAQAQAQAQAQAxAhAhAhrOafafafAyAWAWAWBDAyAyAyAYAYAYAyBEBEAyAYAYAYAyAyAyAyAYAYAYAyAyAYAYAYAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcafafafafafafafafafafafafafafmcmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEBFBFBFvEvEafmKafafafafafafafafafafafmKafvEvEBFBFBFvEvEafafafafafafafafafafafafafafafvEvEBFBFBFwLAbxzAczPxzxzAcBrzPzwwLwLBGBGwLyGBbyXyXyXyXyXyXyXyXyXyXyXyXBbyGBHrOrOrOrOrOAQAQAQAxBcBcAxrOrOrOrOrOAQAQAQAQAQAQAQAQAQAQAQAxAhAhAhrOafafafAyBIAWAWAyAyBJBJBKBJBKBJBLBLBJBKBJBKBJBJBMBMBMBMBMBMBMBMBMBMAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcafafafafafafafafafafafafafafmc +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYBNvYvYvEvEmKafafafafafafafafafafafmKvEvEvYBOBPBQvYvEvEafafafafafafafafafafafafafvEvEvYvYBPBQwLAExzzwwLAtAtwLwLAbzwwLBRxzxzBSyGzAyXzzzAzAzByXyXzzzAzAzByXzAyGrOrOAQAQAQAQAQAQAQAQAQAQAQAxAxrOrOAxAQAQAQAQAQAQAQAQAQAQAQAxAhAhAhrOafafafAyBIAWAWAyBJBJBTBTBTBTBUBVBVBWBTBTBTBUBJBJBXBXBXBXBXBXBXBXBXAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcafafafafafafafafafafafafafafaf +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYBYvYvYvXvEvEafafafafafafafafafafafvEvEvXvYvYBZvYvYvXvEvEafafafafafafafafafafafvEvEvXvYvYCaBQztxzxzzwwLzPxzzwwLAbzwwLCbxzxzBSyGBsyXzzAuAgzByXyXzzAuAgzByXBsyGrOCcAQAQAQAQAQAQAQAQAQAQAQCcAxAxrOAxCdAQAQAQAQAQAQAQAQAQCdAxwaAhAhAyAyAyAyAyBIAWAWAYCeCfBVBVBVBVBVBVBVBVBVBVBVBVCgCeChChChChChChChChChAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcmcmcmcmcafafafafafafafafafafafafafafaf +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvDvYCavYvYvYvYvEvEvEvEvDvDvDvDvDvEvEvEvEvYvYvYCaBPCivYvYvYvEvEvEvEvDvDvDvDvDvEvEvEvEvYvYvYvYBPvYztxzxzzwwLAbxzCjwLAbzwwLCkxzxzBSyGyGClClClClyGCmCmyGClClClClyGyGAQAQAQAQCnCoCpCpCpCqCrAQAQAQAQAxAxAxAxAxAxAxAQAQAQAxAxAxAxAxrOAhAhCsAWAWAWAyBIAWAWAYCtCfBVBVBVBVBVBVBVBVBVBVBVBVCgCtBXBXBXBXBXBXBXBXBXAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafmcmcmcmcmcafafafafafafafafafafafafafafafafafaf +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvYvYvYvYCuxwCvCuxwCwCxCyxwCvCuxwCvvYvYvYvYvYvYvYvYvYCuxwCvCuxwCwCxCyxwCvCuxwCvvYvYvYvYvYvYwLCzxzAqxbAbCACBxbAEAqwLCCBrBrCDwLCECFCGCFCGBcAQAQBcCFCHCFCFCIAxAQAQAQCJCKCLCLCLCLCLCMCNAQAQAQAxCFCGCFCECGBcAQAQAQBcCGCFCFCOrOAhAhAyCPAWCQAYBIAWAWAyBJBJCRCRCRCRCSBVBVCTCRCRCRCSBJBJChChChChChChChChChAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvYvYvYvYCuxwCvCuxwCwCUCyxwCvCuxwCvvYvYvYvYvYvYvYvYvYCuxwCvCuxwCwCUCyxwCvCuxwCvvYvYvYvYvYvYwLwLztztxbCVCWxbxbztztwLwLwLwLwLwLBcBcBcBcBcBcAQAQBcBcBcBcBcBcAxAQAQCXCYCLCLCLCLCLCLCLCZCrAQAQAxBcBcBcBcBcBcAQAQAQBcBcBcBcBcAxDaDaAyAWDbDcAYBIAWAWAyAyBJBJBKBJBKBJBLBLBJBKBJBKBJBJBMBMBMBMBMBMBMBMBMBMAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDDdDevDvYvYvYvYDfDgDhDfDgDiDjDkDgDhDfDgDhvYvYvDDlDdDevDvYvYDfDgDhDfDgDiDjDkDgDhDfDgDhvYvYvYvYvYvYvYvYvYvYAQAQAQAQDmAQAQDmAQAQAQCcAxCcAQAQAQAQAQAQAQAQAQAQAQAQCcAxAQAQDnCLCLCLDoDpDqCLCLCLDnAQAQAxCdAQAQAQAQAQAQAQAQAQAQAQAQCdAxAQAQAYDrDsAYAyAWAWAWBDAyAyAyAYAYAYAyDtDtAyAYAYAYAyAyAyAyAYAYAYAyAyAYAYAYAyafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDDuxwDvvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYDwDxDuxwDyvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYAQAQAQAQDmAQAQDmAQAQAQAQDzAQAQAQAQAQAQAQAQAQAQAQAQAQAQDzAQAQDACLCLDoDBDBDBDqCLCLDCAQAQDzAQAQAQAQAQAQAQAQAQAQAQAQAQAQAQAQAQDDAWAWAWDEAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAWAYafafafafafafafafafafafafafafafafafafafafafafafafafafafDFlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYBhlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlY @@ -2574,8 +2573,8 @@ afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvEvYvYvYvEmKmKmKmKafafafafafafafafafmKmKmKmKvEvYvYvYvEmKmKEUJPJPEUJQJRJEJEJSEUJPJPEUmKmKvEvYvYvYEhEhJTEhEjEjEhEhIHEhEhJUJVJWEjJXJYHzJZJZKaGNHeHeGNGNKbKbKbKbKbGNKcKcKcKcKcKcKcKcKcKcKcKcKcKdKcGNKeKeKeKeKeGNHeHeHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafwrvDvDvDwrafafafafafafafafafafafafafafafafafwrvDvDvDwrafafEUKfKgEUKhJEKiKjKkEUKlKmEUafafwrvYvYvYEhKnEuJhKoKpEhFtEuEvHzEyEuEvEjEyEuEuEuEuEKGNHeGNGNGNKqKqKqKqKqGNKrKsKsKsKsKsKsKsKsKsKsKsKsKtKrGNKqKqKqKqKqGNGNGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvVvWvVvDafafafafafafafafafafafafafafafafafvDvVvVvVvDafafEUKuKuEUKvKwJEKxKyEUKuKuEUafafvDvYvYvYEhKzEuEuEuKAEhFtEuEuEzFYEuEuKBEuEuEuEuEuEKGNHeGNKCKDKEKEKEKEKEKFKsKsKsKsKsKsKsKsKsKsKsKsKsKtKsKFKGKGKGKGKGKDKHGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvDvDvDvDafafafafafafafafafafafafafafafafafvDvDvDvDvDafafEUADADEUEUKuKuKuEUEUADADEUafafvDvYvYvYEhKJEuEuIXKKEhKLEuEuEKKMEuKNEjFnEuEMEuEuEKGNHeGNKCKDKEKOKEKOKEKFKsKsKsKsKsKsKsKsKsKsKsKsKsKtKsKFKGKPKGKPKGKDKHGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafEUADADADEUafafafafafafvEvYvYvYEhJgEuEuEuKQEhKREuEuKSKTEuKUEjKVKWKXKYKYKZGNHeGNKCKDKEKELaKEKEKFKsKsKsKsKsKsKsLbKsKsKsKsKsKtKsKFKGKGLcKGKGKDKHGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvDvDvDvDafafafafafafafafafafafafafafafafafvDvDvDvDvDafafEUAaAaEUEUKuKuKuEUEUAaAaEUafafvDvYvYvYEhKJEuEuIXKKEhKLEuEuEKKMEuKNEjFnEuEMEuEuEKGNHeGNKCKDKEKOKEKOKEKFKsKsKsKsKsKsKsKsKsKsKsKsKsKtKsKFKGKPKGKPKGKDKHGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafEUAaAaAaEUafafafafafafvEvYvYvYEhJgEuEuEuKQEhKREuEuKSKTEuKUEjKVKWKXKYKYKZGNHeGNKCKDKEKELaKEKEKFKsKsKsKsKsKsKsLbKsKsKsKsKsKtKsKFKGKGLcKGKGKDKHGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYEhLdLeLfLgLhEhLiLjLkLlLmFYIGEhEhEhEhEhEhEhGNHeGNKCKDKEKEKEKEKEKFKsKsKsKsKsKsLnLoLnKsKsKsKsKtKsKFKGKGKGKGKGKDKHGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYEhEhEhEhEhEhEhEhEhEhEhEhEhEhEhafafafafafafGNHeGNKCKDKEKOKEKOKEKFKsKsKsKsKsKsLpLqLrKsKsKsKsKtKsKFKGKPKGKPKGKDKHGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafvDvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvYvEafafafafafafGNHeGNHeKDKEKEKEKEKEKFKsKsKsKsKsKsKsLsKsKsKsKsKsKtKsKFKGKGKGKGKGKDHeGNHeGNafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf @@ -2593,11 +2592,11 @@ afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafMeMeMeMeMeMeMeafafafafafafafafafafafafafafafafvDvYvYvDafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYLYLYMgMgLYLYLYLYLYLYLYLYLYLYLYLYLXah afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafMeMeMeMeMeMeMeMeMeafMhMiMiMiMiMiMiMiMiMiMiMiMiMhvDvYvYvDMhMhMhMhMhMhMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYLYMgMjMkMgLYLYLYLYLYLYLYLYLYLYLYLXah afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafMhMhMhMhMhMlMiMiMiMlMiMiMiMlMmMeMeMeMeMeMeMeMeMeMmMhMnMoMoMoMoMoMoMoMoMoMoMoMhvEvFvFvEMhMpMqMrMsMsMtMuMvMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYLYMgMwMxMgLYLYMfLYMyLYLYLYLYLYLYLXah -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafAZMAMnMBMCMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMoMoMoMoMoMoMoMoMoMoMoMoMhMhMGMGMhMhMHMHMHMIMJMKMHMHMLMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYLYLYMgMgLYLYLYLYLYLYLYLYLYLYLYLYLXah -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafKIMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMoMoMoMoMoMoMoMoMoMoMoMoMhMNMOMOMNMhMPMQMHMHMHMHMHMHMRMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYMdLYLYLYLYLYLYLYLYLYLYLYLYLYMbLYLYLXah -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafKIMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMoMoMoMoMoMoMoMoMoMoMoMoMhMOMSMSMOMhMHMHMHMTMUMVMHMHMWMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYMfMdLYLYLYLYLYLYLYLYLYLYLYLYMdLYLYLXah -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafKIMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMnMoMoMoMoMoMoMoMoMoMoMoMhMOMSMSMOMhMXMYMHMZNaNbMHMHMHMHMHNcMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYLYLYLYLYNdLYNeLYNeLYNfLYLYLYLYLYLXah -afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafMzMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMhMhMhMhMhNhNhMhMhMhMhMhMhMOMSMSMOMhNiMHMHMHMHMHMHMHMHMHMHNcMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYNjLYLYLYLYLYLYLYLYLYLYLYLYLYLYLYLXah +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafADMAMnMBMCMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMoMoMoMoMoMoMoMoMoMoMoMoMhMhMGMGMhMhMHMHMHMIMJMKMHMHMLMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYLYLYMgMgLYLYLYLYLYLYLYLYLYLYLYLYLXah +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafAZMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMoMoMoMoMoMoMoMoMoMoMoMoMhMNMOMOMNMhMPMQMHMHMHMHMHMHMRMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYMdLYLYLYLYLYLYLYLYLYLYLYLYLYMbLYLYLXah +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafAZMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMoMoMoMoMoMoMoMoMoMoMoMoMhMOMSMSMOMhMHMHMHMTMUMVMHMHMWMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYMfMdLYLYLYLYLYLYLYLYLYLYLYLYMdLYLYLXah +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafAZMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMnMoMoMoMoMoMoMoMoMoMoMoMhMOMSMSMOMhMXMYMHMZNaNbMHMHMHMHMHNcMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYLYLYLYLYNdLYNeLYNeLYNfLYLYLYLYLYLXah +afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafKIMAMnMnMnMhMDMDMDMhMEMEMEMhMmMFMFMFMFMFMFMFMFMFMmMhMhMhMhMhMhNhNhMhMhMhMhMhMhMOMSMSMOMhNiMHMHMHMHMHMHMHMHMHMHNcMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXLYLYLYNjLYLYLYLYLYLYLYLYLYLYLYLYLYLYLYLXah afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafMhMhMhMhNkMhMhMhNlMhMhMhNmMhMhMhMhMhMhMhNnMhMhMhMhMhMhNoMOMOMOMONpMOMOMOMOMOMNMhMOMSMSMOMhMXMYMHMHNqNqNrNsNsNtMhMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahLXNuNuNuNuNuNuNuNuNuNuNuNuNuNuNuNuNuNuNuLXah afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafNvMNMOMOMOMOMOMONwMOMOMONxMOMOMOMOMOMOMONyMOMONzNANBMhMOMSMSMSMSMSMSMSMSMSMSMOMhMOMSMSMOMlNCNCNDNDNCNCNCMhMhMhMhNENFNGNCafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNHNINININININININININININININININININININHah afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafNvMOMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMONJMOMSNKNKNKNKNKNKNKNKMSMONJMOMSMSMONJMOMOMOMOMOMOMOMOMOMONCNLNMNNNCafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah @@ -2605,11 +2604,11 @@ afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf afafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafNvMOMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMSMONJMOMSNVNVNVNVNVNVNVNVMSNTNDMOMSMSMONJMOMOMOMOMOMOMOMOMOMONCNWNMNXNCafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah lYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYlYafafafafafafafafafafNvMNMOMOMOMOMOMONYMOMOMONZMOMOMOOaMOMOMOObMOMOMOMOMNMhMOMSMSMSMSMSMSMSMSMSMSNTMhMOMSMSMOMlNCNCOcNCNCMhNCNCNQNQMhOdNFOeNCafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah ahahahahahahahahahahahOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfahahahahahahahlYafafafafafafafafafafMhMhMhMhNkMhMhMhOgMhMhMhOhMhMhMhOiMhMhMhOjMhMhMhOkMhMhMOMOMOMOMOOlMOMOMOMOMOMNMhMOMSMSMOMhOmOnOoOpOqMhOrMSMSMSMhMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah -ahmcmcmcmcmcmcmcmcmcmcOsOsOsOsOsOfOtOuOvOfOsOsOsOsOsOsOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafAZMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhMhMhMhMhMhOBOBMhMhMhMhMhMhMOMSMSMOMhOCOoOoOoOCMhODMSMSMSMSOEMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah -ahmcmcmcmcmcmcmcmcmcmcOsOsOsOsOsOfOFOuOuOfOsOsOsOsOsOsOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafKIMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhOGOGOGOGOGOGOGOGOGOGOGMnMhMOMSMSMOMhOHOIOoOoOoMhOrMSMSOrMSOrMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah -ahmcmcmcmcmcmcOsOsOsOfOfOfOfOsOfOfOfOfOJOfOfOfOfOfOfOfOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafKIMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhOGOGOGOGOGOGOGOGOGOGOGOGMhOKNKNKOKMhNCNCOLNCNCMhODMSOrMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah -ahmcmcmcOsOsOsOsOMOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOfOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafKIMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhOGOGOGOGOGOGOGOGOGOGOGOGMhONONONONMhOOOoOoOoOOMhOrMSODMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah -ahmcmcmcOsOsOuOMOMOMOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOfOPOQOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafMzMAMnOROSMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhOTOUOVMhOGOGOGOGOGOGOGOGOGOGOGOGMhMhOWOXMhMhOoOoOoOoOoMhODMSOrMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah +ahmcmcmcmcmcmcmcmcmcmcOsOsOsOsOsOfOtOuOvOfOsOsOsOsOsOsOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafADMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhMhMhMhMhMhOBOBMhMhMhMhMhMhMOMSMSMOMhOCOoOoOoOCMhODMSMSMSMSOEMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah +ahmcmcmcmcmcmcmcmcmcmcOsOsOsOsOsOfOFOuOuOfOsOsOsOsOsOsOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafAZMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhOGOGOGOGOGOGOGOGOGOGOGMnMhMOMSMSMOMhOHOIOoOoOoMhOrMSMSOrMSOrMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah +ahmcmcmcmcmcmcOsOsOsOfOfOfOfOsOfOfOfOfOJOfOfOfOfOfOfOfOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafAZMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhOGOGOGOGOGOGOGOGOGOGOGOGMhOKNKNKOKMhNCNCOLNCNCMhODMSOrMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah +ahmcmcmcOsOsOsOsOMOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOfOsOsOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafAZMAMnMnMnMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhMSMSMSMhOGOGOGOGOGOGOGOGOGOGOGOGMhONONONONMhOOOoOoOoOOMhOrMSODMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah +ahmcmcmcOsOsOuOMOMOMOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOfOPOQOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafKIMAMnOROSMhOwOwOwOxOyOyOyOxOzOzOzOxOAOAOAMhOTOUOVMhOGOGOGOGOGOGOGOGOGOGOGOGMhMhOWOXMhMhOoOoOoOoOoMhODMSOrMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah ahmcmcmcOsOsOMOMOMOsOsOsOfOfOfOfOJOfOfOfOfOJOfOuOuOuOJOYOZOsOsOsmcmcahmcmcmcmclYafafafafafafafafafafafMhMhMhMhMhMlMiMiMiMlMiMiMiMlMiMiMiMlMiMiMiMlMhMhMhMhOGOGOGOGOGOGOGOGOGOGOGMnMhafafafafMhOOOoOOOoOOMhOrMSMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah ahmcmcmcOsOMOMOsOsOsOsOsOsOsOsOfOuOuOFOfPaOuOfOuOuOuOJOYPbOsOsOfmcmcahmcmcmcmclYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafMhMiMiMiMiMiMiMiMiMiMiMiMiMhafafafafMhMhMhMhMhMhMhMhMhMhafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah ahmcmcmcOsOMOsOsOsmcmcOsOfOfOfOfPcOuOtOfPcOtOfOuOuOuOfOYOYOYPdOfmcmcahmcmcmcaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafahNONPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNPNOah @@ -2637,13 +2636,13 @@ ahmcmcmcafafafafafafafafafafRRRSRxRTRURxPVRVRWQWQWQWQWRXPVRxRYRxRZRwRRafafafaflY ahmcmcmcafafafafafafafafafafSlRSRxRxPVRzPVPVPVSmSnSoPVPVPVRzPVSpSqSrSlafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafPRSsQDStQDQDQDQDQRRNQDPQQDRNQRQDQDQDQDSuRQRQPRafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcafafafafafafafafafPVPVSvSwSwPVQWSxQWRJSySzSARJSBSCQWPVSDSESFPVPVafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafPRSGQDRNRNQDSHSIPQSJRNQDRNSKPQSLRNQDRNPQSMSNPRafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcafafafafmcmcafafafPVPVSOSOPVPVQWQWQWRRSySPSARRQWQWSQPVPVSOSOPVPVafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafPQQDPQPQPQQRPQPQPQSRSSRNSTSUPQPQPQQRPQPQPQSVPQafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf -ahmcmcmcafafafafmcmcafafafafPVMMMMPVPVSXSYQWSlSZQWSZSlQWQWTaPVPVMMMMPVafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafPQPQPQTbTcQDTdTePQPQPQQRPQPQPQTfTgQDThTiPQPQPQafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf +ahmcmcmcafafafafmcmcafafafafPVMzMzPVPVSXSYQWSlSZQWSZSlQWQWTaPVPVMzMzPVafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafPQPQPQTbTcQDTdTePQPQPQQRPQPQPQTfTgQDThTiPQPQPQafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcafafafafmcmcafafafafafafafafPVQWQWQWPVPVRzPVPVTjQWTkPVafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafPRTlQDQDQDQDQDTmPQTnToTpPQTqQDQDQDQDQDQDPRafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcafafafafafafafafafafafafafafPVQWQWSQPVTrQWTsPVQWQWTtPVafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafPQPQRQTuRQTvQDTwPQTxTyTzPQTgQDTATBTCTDPQPQafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcmcafafafafafafafafafafafafafPVPVTEQWPVTFQWTGPVTHTIPVPVafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafPQRQTJTKTLQDQDQRTMQDTNQRQDQDTOTPTQTDPQafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcmcmcafafafafafafafafafafafafPVPVPVPVPVTRTSTTPVPVPVPVPVafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafPQPQTURQRQQDTVPQTxQDTzPQRNQDTWTXTYPQPQafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcmcmcafafafafmcmcafafafafafafafafPVPVSOSOSOSOSOPVPVafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafafPQPQTZUaQDUbPQPQQRPQPQRNQDTDTDPQPQafafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf -ahmcmcmcmcmcafafafafmcmcmcafafafafafafafafPVMMMMMMMMMMPVafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafafafPQPQPQUcUdPQQDQDQDPQUeUfPQPQPQafafafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf +ahmcmcmcmcmcafafafafmcmcmcafafafafafafafafPVMzMzMzMzMzPVafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafafafPQPQPQUcUdPQQDQDQDPQUeUfPQPQPQafafafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcmcmcafafafafmcmcmcafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafafafafafPQPRPQPQUgUhUiPQPQPRPQafafafafafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcmcmcafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafafafafafafafPQPQPQPRPQPQPQafafafafafafafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf ahmcmcmcafafafafafafafafafafmcmcafafafafafafafafafafafafafafafafafafafafafafaflYafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafPIafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafafaf diff --git a/maps/yw/cryogaia.dmm b/maps/yw/cryogaia.dmm index 0608f2f10d..ef747824fe 100644 --- a/maps/yw/cryogaia.dmm +++ b/maps/yw/cryogaia.dmm @@ -29,7 +29,7 @@ "aaC" = (/turf/snow/gravsnow{name = "gravel"},/area/space) "aaD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/space) "aaE" = (/obj/machinery/hologram/holopad,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/space) -"aaF" = (/mob/living/simple_animal/hostile/giant_spider/frost,/turf/snow/gravsnow{name = "gravel"},/area/space) +"aaF" = (/obj/effect/spider/eggcluster/small/frost,/turf/snow/gravsnow{name = "gravel"},/area/space) "aaG" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/surgical/bonegel,/obj/item/weapon/surgical/bonesetter,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/white,/area/space) "aaH" = (/obj/machinery/computer/operating,/turf/simulated/floor/tiled/white,/area/space) "aaI" = (/obj/structure/closet,/obj/item/clothing/under/pj/blue,/obj/item/clothing/under/pj/blue,/turf/simulated/floor/tiled/white,/area/space) @@ -237,7 +237,7 @@ "aeC" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/shield_diffuser,/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "arrivals_dock_north_outer"; locked = 1; name = "Arrivals Airlock"; req_access = list(13)},/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "arrivals_dock_north_airlock"; name = "exterior access button"; pixel_x = 4; pixel_y = -26; req_one_access = list(13)},/obj/machinery/mech_sensor{dir = 8; frequency = 1380; id_tag = "arrival_dock_north_mech"; pixel_y = -19},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/entry/D2) "aeD" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled/dark,/area/space) "aeE" = (/obj/structure/showcase/yw/plaque,/turf/simulated/floor/tiled,/area/space) -"aeF" = (/mob/living/simple_animal/retaliate/gaslamp/snow,/turf/snow/snow2,/area/space) +"aeF" = (/turf/snow,/turf/snow/snow2,/area/space) "aeG" = (/obj/effect/overlay/snow/floor/edges{dir = 8},/obj/effect/overlay/snow/floor/edges{dir = 1},/turf/snow/gravsnow,/area/space) "aeH" = (/obj/effect/overlay/snow/floor/edges3,/obj/effect/overlay/snow/floor/edges,/obj/effect/overlay/snow/floor/edges{dir = 4},/turf/snow/gravsnow,/area/space) "aeI" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/closet/crate/solar,/turf/simulated/floor/plating,/area/space) @@ -341,14 +341,14 @@ "agC" = (/obj/item/toy/figure/cmo,/obj/structure/table/reinforced,/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/space) "agD" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills,/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/space) "agE" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/space) -"agF" = (/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/mob/living/simple_animal/cat/fluff/Runtime,/turf/simulated/floor/tiled/white,/area/space) +"agF" = (/obj/effect/floor_decal/corner/paleblue/diagonal,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/mob/living/simple_mob/animal/passive/cat/runtime,/turf/simulated/floor/tiled/white,/area/space) "agG" = (/obj/effect/floor_decal/corner/blue{dir = 6},/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled/white,/area/space) "agH" = (/obj/machinery/computer/transhuman/resleeving,/obj/effect/floor_decal/corner/lime/full{dir = 8},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/space) "agI" = (/obj/machinery/clonepod/transhuman,/obj/item/device/radio/intercom/department/medbay{pixel_y = 32},/obj/effect/floor_decal/corner/lime{dir = 5},/turf/simulated/floor/tiled,/area/space) "agJ" = (/obj/machinery/transhuman/resleever,/obj/effect/floor_decal/corner/lime{dir = 5},/turf/simulated/floor/tiled,/area/space) "agK" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/storage/laundry_basket,/obj/effect/floor_decal/corner/lime/full{dir = 1},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/space) "agL" = (/obj/structure/grille,/obj/structure/window/reinforced/polarized{dir = 4; id = "resleeve_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "resleeve_tint"},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized{dir = 1; id = "resleeve_tint"},/obj/structure/window/reinforced/polarized{id = "resleeve_tint"},/turf/simulated/floor/plating,/area/space) -"agM" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/wrench,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/space) +"agM" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/tool/wrench,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/space) "agN" = (/obj/machinery/atmospherics/unary/freezer{dir = 2; icon_state = "freezer"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/space) "agO" = (/obj/machinery/atmospherics/unary/cryo_cell{dir = 8; layer = 3.3},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled,/area/space) "agP" = (/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/space) @@ -395,7 +395,7 @@ "ahE" = (/obj/structure/showcase/sign,/turf/snow/snow2,/area/space) "ahF" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/dark,/area/space) "ahG" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/power/terminal{icon_state = "term"; dir = 1},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/space) -"ahH" = (/mob/living/simple_animal/retaliate/gaslamp/snow,/turf/simulated/floor/snow/snow2,/area/space) +"ahH" = (/turf/snow,/turf/simulated/floor/snow/snow2,/area/space) "ahI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/turf/simulated/floor/tiled,/area/space) "ahJ" = (/turf/simulated/shuttle/wall/voidcraft/red,/area/space) "ahK" = (/obj/machinery/door/airlock/engineering{name = "Medbay Substation"; req_one_access = list(11,24,5)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/turf/simulated/floor,/area/space) @@ -617,7 +617,7 @@ "alS" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/tiled,/area/space) "alT" = (/obj/structure/filingcabinet/medical{desc = "A large cabinet with hard copy medical records."; name = "Medical Records"},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "alU" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/secure/large/reinforced{anchored = 1; desc = "A hefty, reinforced metal crate with an electronic locking system. It's securely bolted to the floor and cannot be moved."; name = "gun safe"; req_access = list(1)},/obj/item/weapon/gun/projectile/revolver/consul,/obj/item/ammo_magazine/s44,/obj/item/ammo_magazine/s44,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) -"alV" = (/obj/machinery/hologram/holopad,/mob/living/simple_animal/mouse/brown/Tom,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) +"alV" = (/obj/machinery/hologram/holopad,/mob/living/simple_mob/animal/passive/mouse/brown/Tom,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "alW" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "alX" = (/obj/structure/cable{icon_state = "4-8"},/turf/simulated/floor/tiled,/area/space) "alY" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/overlay/snow/floor,/turf/simulated/floor/airless,/area/space) @@ -869,7 +869,7 @@ "aqK" = (/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) "aqL" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 28},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/space,/area/space) "aqM" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/space) -"aqN" = (/obj/structure/table/glass,/obj/item/device/violin,/turf/simulated/floor/wood,/area/space) +"aqN" = (/obj/structure/table/glass,/obj/item/device/instrument/violin,/turf/simulated/floor/wood,/area/space) "aqO" = (/obj/structure/table/woodentable,/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor/carpet/blue,/area/space) "aqP" = (/obj/structure/bed/chair/comfy/brown{dir = 4},/turf/simulated/floor/carpet/blue,/area/space) "aqQ" = (/obj/structure/bed/psych,/obj/machinery/light,/turf/simulated/floor/carpet/blue,/area/space) @@ -1171,7 +1171,7 @@ "awA" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/bridge) "awB" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/bridge) "awC" = (/obj/machinery/door/airlock/research{id_tag = "researchdoor"; name = "Research Division Access"; req_access = list(47)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/white,/area/rnd/research) -"awD" = (/obj/effect/floor_decal/borderfloorblack{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/obj/machinery/camera/network/security{dir = 4},/obj/structure/table/steel,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/device/retail_scanner/security,/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 30},/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled/dark,/area/security/warden) +"awD" = (/obj/effect/floor_decal/borderfloorblack{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/obj/machinery/camera/network/security{dir = 4},/obj/structure/table/steel,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/device/retail_scanner/security,/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 30},/obj/machinery/firealarm{dir = 8; pixel_x = -24; pixel_y = 0},/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled/dark,/area/security/warden) "awE" = (/obj/effect/floor_decal/borderfloorblack{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/closet/secure_closet/warden,/obj/effect/floor_decal/industrial/outline/grey,/obj/item/weapon/gun/projectile/shotgun/pump/combat{ammo_type = /obj/item/ammo_casing/a12g/beanbag; desc = "Built for close quarters combat, the Hesphaistos Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. This one has 'Property of the Warden' inscribed on the stock."; name = "warden's shotgun"},/turf/simulated/floor/tiled/dark,/area/security/warden) "awF" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/warden) "awG" = (/turf/simulated/floor/tiled/dark,/area/security/warden) @@ -1211,7 +1211,7 @@ "axo" = (/obj/effect/wingrille_spawn/reinforced,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/steel,/area/space) "axp" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/hos,/turf/simulated/floor/carpet,/area/space) "axq" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green{dir = 2; pixel_x = -10; pixel_y = 12},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/carpet,/area/space) -"axr" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/barman_recipes,/obj/item/clothing/head/that{pixel_x = 4; pixel_y = 6},/obj/item/weapon/screwdriver,/obj/item/weapon/flame/lighter/zippo,/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/obj/machinery/button/remote/blast_door{id = "bar"; name = "Bar Shutters"; pixel_x = -26; pixel_y = 0},/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/turf/simulated/floor/lino,/area/crew_quarters/bar) +"axr" = (/obj/structure/table/reinforced,/obj/item/weapon/book/manual/barman_recipes,/obj/item/clothing/head/that{pixel_x = 4; pixel_y = 6},/obj/item/weapon/tool/screwdriver,/obj/item/weapon/flame/lighter/zippo,/obj/machinery/light_switch{pixel_x = -36; pixel_y = 0},/obj/machinery/button/remote/blast_door{id = "bar"; name = "Bar Shutters"; pixel_x = -26; pixel_y = 0},/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/turf/simulated/floor/lino,/area/crew_quarters/bar) "axs" = (/turf/simulated/floor/lino,/area/crew_quarters/bar) "axt" = (/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/open,/area/space) "axu" = (/obj/machinery/chemical_dispenser/bar_alc/full{pixel_y = 32},/obj/structure/table/reinforced,/turf/simulated/floor/lino,/area/crew_quarters/bar) @@ -1233,7 +1233,7 @@ "axK" = (/turf/simulated/floor/tiled/steel,/area/space) "axL" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/space) "axM" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/space) -"axN" = (/mob/living/simple_animal/otie/security,/turf/simulated/floor/tiled/steel,/area/space) +"axN" = (/obj/item/clothing/suit/armor/vest/ert/security,/turf/simulated/floor/tiled/steel,/area/space) "axO" = (/obj/structure/flora/pottedplant,/turf/simulated/floor/tiled,/area/space) "axP" = (/obj/machinery/door/airlock/glass_security{name = "Firing Range"; req_access = list(1)},/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/space) "axQ" = (/obj/machinery/chemical_dispenser/bar_soft/full{pixel_y = 32},/obj/structure/table/reinforced,/turf/simulated/floor/lino,/area/crew_quarters/bar) @@ -1325,7 +1325,7 @@ "azy" = (/turf/simulated/floor/carpet,/area/space) "azz" = (/obj/machinery/vending/coffee,/turf/simulated/floor/carpet,/area/space) "azA" = (/obj/machinery/recharge_station,/turf/simulated/floor/wood,/area/crew_quarters/bar) -"azB" = (/obj/structure/closet/crate,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled,/area/space) +"azB" = (/obj/structure/closet/crate,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled,/area/space) "azC" = (/obj/structure/table/woodentable,/obj/machinery/button/remote/blast_door{id = "cap_office"; name = "Security Shutters"; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/space) "azD" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/space) "azE" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/simulated/floor/tiled,/area/space) @@ -1503,7 +1503,7 @@ "aCU" = (/obj/effect/overlay/snow/floor/edges{dir = 8},/obj/effect/overlay/snow/floor/edges,/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 2; flags = null},/turf/snow/plating,/area/space) "aCV" = (/obj/effect/overlay/snow/floor/edges,/obj/structure/railing{dir = 2; flags = null},/turf/snow/plating,/area/space) "aCW" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/clothing/suit/storage/vest/hoscoat/jensen{armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); desc = "Its an old dusty trenchcoat...what a shame"; name = "Trenchcoat"},/turf/simulated/floor/plating,/area/space) -"aCX" = (/turf/simulated/floor/tiled,/area/quartermaster/foyer) +"aCX" = (/mob/living/simple_mob/animal/passive/gaslamp/snow,/turf/snow/snow2,/area/space) "aCY" = (/obj/structure/flora/pottedplant/xmas,/turf/simulated/floor/tiled,/area/quartermaster/foyer) "aCZ" = (/obj/effect/landmark{name = "blobstart"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/steel,/area/quartermaster/warehouse) "aDa" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/quartermaster/warehouse) @@ -1601,7 +1601,7 @@ "aEO" = (/obj/effect/floor_decal/corner_oldtile/purple,/obj/effect/floor_decal/corner_oldtile/purple{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research) "aEP" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled,/area/quartermaster/warehouse) "aEQ" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/quartermaster/foyer) -"aER" = (/obj/machinery/computer/ordercomp{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/foyer) +"aER" = (/turf/simulated/floor/tiled,/area/quartermaster/foyer) "aES" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/quartermaster/warehouse) "aET" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/obj/structure/closet/crate,/turf/simulated/floor/tiled,/area/quartermaster/warehouse) "aEU" = (/obj/structure/table/steel_reinforced,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/machinery/door/window/northright{dir = 4; name = "Mailing Room"; req_access = list(50)},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/quartermaster/delivery) @@ -1740,7 +1740,7 @@ "aHx" = (/obj/structure/table/steel,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor/tiled,/area/space) "aHy" = (/obj/structure/table/steel,/obj/item/device/flashlight/lamp,/turf/simulated/floor/tiled,/area/space) "aHz" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/corner_oldtile/purple/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"aHA" = (/obj/structure/table/standard,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = -26; pixel_y = 0},/obj/item/weapon/storage/box/nifsofts_security,/turf/simulated/floor/tiled,/area/space) +"aHA" = (/obj/structure/table/standard,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/machinery/light_switch{dir = 2; name = "light switch "; pixel_x = -26; pixel_y = 0},/obj/item/weapon/storage/box/nifsofts_security,/turf/simulated/floor/tiled,/area/space) "aHB" = (/obj/machinery/vending/security,/turf/simulated/floor/tiled/red,/area/space) "aHC" = (/obj/machinery/camera/network/research{dir = 2},/obj/effect/floor_decal/corner_oldtile/purple/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "aHD" = (/obj/structure/table/standard,/obj/item/device/taperecorder{pixel_x = -3},/obj/item/device/paicard{pixel_x = 4},/obj/item/weapon/circuitboard/teleporter,/obj/item/weapon/circuitboard/aicore{pixel_x = -2; pixel_y = 4},/obj/machinery/requests_console{announcementConsole = 1; department = "Research Director's Desk"; departmentType = 5; name = "Research Director RC"; pixel_x = 30; pixel_y = -2},/obj/effect/floor_decal/corner_oldtile/purple/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) @@ -1813,7 +1813,7 @@ "aIS" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/tiled/steel,/area/space) "aIT" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/carpet,/area/space) "aIU" = (/turf/simulated/floor/tiled/steel_grid,/area/space) -"aIV" = (/obj/structure/table/standard,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled,/area/space) +"aIV" = (/obj/structure/table/standard,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled,/area/space) "aIW" = (/obj/machinery/door/airlock/security{name = "Secure Evidence Storage"; req_access = list(1)},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/dark,/area/space) "aIX" = (/obj/machinery/door/airlock/glass_security{id_tag = "detdoor"; name = "Secure Evidence Storage"; req_access = list(4)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/lino,/area/space) "aIY" = (/obj/structure/closet/secure_closet/detective,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/energy/taser,/obj/item/device/uv_light,/turf/simulated/floor/lino,/area/space) @@ -1904,12 +1904,12 @@ "aKF" = (/obj/structure/table/glass,/obj/item/weapon/folder/white_rd,/obj/item/weapon/stamp/rd,/obj/effect/floor_decal/corner_oldtile/purple/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/drinks/bluespace_coffee,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "aKG" = (/obj/structure/table/glass,/obj/machinery/computer/skills,/obj/effect/floor_decal/corner_oldtile/purple/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "aKH" = (/obj/effect/floor_decal/corner_oldtile/gray/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"aKI" = (/obj/effect/floor_decal/corner_oldtile/gray/diagonal{dir = 4},/mob/living/simple_animal/fox/syndicate{desc = "Who needs the captains fox when you have a Robo-fox!"; name = "Roxie"},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) +"aKI" = (/obj/effect/floor_decal/corner_oldtile/gray/diagonal{dir = 4},/obj/item/weapon/storage/toolbox/syndicate{desc = "Who needs the captains fox when you have a Robo-fox!"; name = "Roxie"},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "aKJ" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/floor/plating,/area/rnd/workshop) "aKK" = (/obj/structure/frame,/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/space) "aKL" = (/obj/structure/table/reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/space) "aKM" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/space) -"aKN" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/wrench,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/space) +"aKN" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/tool/wrench,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/space) "aKO" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor,/area/space) "aKP" = (/obj/structure/closet/secure_closet/engineering_electrical,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/space) "aKQ" = (/obj/structure/closet/secure_closet/engineering_welding,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/tiled{tag = "icon-monotile"; icon_state = "monotile"},/area/space) @@ -2179,14 +2179,14 @@ "aPU" = (/obj/machinery/computer/security/engineering{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/tiled,/area/space) "aPV" = (/obj/structure/table/reinforced,/obj/item/weapon/clipboard,/obj/item/weapon/tape_roll,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/tiled,/area/space) "aPW" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/space) -"aPX" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/cargo/engine,/turf/simulated/floor/tiled,/area/quartermaster/storage) +"aPX" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/security/engine,/turf/simulated/floor/tiled,/area/quartermaster/storage) "aPY" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research) "aPZ" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/quartermaster/storage) "aQa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/quartermaster/storage) "aQb" = (/obj/effect/overlay/snow/floor/edges{dir = 4},/obj/effect/overlay/snow/floor/edges{dir = 1},/turf/snow/plating,/area/space) "aQc" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/light,/turf/simulated/floor/tiled,/area/space) -"aQd" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/space) -"aQe" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/device/flashlight,/obj/item/weapon/wrench,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/space) +"aQd" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/reinforced,/obj/item/weapon/tool/crowbar,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/space) +"aQe" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/device/flashlight,/obj/item/weapon/tool/wrench,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -24},/turf/simulated/floor/tiled,/area/space) "aQf" = (/obj/effect/floor_decal/corner_oldtile/purple,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/white,/area/rnd/research) "aQg" = (/obj/structure/table/rack,/turf/simulated/floor/plating,/area/space) "aQh" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/yellow/border{dir = 6},/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/yellow/bordercorner2,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/space) @@ -2273,7 +2273,7 @@ "aRK" = (/obj/item/weapon/stool/padded,/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "aRL" = (/obj/structure/table/woodentable,/obj/machinery/light,/obj/item/device/universal_translator,/turf/simulated/floor/carpet/blue,/area/space) "aRM" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/soap,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/space) -"aRN" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/cargo/trolley,/turf/simulated/floor/tiled,/area/quartermaster/storage) +"aRN" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/trolley,/turf/simulated/floor/tiled,/area/quartermaster/storage) "aRO" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/space) "aRP" = (/obj/machinery/light/small,/obj/structure/toilet{dir = 8},/turf/simulated/floor/tiled/freezer,/area/space) "aRQ" = (/turf/simulated/floor/snow,/area/space) @@ -2372,7 +2372,7 @@ "aTF" = (/obj/effect/floor_decal/corner_oldtile/purple,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/white,/area/rnd/research) "aTG" = (/obj/machinery/door/airlock/glass{name = "Locker Room"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/space) "aTH" = (/obj/machinery/light/small,/obj/structure/toilet{dir = 8},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/tiled/freezer,/area/space) -"aTI" = (/mob/living/simple_animal/penguin,/turf/simulated/floor/snow,/area/space) +"aTI" = (/mob/living/simple_mob/animal/passive/penguin,/turf/simulated/floor/snow,/area/space) "aTJ" = (/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/purple/border{icon_state = "bordercolor"; dir = 8},/obj/item/device/radio/intercom{dir = 8; pixel_x = -24},/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor/tiled,/area/space) "aTK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/space) "aTL" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/effect/landmark/start{name = "Pilot"},/turf/simulated/floor/tiled,/area/space) @@ -2649,9 +2649,9 @@ "aYW" = (/obj/structure/grille,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "EngineRadiatorViewport"; name = "Engine Radiator Viewport Shutter"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/visible/green{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/space) "aYX" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/structure/lattice,/turf/simulated/floor/snow/snow2,/area/space) "aYY" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "cargo_bay"; layer = 3.3; name = "cargo bay hatch controller"; pixel_x = 30; pixel_y = 0; req_one_access = list(13,31); tag_door = "cargo_bay_door"},/obj/machinery/camera/network/cargo{dir = 9; c_tag = "CRG - Mining Airlock"},/turf/simulated/floor/tiled,/area/quartermaster/storage) -"aYZ" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/cargo/trolley,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/storage) +"aYZ" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/trolley,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/storage) "aZa" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/tiled,/area/quartermaster/storage) -"aZb" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/cargo/trolley,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled,/area/quartermaster/storage) +"aZb" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/vehicle/train/trolley,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled,/area/quartermaster/storage) "aZc" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/storage) "aZd" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/space) "aZe" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/quartermaster/storage) @@ -2842,7 +2842,7 @@ "bcH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "bcI" = (/obj/structure/closet/secure_closet/explorer,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "bcJ" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/effect/floor_decal/corner_steel_grid{dir = 6},/obj/machinery/light,/turf/simulated/floor/tiled,/area/tether/station/explorer_prep) -"bcK" = (/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/machinery/suit_cycler/explorer,/turf/simulated/floor/tiled,/area/tether/station/explorer_prep) +"bcK" = (/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/item/clothing/under/explorer,/turf/simulated/floor/tiled,/area/tether/station/explorer_prep) "bcL" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{dir = 1; frequency = 1380; id_tag = "expshuttle_docker_pump_out_external"; power_rating = 20000},/turf/simulated/shuttle/wall/voidcraft,/area/shuttle/excursion/tether) "bcM" = (/obj/structure/flora/tree/pine,/turf/snow/snow2,/area/space) "bcN" = (/obj/effect/floor_decal/steeldecal/steel_decals5,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/tether/station/excursion_dock) @@ -2854,7 +2854,7 @@ "bcT" = (/obj/effect/floor_decal/borderfloorblack/corner{icon_state = "borderfloorcorner_black"; dir = 1},/obj/effect/floor_decal/industrial/danger/corner{icon_state = "dangercorner"; dir = 8},/turf/simulated/floor/tiled,/area/tether/station/excursion_dock) "bcU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "bcV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) -"bcW" = (/mob/living/simple_animal/parrot/Poly,/turf/simulated/floor/tiled,/area/space) +"bcW" = (/mob/living/simple_mob/animal/passive/bird/parrot/poly,/turf/simulated/floor/tiled,/area/space) "bcX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "bcY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -25},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/monotile,/area/tether/station/excursion_dock) "bcZ" = (/obj/structure/snowman/spider,/turf/snow/snow2,/area/space) @@ -3058,9 +3058,9 @@ "bgP" = (/obj/structure/table/steel,/obj/item/weapon/clipboard,/obj/item/weapon/folder/red,/obj/item/weapon/pen,/obj/item/device/binoculars,/obj/machinery/door/window/brigdoor/westleft{name = "Warden's Desk"; req_access = list(3)},/obj/machinery/door/window/brigdoor/eastright,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/security/warden) "bgQ" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/machinery/door/window/brigdoor/southleft,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/gun/energy/ionrifle/pistol,/turf/simulated/floor/tiled/red,/area/space) "bgR" = (/turf/simulated/floor/snow/plating,/area/space) -"bgS" = (/mob/living/simple_animal/hostile/savik,/turf/simulated/floor/snow,/area/space) -"bgT" = (/mob/living/simple_animal/hostile/shantak,/turf/simulated/floor/snow,/area/space) -"bgU" = (/mob/living/simple_animal/hostile/giant_spider/frost,/turf/simulated/floor/snow,/area/space) +"bgS" = (/mob/living/simple_mob/animal/sif/savik,/turf/simulated/floor/snow,/area/space) +"bgT" = (/mob/living/simple_mob/hostile/shantak,/turf/simulated/floor/snow,/area/space) +"bgU" = (/obj/effect/spider/eggcluster/small/frost,/turf/simulated/floor/snow,/area/space) "bgV" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/space) "bgW" = (/obj/structure/table/rack/shelf,/obj/item/weapon/gun/energy/frontier/locked/holdout,/turf/simulated/floor/tiled,/area/space) "bgX" = (/obj/machinery/door/airlock/glass_external/public,/turf/simulated/floor/tiled,/area/space) @@ -3264,7 +3264,7 @@ "bkN" = (/obj/structure/table/standard,/obj/item/weapon/clipboard,/obj/item/weapon/stamp/qm,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/quartermaster) "bkO" = (/obj/structure/table/standard,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/item/weapon/pen/red{pixel_x = 2; pixel_y = 6},/turf/simulated/floor/tiled,/area/quartermaster) "bkP" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/device/megaphone,/turf/simulated/floor/tiled,/area/quartermaster) -"bkQ" = (/mob/living/simple_animal/fluffy,/turf/simulated/floor/tiled,/area/quartermaster) +"bkQ" = (/mob/living/simple_mob/animal/sif/fluffy,/turf/simulated/floor/tiled,/area/quartermaster) "bkR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster) "bkS" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster) "bkT" = (/obj/machinery/conveyor{dir = 1; id = "QMLoad"},/turf/simulated/floor,/area/quartermaster/storage) @@ -3507,7 +3507,8 @@ "bpw" = (/obj/structure/lattice,/obj/structure/largecrate/birds,/turf/simulated/open,/area/space) "bpx" = (/obj/structure/largecrate/animal/cow,/turf/simulated/floor,/area/space) "bpy" = (/obj/structure/largecrate,/turf/simulated/floor,/area/space) -"bpz" = (/turf/simulated/floor/reinforced,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/excursion/tether) +"bpz" = (/mob/living/simple_mob/animal/passive/gaslamp/snow,/turf/simulated/floor/snow/snow2,/area/space) +"bpA" = (/turf/simulated/floor/reinforced,/obj/structure/shuttle/engine/propulsion,/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/excursion/tether) (1,1,1) = {" aabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaacaacaacaacaac @@ -3524,18 +3525,18 @@ aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaa aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadbmPbmybgRbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbgRadmbmVaadaadaadaadaadaadaadaadaadaeGbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbmYaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadbmPbmybgRbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbgRadmbmVaadaadaadaadaadaadaadaadaadaNuaadaadaadaadbmAaadaadaadaadaadaadaadaadaadaadbdabafbafbafbafbafbmYaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadbmPbmybgRbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbgRadmbmVaadaadaadaadaadaadaadbmAaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbdabafbafbafbafbafbmYaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaccaaaaaaaamacdaamaaaaaaaceaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaeacfaagaahaaiacgaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzadmbmVaadaadaadaadaadaadaadabfbmBbmDbmBbmCaadaadaadaadaadaadaadaadaadaadaadaadaadbmAaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaccaaaaaaaamacdaamaaaaaaaceaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaeacfaagaahaaiacgaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzadmbmVaadaadaCXaadaadaadaadabfbmBbmDbmBbmCaadaadaadaadaadaadaadaadaadaadaadaadaadbmAaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaakaalaamaamaaiaanaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmEbmFbmFbmFbmGbmCbmCbnHbmGabfbmHbmIbmJbmCaaoaaoaaoaaoaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbdabafbafbafbmYaadacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoaaoaaoacoaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadacyaavaawabAaaxaayaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoaadaadaadaadbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmKbmLbmMbmNbmObmObmQbmQbmRabfbmSbmIbmTabfarnarnarnarnaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhObhUbhRacoaaaaaaaaaaaaaaaaadaadaadaczaadaadaadaadaadaaGaamaaHacAaaJabYaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmUbnabncbnibmObmObmObmObnkabfapIbntapIabfbnDbnEbnFbnDbnGaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmAaadbdabafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbmYaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacobhTbhQbhSaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaaYaaZacCabaabbabcaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbnKbnLbnYbotbmObmObmObmObmObmObmObmObmObnIbnJbnJbnJbnJbouaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaadaadaadaadaadaadaadaadaadbmAaadaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaobmAaadaadaadaadaadaadaadaadaadaadbdabafbafbmYaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacoaaabhPbhVaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaeFaadaadaadaadaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmyaCObovbnMbmObmObmObmObmObmObmObmObmObnNbnObnJbnJbnJbnPaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaobiiaaoaadaadaadaadaadaadaadaadaadaadaadaaobfpanKbfpanKbfpaaoaaoagsayMadDaadaadaadaadaadaadaadaadaadaadaadaadaadaadbdabafbafbmYaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacoacobhWacoaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmAbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmyaCObovbnQbmObnkapIbnRbmObnkapIbnRbmObnSbnTbnJbnUaapaeVaaoaadaadaadaeFaadaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaaoaaoaaNaaoaaoaadaadaadaadaadaadaadaadaadaadaaoafWanKbfpanKagqaaoaaoawQagtaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacoacobhWacoaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmAbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmyaCObovbnQbmObnkapIbnRbmObnkapIbnRbmObnSbnTbnJbnUaapaeVaaoaadaadaadaeFaadaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaaoaaoaaNaaoaaoaadaadaadaadaadaadaadaCXaadaadaaoafWanKbfpanKagqaaoaaoawQagtaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmyaCObovbnMbmObnkabfbnRbmObnkabfbnRbmObnGbnWbnXbnWafdbnGaaoaadaadaadaadaadaadaadaadaadaadbenaddadfbeIbeIbeKbeLbflbeLaeDaaNbgpaaoahDahDaaoahDahDaaoaaoaaoaaoaaoaaobfpanKaeManKbfpaaoaaoagYaaoaaoaaoaaoaaoaadaadaadaadaadaadaadaadbmAaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbnHbmFbowbmGbmObnkapIbnRbmObnkapIbnRbmObnGbnJbnZboaaflbobaaoadDadDadDadDaaoaadaadaadaadbenbeqberaadaadaadahDaaNaaNaaNayhaaNaaNbfPaeNaeNayuaaNaaNaaNahFaxKaxKaaNaaNaxKaxKaaNaxKaxKaaNaaNaxKaxKaaoagsayMadDaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaadaadaadaadaadaacaacaacaadaacaacaacaadaaoaaoaaoaaoaaoaaoaaoaadaadaadaadaadaadaadaadaadaadbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbocbodboebofbmObmObmObmObmObmObmObmObmObogadvbohbohasFadvafnadvadvadvadvadDaadaadaadbenbeqberaadaadaadaadaaoaaoaaoaaoapKaaoaaoaaNbgmbgmaaNaaNaaNaaNaaoaxKaxKaxKaxKaxKaxKaxKaxKaxKaxKaxKaxKaxKagZazsagtaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaaaaaaaaaaadaadaadaaaaaaacUaaoaaaaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaadaadaadaadaadaacaacaacaacaacaacaacaacaadaaoabeaiwaivaiWabeaaoaadaadaadaadaadaadaadaadaadaadbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzboibojbokbolbmObmObmObmObmOafxafzafzafzaheaEMaEMaEMahIaEMahIarLadvadvadvadDaadaadbenbeqberalaalaalaalaauCaadaadaadahDafvbalaaoaaoadDadDaaoadDadDaaoaaobgqaxKaaoadDadDadDaaoadDadDadDaaoaxKaaNaaoaaoaaoaaoaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaadaadaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaaaaaaaaaaadaadaadaaaaaaacVaaaaaaaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaadaadaacaacaacaacaacaadaadaadaadaadaacaacaacaacaacaacaacaacaadaaoanKanKanKanKanKaaoaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzboxbnLbnYbotbmObmObmObmObmOaixbmObmObmObogadvadvadvadvadvadvaGhazMaaAadcbeKadebfnbesberauCatpatpatpatpatpatpatpaadaaoafvaqBaaoacTacMacMaApadgadgacSadDaaNaxKadDakEakEbezbeAbeBbeCadhadDaxKaaNaaoahaanKahaaaoaaoaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaadaadaaaaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaaaaaaaaaaadaadaadaaaaaaacVaaaaaaaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaadaadaacaacaacaacaacaadaadaadaadaadaacaacaacaacaacaacaacaacaadaaoanKanKanKanKanKaaoaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzboxbnLbnYbotbmObmObmObmObmOaixbmObmObmObogadvadvadvadvadvadvaGhazMaaAadcbeKadebfnbesberauCatpatpatpatpatpatpatpaadaaoafvaqBaaoacTacMacMaApadgadgacSadDaaNaxKadDakEakEbezbeAbeBbeCadhadDaxKaaNaaoahaanKahaaaoaaoaCXaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaaaaaaadiaaaaaaaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaeFaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaadaadaaoanKaiXajzajAanKaaoaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzadmbmVbovboobmObmObmObmObmOabfabfbmObmOabfaaoaaoaaoaaoaaoadvaGhaaoaaoaaoaaoadkabdaadbmPatpatpbnjbnjbnjbnjbnjatpatpaaoaqTahDaaoaffacLacMaVOaWQbeJbeSadDaaNaxKadDbeDbeEakEakEbeTakEbeUadDaxKaaNaaoahBaipahBaipaaoaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacHaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaaaaaaaamaaaaaaaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaadaadaaoanKajBaiTajCanKaaoaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzadmbmVbovbmQbmOabfapIbntapIabfbopbmObmObopaaoadsadtaduaaoadvaGhaaoadsadtaduadkabdaadauCatpbnjbnjbnjbnjbnjbnjbnjatpbnlaadaadahDbeVacMbeWacNbeXbeYaCgaaoaxKaxKaaoaFFbeFakEbeGbeBbeHaIcaaoaxKaxKaaoawQanKanKayMadDaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaadaadaadaadaadaadaadaaaaaaadwaaaaaaaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaadaadaaoanKajDakjakFanKaaoaadaadaadaadaadaadaadaadaadbmPbmybmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzbmzadmbmVbovbmRbmOabfboqbmIborabfbopbmObmObopaaoadHadIadJaaoadvaGhaaoadHadIadJadkabdbmPatpatpbnjbnjbnjbnjbnjbnjbnjatpatpbmVaadahDacNacNbfaacNacNacNacNahFaaNaaNahFakEakEbeNbfbakEakEbeNahFaaNaaNahFanKanKanKayMadDaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac @@ -3544,7 +3545,7 @@ aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaa aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacafvafvafvafvafvaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbndbmAbnobnpbnpbnpbmzbmzbmzbmzbmzbnpbnpbnpbnqbmAbmVaadaadauFaadaadbmWaadaadaLBbnebakbalbneaQxadvadvadvadvaEKaEMaEMarLadvaezaeAaeBaeCbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadaaobfkacMacMbfibeYbeYacLadDaaNaxKadDadhbeCadhbeRbeQbfobeOadDaxKaaNaaoahaaipahaaaoaaoaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaanaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacafvafvafvafvaacaacaadaadaadaadaadaadaeGbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbnfbnfbnfbnfbnfbnfbnfbnfbnfbnfbnfbnfbnfbnfbnfbafbafbafbafbafbafbagbahbahatpadNafvafvadOadvadvadvadvadvadvadvadvaGhadvaemaeJaeKaeLbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadaaoaaoaaoaaoaaoaaoaaoaaoaaoaaNaxKaaoadDadDadDaaoadDadDadDaaoaxKaaNaaoaaoaaoaaoaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaayaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacafvafvaacaacaacaadaadaadaadaadaadaNuaadaadaadbmAaadaadaadaadaadaadacHaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmAaDebaEbmZabqaVDbngaTiaMladvadvadvadvadvboyaGhadvaeWaeXaadatpbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadadDanKanKafhbgdanKanKanKaaoaxKaxKaxKaxKaxKaxKaxKaxKaxKaxKbgsaxKaxKaaoafTbgoafTaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadbmAabYaadaadaadaadbcbaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacafvaacaacaacaadaadaadaadaadaadaNuaadaadaadaadaadaadaacaacaacaadaadaadaadaadaadaadaadaadbmAaaoaaoaaoaaoaadaadaadaadaadbcbaadaadaadaadaadaadbmAaadaaoaaoaaoaaoaaoafcafcaaoaaoaaoaaoaadaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaeiadvadvboCaGhadvafeaeXaadatpbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadadDbgnanKanKanKanKanKanKahFaxKaxKaaNaaNaxKaxKaaNaxKaxKaaNaaNaxKaxKbgvakiakiakiaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadabcaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacafvaacaacaacaadaadaadaadaadaadaNuaadaadaadaadaadaadaacaacaacaadaadaadaadaadaadaadaadaCXbmAaaoaaoaaoaaoaadaadaadaadaadbcbaadaadaadaadaadaadbmAaadaaoaaoaaoaaoaaoafcafcaaoaaoaaoaaoaadaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaeiadvadvboCaGhadvafeaeXaadatpbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadadDbgnanKanKanKanKanKanKahFaxKaxKaaNaaNaxKaxKaaNaxKaxKaaNaaNaxKaxKbgvakiakiakiaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadabcaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaadaadaadaadaadaNuaadaadaacaacaacaadaacaacaacaadaadaadaadaadaadaadaadaaoaaoaaoafvafvaaoaaoaaoaaoaaoafcafcaaoaaoaaoaaoaaoaaoaaoaaoaaoafjaaoaiYaUZaUZaUZaUZakQafjaaoaaoaaoaiYaUZaUZalfakQaaoafkafkafkafkaaoaegadvadvboDaGhadvafoaeXaeEatpbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadadDbgYanKanKamlaqNanKanKaaoadDaaoaaoaaoaaoaaobfsaaoaaoaaoaaoaaoaaoaaoakiakiakiaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaadaadaadaadaadaNuaadaadaacaacaacaacaacaacaacaacaadaadaadaadaadaaoaaoaaoafjafvafvafvaaoalEaqtaujaujaujaujaujaUZaUZaUZaUZaUZaUZaUZaUZaUZaUZbhVaaoaaoafkaaoaqCaUZaUZaUZaUZbhVafwaaoaqvasPafkafkafkafkafkaaoaefadvadvboEaGhadvaeWaeXaadatpbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadadDbgnanKanKanKanKanKanKanKazpaaoatMbftaMcbfNbfvbfwbfxbfyaaoaATakiakiakiakiakiaaoaadaadaadaadaadaadaadbcbaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaadaacaacaadaadaadaadaadaadaNuaadaadaacaacaacaacaacaacaacaacaadaadaadaadaadaaoalEaujaujaujaujaujaujaEaaaoaaoaaoafyaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoafkafkaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoasPaaoaaoaaoaaoaaoaaoaehadvadvaYhaGhadvafAaeXaadatpbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadaaoaaoaaobgZbgtanKanKanKanKbhaaaobfQbfRbfVadvbfzbfAbfBbfyaaoakiakiakiakiakiakiaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac @@ -3554,7 +3555,7 @@ aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaa aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaNuaadaadaadaadaadaadaadaadaadaadaadaadaaoahbahcahdawXaXoaXoaWyafDafYagvagwaaoahgaamahhahiaamaamahjagfahkahlahmahnahnahoagfahpahqahqahrahsahtahuahvahvahvahwahxaaoaaoaaoahyahzaaoaaoaaoaaoaaoaDtbnbaDtbnbaDtadkahAaadatpbnjbnjbnjbnjbnjbnjbnjbnjbnjatpbmVaadaadaadaadaadaadaadaadaadbcbaadaaoaaoaaoaaoaaoaaobbRaaoaaoaaoaadaadaadaadaadaadaadaadaadaaoaaoaaoaaoaaoaadaadbcbaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaNuaadaadaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaaoaxEahJahJahJahJahJahJahKaaoahLahMahNahOahPahQahRahSahTahUahVahWahXahYahSahZaiaaibaicaaoaidaamaieaifafHaifaigadDaihaiiaijaikailaikaimaaoainadvadvadvadvadvaioadkaadatpatpbnjbnjbnjbnjbnjbnjbnjatpatpbmVaadaadaadaadaadaadaadaadaadaadaadaadaadaadaeSadBadBayFaadaadaadaadaadaadaadaadaadaadaadaadaaobnuaHBbnuaaoaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaeFaacaacaacaadaadaadaacaacaacaacaNuaadaadaadaadaacaacaacaadaadaadaadaadaadaadaadaaoaALahJaaaaaaaaaaaaahJagxaaoaaoadDaiyadDaaoaaoaaoaaoaizaiAaiBaiCaiDaiEaaoagLaiFaiGaiHadYaiIaamaieaiJaiKaiJaiLadDaiMaamaiNaiOaamaiPaiQaiRadvadvadvadvadvadvbheadkaadaadatpatpbnjbnjbnjbnjbnjatpatpbnraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaZgaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaaoaaoaaoaBTaBTaBTaaoaaoaaoaaoaadbmAaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadabEabFabGaadabEabFabGaadabEabFabGaadabEabFabGaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaadaadaacaacaacaadaNuaadaadaadaacaacaacaacaadaadaadaadaadaadaadaaoaaoaAOahJaaaaaaaaaaaaaiZahfaaaajaajEajbajcajdajeajfajgajfajhajiajjajkajlajmajnajoajpajqajrajsajpajqajtajtajtajuajvaalaamaamajwaamajxaamaazadvadvadvadvadvadvadvaaoaaoaaoaaoaaoatpatpatpatpatpatpatpbmVaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaRaadaadaadaadaadaadaadaadaadaadaaoaBTaBTaBTaaoaBTaBTaBTaBTbmZaBTbnvaaoaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadabEabFabGaadabEabFabGaadabEabFabGaadabEabFabGaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaadaadaacaacaacaadaNuaadaadaadaacaacaacaacaadaadaadaadaadaadaadaaoaaoaAOahJaaaaaaaaaaaaaiZahfaaaajaajEajbajcajdajeajfajgajfajhajiajjajkajlajmajnajoajpajqajrajsajpajqajtajtajtajuajvaalaamaamajwaamajxaamaazadvadvadvadvadvadvadvaaoaaoaaoaaoaaoatpatpatpatpatpatpatpbmVaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaRaadaadaadaadaadaadaadaadaadaadaaoaBTaBTaBTaaoaBTaBTaBTaBTbmZaBTbnvaaoaadaadaadaNuaadaadaadaadaCXaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadajyabEabQabGajyabEabQabGajyabEabQabGajyabEabQabGajyaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaadaadaadaadaadbmAaNuaadaadaadaacaacaacaacaadaadaadaadaadaadaadafcafvaxEahJaaaaaaaaaaaaaaaaaaajEajFaaaajGajHaaJajIajIajJajKajLajMajNacVajOaiKaiKajGajPajQajRajSajTajUajVajWadxajXajYajZakaakbakcakbakdaamaazadvadvadvadvadvadvadvaaoakeakfakgacoahCahCahCahCahCahCahCahCahCaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaRaadaadaadaadaadaadaadaadaadaadaaobnwaBTaBTaaoaBTaBTaBTaBTbnxaBTaBTaaoaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaadaadaadaadaadaadaNuaadaacaacaacaacaacaacaadaadaadaadaadaadaadafcafvaxEahJakkaaaaaaaaaahJaaoaaoaaoaaoaaoaklaaJakmaaoaaoaaoaknakoakpakqadDaaoadYaaoakraieaksaktakPakPakPallakuakvadDacmakwakxakyakzakAakBaiRadvadvadvadvadvadvadvakCadvadvakDacoalbalbalbalbalbalbalbalbahCaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaRaadaadaadaadaadaadaadaadaadaadaaobnyaBTaBTaBTaBTaBTaBTaBTbmZaBTbnzaaoaadaadaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaadaadaadaadaadaadaadaadaNuaadaacaacaacaacaacaacaadaadaadaadaadaadaadaaoafvaxEahJahJahJahJahJahJaaoakGakHakIakJajwaaJabCabDaasaataaoakKakLakMakNakLakOakmakrafGaktaloalLalMalLamdadKakRadDakSakTakUakVadDaamaamaaoakWakXadvadvadvadvadvaaoakYadvakZacoalbalcaldalealdalzalAalbahCaadaadaadaadaadaadaadaadaeFaadaadaadaadaadaaRaadaadaadaadaadaadaadaadaadaadaaobnAaBTaBTaBTaBTaBTaBTbnBaaoaaoaaoaaoaZGaDeaadaNuaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac @@ -3570,7 +3571,7 @@ aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaa aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadabRaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoadDaaoaoyaaoaaoaaoaozaoAaoBaoCaaoaaoaamafBaoDamSaoEaamabYakmabYaamaoEamSaoFaoGaamaaoaaoaaoaoHaoIaaoaaoaaoaaoaaoaoJadvadvadvaBGadvadvadvadvadvadvadvaGhadvaoLaaoaaoaaoaaoaaoaaoaaoanoauJanoamKaFpamKacoacoacoaoNanKaouaoOaowanKaoPacobdracoaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabFabGaadabEabFabGaadabEabFabGaadabEabFabGaadaoQajyabRaadaadaadaadaadaadaadabraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoaoSaiualFaXoaonaaoaoTaoUaoVaoWaaoaaoaamafSaoDadjaamaamaoXaaoaoYaamaamadjaoFaoZaamaaoaaoapaapbanKapcanKapdapeanKaaoaaoadvadvaBGadvapfapgaphapiapjadvaGhadvadvadvaoLapkaplapmapnaoLanoauJanoamKafvapoacoappacoapqanKanKapranKanKapsacobdracoaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQajyabEabQabGajyabEabQabGajyabEabQabGajyabEabQabGajyaptaadabRaadaadaadabrabrabrabrabraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadboFaaoaaoaaoaiuaaoaoyaaoapuapvapwapxaaoaaoaamaaKaoDaamaamaamapyaaoapzaamaamaamaoFapAaamaaoaaoapBapCapDapEairanKapGanKaaoaaoadvadvaBGapHavVapJafQapLavVapHaGhadvadDadvapManKanKawbawcawdatkavFavGamKafvacoacoacoacoacoapOapPanKanKapQapRacobdracoaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadajyaadabRaadaadaadaadaadaadabrabraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoafvapSafvapTaaoaoyaaoaaoapUaaoaaoaaoaaoaamagXaaoapVapWapXapYaaoapYapXapWapVaaoapZaamaaoaaoaqaaqbanKaqcanKanKapGaqdaaoaqeadvadvaBGaqfaphafQafQaqgaqhapiaGhadvadDadvadDaqiannayBaqjaoLanoauJanoamKafvacoaqkakiaqlacoaqmaqnanKaqoaqpaqqacobdracoaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadajyaadabRaadaadaadaadaadaadabrabraadaadaadaCXaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoafvapSafvapTaaoaoyaaoaaoapUaaoaaoaaoaaoaamagXaaoapVapWapXapYaaoapYapXapWapVaaoapZaamaaoaaoaqaaqbanKaqcanKanKapGaqdaaoaqeadvadvaBGaqfaphafQafQaqgaqhapiaGhadvadDadvadDaqiannayBaqjaoLanoauJanoamKafvacoaqkakiaqlacoaqmaqnanKaqoaqpaqqacobdracoaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadajyaadabRaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadauZavAavAavAavAaaoaqraqsaFYaGiaGSaZDafvafvafvaqubpaaaoaaoaaoaaoaaoaaoaaoaaoaaoadYaaoafgaaoaaoaaoaaoaaoaaoaaoaqwaqxanKannannapGaaoaaoaaoaqyadvadvaxSaqzaqAafQaMdaMKaqDaqEbdsadvadvadvadDapqannayBaqFaoLanoauJanoamKafvacoaiVakiaqGacoaqHanKanKanKaqIaqJacobdracoaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaqKaoQajyaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadajyaadabRaadaqLaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmAaadaCQaDkaDmaDmaDmaDmaDmaDmaDmaDmaDmaDmaDmaDmaDmavBatpatpatpaDQaaoaaoaaoaaoaaoaaoaaoaaoaqMaaoaaoaaoaaoacDafvafvacDacDacDafvarcarcarcarcarcarcarcarcarcarcaaoaRLaqOanKaqPaqQapGaaoaaoaaoaaobhgadvaBGaqRaqSafQafQaMLaqUaqVaGhadnaoLaoLaoLaqWannayBaqXaoLanoauJavHamKafvacoaqYacoacoacoanKanKanKanKanKaqZacobdracoacoaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadajyaadaadajyabRajyacHajyabRajyaadajyabRajyaadajyabRajyaadajyaadabRacracsaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaaoaadaadaadaadaadaadaadaadaadaLyaLzaLAaadaadaadaadaadaadaadaadaadaadaadaadaadaClaDSatpatpaDQatpatpbonatpacDardardardardardardardardardardardardardardarearcarfargarhariarjarNarOarParcaaoaaoaaoaoHaoIaaoaaoaaoarkarlarmadvadvaBGarnarnaroafQaqEarnarnaGhadvaoLarpanKarqannayBarraoLanoauJanoamKafvacoanKanKanKarsanKartaruarvazCarwacobdrafvacoaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac @@ -3586,29 +3587,29 @@ aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaa aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQajyabEabQabGajyabEabQabGajyabEabQabGajyabEabQabGajyaadaadalDaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadbcbaadaadaadaClatpatpaPvbakafvbalaPvaTiaCSawgbjwawGawGawGawGbjxaaNaaNaaNatCaaNaaNacDaziazjanKaytazkaaoaXravaavSavPavTavaavUawoawpavhavhawqawrawsavhavhawMadvaBGacDaEsafvafvavpaEsacDaGhadvauGaxabjYawzawzawzbjZawzbkabkbaxYaxYbkcbkdbkebkdbkfbkgbkhbkibkjbaVbgJacoaaoaaoaaoaxBaaoaaoaadaaoaaoaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadaadaadalDaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaCUaCVatpadNafvafvafvauHaxKaxKawgawgbjybjzbjzbjAbjBaaNaaNaaNatCawhawiacDadDadDaaoaxPadDaaoaXravaavaawOawPawRavaavaavaawSawSawTavaawUawUavaawVadvaBGacDaEsavqafvafvaEsacDaGhadvawuaxaaxabkkawzawzawzbklavIawzawzawzbkmbgAbknbgAbkobkpbkqbkrbgAbaVbgKaxBadvadvadvaGhadvaaoaaoaaobijaaoaaoaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadaadaadalDaadaadaadaadaadaadaadacHaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadbmAaadaadaDeaDoaPvabqafvbhHaPvaxKaxKaxKawgbjCbjDbjEbjFbjGawHawIawJatCawhawKacDadvazyauYazyadvawLaXravaaxraxsaxsaxsaxuaxQaxRayvaywayxayzayAayOavPawUadvaBGadDavnavEbpbaEsavnadDaGhadvawYawZaxaaxabksbktbkubkvavIbjQavLbjQbbxbkwbkxbgAbgAbkybkybgAbgAbaVbgKacDacDacDacDaxvaSYalXalXalXaBVafvafvaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadaadaadalDaadaadaadacHaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadacDacDaYsacDacDacDacDacDayJawgawgbjHbjIbjJbjKaxkaxlaxlaxmaxnaxoacDadvadvaBGadvadvaaoaXravaayPaxsaxsaxsaxsayQayRavPavPaySazfavPavPavPawUadvazVavWadDavXacDawtadDavWbdzadvadvaxwaxxaxaaxaaxaaxaavIavIbkzbkAbkBavIbkCbaUbaUbkDbkDbkDbkDbaVbaVbgJacDaxCaxCacDacDacDacDacDacDaJGalmaxDalmaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEabQabGaadabEabQabGaadabEabQabGaadabEabQabGaadaadaadalDaadaadaadacHaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadacDacDaYsacDacDacDacDacDayJawgawgbjHbjIbjJbjKaxkaxlaxlaxmaxnaxoacDadvadvaBGadvadvaaoaXravaayPaxsaxsaxsaxsayQayRavPavPaySazfavPavPavPawUadvazVavWadDavXacDawtadDavWbdzadvadvaxwaxxaxaaxaaxaaxaavIavIbkzbkAbkBavIbkCbaUbaUbkDbkDbkDbkDbaVbaVbgJacDaxCaxCacDacDacDacDacDacDaJGalmaxDalmaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaCXaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadajyabRajyacHajyabRajyaadajyabRajyaadajyabRajyaadaadaadalDaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadacDaYrafvacDaxFaxGaxHaylaymaymaxJaxKaxKaxLaxMaxLaxNaxKaxLaxKaxOaaoaABaDTaBGavVaDTaaoaXravaavaazlazlazlazlazmaznazoazqazrazqazqazqazqazqaAEaELaxMadvaxvaSYaSYaSYaOobdIadvadvadvaxTaxUaxVaxVaxWaxXbkEbjQbkFbjQbkEadvaxMadvadvadvadvadvaxMadvaBGacDaxCaxCaxZayaaybaycaydacDaLealmayeayEaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbmAaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadaadabSachachachabSachachachabSachachachabSachachachachacJachachachachachachaciaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadacDafvafvacDbhjayiayjaykaxKaxKaAsaymaymaynayoaypayqaymayraxKayKadDaDqaPIaBGaPIaDqaaoaXravaazAazNazOazOazOazOaAxaAyaAzaAzavPavPavPavPaAHadvaBGadvadvadvadvadvadvadvadvadvadvadvadvadvadvadvadvadvaiqadvadvadvadvadvadvadvadvadvadvadvadvadvbgLbgMaAEbgNadvadvadvayCayDacDaMkayXazGaAiaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadajyabRajyaadajyabRajyaadajyabRajyaadajyabRajyaadaadaadaadaadaadaadaadaadaadabRaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacHaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadacDacDacDacDayGaaJayHaaoaaoaaoaaoayJayJbhlaaoaaoaaoaxKaxLaxKaNaadDaCTavVaDUaFuaDTaaoaXraBjavPavPavPavPavPavPaySaBkaBQaBRaBSaBkaRhaBSawUadvbdJaAEaAEaAEaAEaAEaAEaAEbomaAEaAEaAEaAEaAEazuaAEammaAEbdHazuaAEaAEaAEaAEaAEaAEaAEaAEaAEaAEbgNadvammayTayUaBGadvadvadvaycayVacDaNvaAMaANaAiaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQajyabEacpabGaadabEacpabGaadabEacpabGaadabEacpabGaadaadaadaadajyaadajyaadaadaadabRaadajyajyaadaadaadaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadacDazaazbazcaxKaxKaxKaxKazdazebjLaxKaxKbhmaeNaeNayIazgaxLaxKazhaaoaPIaDqaBGaPIaDqaaoaXravabdhbexbgBavPbhfbhnaySaBkbhobhpaBSbikbilaBSavaaztadvadvadvadvadvadvadvadvazvazvazxazSazTazSazUazvazvazWazXazZazXazWazXadvazyazzazyadvaAaaAaaAeaAaaAaacDazBbgOazDazDazDazEazFacDaOaaAPaANaAiaadaadaadacHaadaeFaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEacpabGaadabEacpabGaadabEacpabGaadabEacpabGaadaadaadaadacPacPacPacPacPajyabRajyacPacPacPacPacPaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadacDazIadvazcaxKaxKaYtazJaYtaYtaYtaYtaxKaxKbdObdOayIaxKaxLaxKazKaaoaaoaxIazLaxIaaoaaoaXravabdhbimbgBbdhbinbiobipbiobiobiobiobiobiqavabiradvadvadvazPazQazRadvadvadvazvaAAaACaADaAFaADaAGaAIazvaBpaBqaBsaBtaBuazXadvaAbaAcaouadvaAaaBvaBwaBxaAaacDacDacDaAfaAgaAgaAgaAhacDaOcalmaARalmaBAaBAaBAaBAaBAaBAaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEacpabGaadabEacpabGaadabEacpabGaadabEacpabGaadaadaadajyacQacWacWacWacWachacXachacYacYacYacYacZajyacKaadaadaadaadaadaadbcbaadaadaadaadaadaadatoauuaadacFaadadPadQadQadQadQadQadRacDaAobhqaAqaAraxKaxKaxKaxKaxKaxKaxKaxKaxKaxKaxKayJaxKaAZaymaymaAtaAuaymaAvaxKaAwaaoaXrbisbisbisbisbisbisbitbiubivbiwbiwbixbiybioafvaaoadvadvadvazPbhrazRadvadvadvazvaBzaACaBzaBzaBzaAGaBXazvbdKbdPbfmbfObhiazXadvaowaAcaouadvaAabhtbiSbiTaAaaoKaAJacDacDacDacDayTacDacDaOGaAdaBCalmaBDaBEaBFaBHaBZaBAaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQajyabEacpabGajyabEacpabGajyabEacpabGajyabEacpabGajyaadaadajyadladladladladlaadabRaadadladladladladlajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoadWadWadWadoadZacDacDacDacDacDaeaadDayJacDaYuaAUaAVaAWaAXaAYaAVbiGaymbiHaxKaxKaypaBaaBbaxLaxKaxKawLaSUaByaBOaBUaCpbpfbpfbiobizbiobiAbiobiBbiCbioafvaaoaBlaBmaBnaaoaaoaaoaBoaBoaBoazvbiUaACaBzbiVaBzaAGbiWazvbiXbiYbiZbjabjbazXadvaowaAcaAbadvaAabjcbiSbjdaAaaAKaCXaAKaAKaCYaCaaOVaOWaPAaPBaCvaCwaCxaCAaCZaDaaDbaDcaBAaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQajyabEacpabGajyabEacpabGajyabEacpabGajyabEacpabGajyaadaadajyadladladladladlaadabRaadadladladladladlajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoadWadWadWadoadZacDacDacDacDacDaeaadDayJacDaYuaAUaAVaAWaAXaAYaAVbiGaymbiHaxKaxKaypaBaaBbaxLaxKaxKawLaSUaByaBOaBUaCpbpfbpfbiobizbiobiAbiobiBbiCbioafvaaoaBlaBmaBnaaoaaoaaoaBoaBoaBoazvbiUaACaBzbiVaBzaAGbiWazvbiXbiYbiZbjabjbazXadvaowaAcaAbadvaAabjcbiSbjdaAaaAKaERaAKaAKaCYaCaaOVaOWaPAaPBaCvaCwaCxaCAaCZaDaaDbaDcaBAaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadabEacqabGaadabEacqabGaadabEacqabGaadabEacqabGaadaadaadaadajyaadajyajyajyaadabRaadajyaadajyaadajyaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuasTacFaadadSadoadpadpadpadoaaoaaoaaoaaoaaBaaPaxKaxKaxKacDaBIaBJaBIacDaBIaBKaBIacDaBLaaoaBMaBNaaoaaoaaoaCraiqaiqaaoaaoaaobphakiaDjakiakibiobiDbiobiEbiobiFbiobioaaoaaoaDpaxKbbSaaoaBWaaoadvadvadvazvbjeaACaACaADaACbjfbjgazvazWazXazZazXazWazXadvazyaBYazyadvaAaaAabjhaAaaAaaAKbdtbdAbdAbdAaDdbdBaDyaDAbdDaDCaDDaDEaDFaEfaEPaESaETaBAaadaadaadaadaadaadacHaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadajyaadaadaadajyajyajyaadaadaadaadaadaadaadajyaadajyaadaadacPacPacPacPacPajyabRajyacPacPacPacPacPajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadWadpaeyadpaecadOafvafvadOaxKaxKaxKaxKarXacDbhsazIaChacDbhsaCiaChacDaaNaaNaCjaCkawwbpjaaobpkaCmaxKaxKaCnaaobphakiaDjbplbplbiobiobiobiobiobiobioaxKaxKaDraxKaxKaCsaaoaCtaaoadvaxKaxKazvazvazxazSazTazSazxazvazvadvadvadvadvadvadvadvadvadvadvadvaCuaxMadvadvadvaCXbdGaCXaCXaCXaEUaEWaCfaCbaCbaCbaEXaCxaEYaEYaEZaEYaFaaBAaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaCBaCBaoQaCBaCBaptaoQajyajyajyajyaadaadaadajyajyajyaptajyaadajyacQacWacWacWacWachacXachacYacYacYacYacZajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoaeeadoadWadoadDadDadDadDaaqaxKaxKaxKaedacDaCCaCDaCEacDaCFaCGaCHacDbjMaCIaCjaCJaCKbpmbpnbpoaxKaxKaxKaCMaaoaaoaaoaDVaaoaaoaaoaCRaaoadvawjaDPaaoaxKaxKaDraxKaxKaDsaaoaCWaaoaxKacwaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYbfIaEMbdAbnVaDzaCXaEdaFbaFcaFdaCbaCbaCbaCbaCxaFeaEYaFfaFOaGsaBAaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaoQaadajyaadaadaadajyajyajyaadaadaadaadaadaadaadajyaadajyaadaadacPacPacPacPacPajyabRajyacPacPacPacPacPajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadWadpaeyadpaecadOafvafvadOaxKaxKaxKaxKarXacDbhsazIaChacDbhsaCiaChacDaaNaaNaCjaCkawwbpjaaobpkaCmaxKaxKaCnaaobphakiaDjbplbplbiobiobiobiobiobiobioaxKaxKaDraxKaxKaCsaaoaCtaaoadvaxKaxKazvazvazxazSazTazSazxazvazvadvadvadvadvadvadvadvadvadvadvadvaCuaxMadvadvadvaERbdGaERaERaERaEUaEWaCfaCbaCbaCbaEXaCxaEYaEYaEZaEYaFaaBAaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaZgaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaCBaCBaoQaCBaCBaptaoQajyajyajyajyaadaadaadajyajyajyaptajyaadajyacQacWacWacWacWachacXachacYacYacYacYacZajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoaeeadoadWadoadDadDadDadDaaqaxKaxKaxKaedacDaCCaCDaCEacDaCFaCGaCHacDbjMaCIaCjaCJaCKbpmbpnbpoaxKaxKaxKaCMaaoaaoaaoaDVaaoaaoaaoaCRaaoadvawjaDPaaoaxKaxKaDraxKaxKaDsaaoaCWaaoaxKacwaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYaSYbfIaEMbdAbnVaDzaERaEdaFbaFcaFdaCbaCbaCbaCbaCxaFeaEYaFfaFOaGsaBAaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadajyadladladladladlaadabRajyadladladladladlaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoadqadqadqadoadDadDadDadDaaraxKaxKaedacDacDacDacDacDacDacDacDacDacDbjNaDgaCjaDhbjOaDiaaoaDWaxKaxKaxKadvaiqadvadvaEKaEMaEMaEAaEAaFzaEMaEMaEMaEMaFAaGfaDtaDuaDvaDtaaoaDwaaoadvaGjaxKadvadvadvadvadvadvadvadvadvadvadvadvadvadvaaTaaTaaTaaTaaTadvadvadvadvasFadvaEeaEeaEeaEQaERaCxaGtaGuaGvaGxaGyaHhaCxaHiaHiaHOaHPaBAaBAaDGaDHaDHaDHaDHaDHaDHaDHaDHaDHaDIaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacHaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadajyaadajyaadajyaadabRaadajyaadajyajyajyajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadWaeradqadqaecadOafvafvadOaxKaxKaxKaedacDaDJaDKaDLaDMaDNaDOacDacDacDacDacDacDacDacDacDacDacDaEvaxKaxKadvaiqadvadvadvadvadvaxKaxKaiqaxKaxKaxKaxKaxKaGgaGOaHNaIAaIBacDaDXaaoaxKaGjadnaaUabhabhabhaaUaaUaaUaaUaaTabiabjabiaaTaaTaaTabkablabmaaTadvadvadvadvasFadvaEVaFNaFNaGqaHcaHcaHcaHdaHcaCxaCxaCxaCxaHQaHQaBAaBAaBAaBAaEgaEhaEiaEiaEiaEiaEjaEiaEiaEkaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacPacPacPacPacPajyabRajyacPacPacPacPacPajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoaeradqaesadoaaoaaoaaoaaoacoacoacoacoacDaEmaEnafkafkaEoafkaEpacDafvacDaaNawkaDRaaNaaNaaNadDaxKadvadvadnaaoaaoaGeaxIaxIaaoacDaxIaaoaGcaxKaxKadvaxKaxKaEyaBTaBTaICaByaXoaIQaFAaIRaEzaaUabnaboabpabuabvabwabxaaTabyabzabBabHabIabJabKabLabMabNabNabNabNadvasFadvaHcaHeaHfaHJaHKaHLaHMaInaIoaIpaIqaINaIOaJmaJmaJsaJtaJuaJwaEgaFgaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadajyacQacWacWacWacWalYacXalYacYacYacYacYacZajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoaetaetaetadoadZaadaadaadacoacDacDacDacDaFiaFjaEoaFkafkaFTaFlacDafvacDaBfaaNaaNaaNaaNaaNaDnaxKaxKadvaxKaxIaGMaxKapjaaQaFwaaQaISbhlaxKaxKaxKaExaEwadvacDaFyaFxaaoacDacDaaoaxKaGjaFBaaUabTabUabVabWabXabXabZaaTacbacjacjackackaclacjacjacxacRadaadbaebaFMasFadvaIKaIMaIMaIMaIMaIMaIMaJTaHcaJVaJWaJXaJZaKBaJZaJZaJZaJZaJwaEgaFgaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDebmXaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadajyadladladladladlaadabRajyadladladladladlaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadadSadoaeuaeuaeuadoadZaadaadaadacoacDaFPaFQacDaFRaFSaFTaFUafkafkaFVacDacDacDaBgaaNawlawmazyaaNacDaCRaGdaxKaxKaGeaxKaxKaxKaxKaxKaxKaxKaGeaxKaxKaFyaaoaaoaIyaaoaaoaaoaaoaJcaITaIzadvaGhaxKaIhalZaoRaraarbabXarxaryaaTacjacjacjacjacjacjacjacjacxacxacxarzarBayWasFadvaHcaJqaJraJUaKwaKxaKyaKAaLraLvaLwaLxaLXaLYaLZaJZaMxaMBaNpaGzaGAaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadajyaadajyaadajyaadabRaadajyaadajyajyajyajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaevaewaewaewaewaewaexaadaadaadacoacDaGBaGCaGDaEoaGEaFTaGFafkaEoaGGacDafvacDaBeaaNawnaxpazRaCqaaoaaoaaoaGPaxIaaoaaoaaSaxKadvaGNaxKaxKaGeaxKaxKaIVaaoaIYawNaIZaJEbpsaJAaJbaJHaJIaxKaGjaxKarCarDabXabXabXabXabXabXarEarFarGarHacjacjacjarIarJacxacxacxarzarKayWasFadvaFNaLsaIMaLtaLuaLWaLtaMvaMwaJZaOUaPbaPdaKBaJZaJZaPsaPtaPyaHjaHkaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadajyaadajyaadajyaadabRaadajyaadajyajyajyajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaevaewaewaewaewaewaexaadaadaCXacoacDaGBaGCaGDaEoaGEaFTaGFafkaEoaGGacDafvacDaBeaaNawnaxpazRaCqaaoaaoaaoaGPaxIaaoaaoaaSaxKadvaGNaxKaxKaGeaxKaxKaIVaaoaIYawNaIZaJEbpsaJAaJbaJHaJIaxKaGjaxKarCarDabXabXabXabXabXabXarEarFarGarHacjacjacjarIarJacxacxacxarzarKayWasFadvaFNaLsaIMaLtaLuaLWaLtaMvaMwaJZaOUaPbaPdaKBaJZaJZaPsaPtaPyaHjaHkaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKaadacPacPacPacPacPajyabRajyacPacPacPacPacPajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadaadaadaadacoacDaHlaHmacDaEoaHnafkafkaFTafkaHoacDafvacDaBdaaNazyaxqazyaaNaaoaGQaGRaxKaxKbeyaaoaHvaHwaHxaHyaaQaxKaxIaaoaaoaaoaaoaIYawNawNawNawNazyaJaaKfaIzaxKaGjaxKaIharMabXabXabXabXabXasiasjaskaslasmacjasnasoaaTaaTacxacRacxadbaebaGlasFaCzaHcaMyaMzaMAaNnaNoaLtaPcaHcaPXaJZaPZaQaaQtaJZaQvaQyaQzaQAadvaHRaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKajyacQacWacWacWacWachacXachacYacYacYacYacZajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadaadaadaadacoacDacDacDacDaHSaHTaHUafkaEoaHVacDacDacDacDaBcaBPaCoaCNaDlaaNaaoaHAaxKaxKaxKaHBaaoaaoaaoaIbapHaxKaxKaGLaaNaaNaaNaIXaJFaJFaJFaJFaJFaJFaJFaJFaIyaxKaGjaxKaIhasxasyaszabXabXabXaszaaTasAasBasCasCasDabKasEaaTaIkacxacxacxabNadvasFadvaHcaHcbfKaIMaIMbfLaLtaIMaFNaRNaJZaPZaVLaQtaJZaQvaJZaYYaNpafcaIraIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKajyadladladladladlaadabRajyadladladladladlaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadaadaadaadacoacoacoacoacDacDacDacDaIsaIsacDacDaKKaKKacDacDacDacDacDacDacDaaobhuaIdaaNaIdbhvaaoafvaaoacDacDacDacDaaoaaNaaNaHtaaoaKjaamaamaKkaamaamaamaKlaaoaxKaGjaIFaaUaaUaaUaaUasRasRasSasSaaTacjacjacjacjasUabKasVasWaIlacxatratrabNadvaEKarLadvaHcbfMbfSaIMaIMbfTbfUaFNaYZaJZaPZaQaaQtaJZaQvaMxaZaaQAadvaHRaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadadraadajyaadajyaadajyaadabRaadajyaadajyajyajyajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaIUaIUaIUaKRaMNaIUaIUaMOaMOaKMaKNbdCaMOaMOaaoaIDaIdaaNaIdaIEaaoafvafvacDbhwaaNaIWaaNaaNaaNaIaaaoaLbadjaamaamaLcaamadjaLdaaoaxKaGjaJfaFHabtacOaFHatsattatuatvaaTayYayZacjaJlasDazHaAjaaTaJnaAkabNabNabNaaoadvaGhadvbfZbfZbgcbgebfZbgcbgcbfZaZbaZcaZeaZfaQtaJZaQvaZFaZHbhyaJyaJxaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKaadacPacPacPacPacPajyabRajyacPacPacPacPacPajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaKeaJzaKeaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaaoaJdaIdaaNaIdaJeaaoafvafvacDaIxaaNacDaHsaaNaaNaIwaaoaaoaLLaLMaLNaLOaLPaLQaaoaaoaxKaGjaJJawCayfaygawCaAlaDYaDYaAmaaTaaTasjaEbaLjaEcasjaaTaaTaLVaEBaFHabtacOaFHaJSaGhadvbgcbhzbgfbgfbggbgjbgkbfZbhAbhCbhDbhYbkGbkJaJZaZFbkTaNpaKaaKbaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKajyacQacWacWacWacWachadzachacYacYacYacYacZajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadaLyaLzaLAaadaadaadaadaKeaKdaKebpeaIUaIUaIUaIUaIUaIUaMMaIUaIUaIUaKhaIUaKiacDacDacDacDacDacDacDacDacDacDaaNaaNacDaIaaaNaaNaJDaaoaaoaaoacDaaoaaoaaoaaoaaoaaoaxKaGjaJJawCaDYaDYawCaAlaDYaDYaDYaAmaAmaAmaAmaMeattaAnaAnattaNOaDZawCaPYaygaECadvaGhaKzbglbkHbkIbkKbkKbkLbkMbgcaJZaJZaJXaQaaJZbkUbkUbkVbkTaJwaEgaFgaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaDeaDeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKajyacQacWacWacWacWachadzachacYacYacYacYacZajyacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadacFaadaadaadaadaadaadaadaadaLyaLzaLAaadaadaadaadaKeaKdaKebpeaIUaIUaIUaIUaIUaIUaMMaIUaIUaIUaKhaIUaKiacDacDacDacDacDacDacDacDacDacDaaNaaNacDaIaaaNaaNaJDaaoaaoaaoacDaaoaaoaaoaaoaaoaaoaxKaGjaJJawCaDYaDYawCaAlaDYaDYaDYaAmaAmaAmaAmaMeattaAnaAnattaNOaDZawCaPYaygaECadvaGhaKzbglbkHbkIbkKbkKbkLbkMbgcaJZaJZaJXaQaaJZbkUbkUbkVbkTaJwaEgaFgaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgbpzaDeaDeacoacoaDeaDeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKajyadladladladladlaadaadaadadladladladladlaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadadAadBadBadBadBadBadBadBadBadCadEadFadBadBadBadGadLadMaKebpgbpibpdaKLaKOaIUaIUaKPaKQaIUaIUaKhaIUbppaKSaKTaKUaKVaKWaKXaKYaKZaLaacDaIxaIxacDaIvaJBaJCaaoaaoaKmazyaKnaKoaKpaJaaKqaKeadvadvaGhaLfaEDaEEaEFaFHaEGaEHaEIaDYaQfaQnaQnaQTaQUaRlaREaREaREaSbaEOawCaDYaDYaECadvaGhadvbgcbkNbkObkPbkQbkRbkSbkXbkWbkYblbblcbldbleblfblhbkTaJwaEgaFgaIJaIJaIJaIJaIJaIJaIJaFhaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaDeaDeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKaadaadajyajyajyaadaadaadaadaadaadajyajyaadaadacKaadaadaadaadaadaadaadaadaadaadaadaadaadatoauuaadaadaadaadaadaadaadaadaadaadaLyaLzaLAaadaadaLBaaoaaoaaoaaoaaoaaoaKeaKeaLCaIUaIUaLDaKQaIUaIUaKhaIUaIUaLEadvaLFaLGaLHaLIaLJaILaLKacDacDacDacDaaoaaoaaoaaoaaoazyazyazyazyazyazyazyaLSadvadvaGhaLTacDaFvaFCaFCaFCaFCaFCaENaScaFDaFEaFEaFLaFEaFEaFDaENaSuaFGaFHaEEaEFaFHadvaGhadvbgcbgfbkZbgfbgfbgfblabfZblibljaJXblkblkblkblkblkblkblkaEgaFgaMaaIJaIJaIJaIJaIJaMaaFhaElaDeaDebmXaNuaDeaZgaDeaDeaDeacoacoaDeaDeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacKacKacKacKacKaadaadaadaadaadaadaadacKacKacKadracKaadaadaadaadaadaadaadaadaadaadaadaadaadatoatpatqatqatqatqatqatqatqatqatqatqatqatqatqatqatqaMbaNwaaNaaNaNxaaNaMfaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaIUaMgadvadvaCmaMhadvaBGbcWacDacDacDacDacDaaoaaoacDaaoaaoaMiazyaLRaLRadvbptalXbpualXalXbdEaxKaxOaFvaGmaGXaGZaHaaFCaENaScaFDaHbaHuaHzaHCaHDaFDaENaScaFHaFHaFHaFHaFHadvaGhadvbfZbltblublvblwblxblybfZbllbllblnbllbllbloblpblobllbllaMCaMDaMEaMEaMEaMFaMEaMEaMGaMHaElaDeaDeaDeaNuaDeaZgaDeaDeaDeacoacoaDeaDeaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac @@ -3636,13 +3637,13 @@ aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaa aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaacaacaadaadaacaacaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadacDafkafkaZobaMbaMafkaStbaNbaObaPbaQbaNbavaStaZxbaRaZzbaSbaTacDaVwaVxaWtaWqaVxaVzaTnaDeaDeaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaaoaaNaSFaSDaSGaSDaSGaSDaSHaSDaSDaSBbibbicaSzaaoafcafcaaoaaoaaoaRQaRQaRQaaoaaoaaoafcadvafcaaoaaoaaoaaoaaoaaoaaoaaoaDeaDeaDeaDeaDeaDeaDeaDeaDeaRSaDeaDeaVPbaWbaWbaXbbcaZIbaZbbaaVPaVPaVPaVPbdWaWYaXaaXaaXaaXaaZjaZkaXaaXaaXaaXaaXaaXcbaYacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadacDacDafkbbdaZQaZQbbeaStbbfbbgbbhbbibbfbbjbbkbblbbmbbnbboacDacDaYfaVxaWraWsaVxaYgaTnaDeaDeaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaaoaaNaSDaSDaSDaSDaSDaSDaSJaSDaSDaSzaSCbhKaSzaRQaRQaRQaRQaRQaRQaRQaRQaRQaaoboGboHboIboJboKboLaaoaRQaRQaRRaadaDeaDeaDeaDeaDeaDeaDeaDeaDebbqaDeaRSaDeaadaVPaZhadvaZhbbEaZIaZIaZIaZIbbsbbtaVPbbWaWYbbubbvbdXbdYbbyaYGbbzbbAbbBbbCbbDaXcbbracoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaeFaacaacaadaadaacaacaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaadaDeacDacDbbFbbGbbFbbFacDacDacDbhIacDacDacDacDacDaQNacDacDacDaTlaWsaVyaWtaWqaVyaWraTnaDeaDeaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaaoaaNaSFaSDaSGaSDaSGaSDaSHaSDaTvaSzbhMbhKaaoaaoaRQaRQaRQaRQaRQaRQaRQaRQaaoboMboNboOboOboOboPaaoaRQaRQaRRaadaadaadaadaadaadaadaadaadaadaadaadaRSaadaadaVPbbJbbKbbLbbWbbMbbKbbNaZIbbObbtaVPbbcaWYbbPbbQbdZbeabebbecbedbeebecbefbegbehbeiacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaadaacaacaacaacaacaacaacaacaacaacaacaacaadaacaacaacaacaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaDeaDeaDebbXbbXbbXbbXaTlaTlbbYbbZaRcaTlaDeaTlaDeaDeaTlaDeaDeaTlaYfaVxaWraWsaVxaYgaTnaDeaDeaDeaRQaRQaRQaRQaRQaRQaRQaRQaRQaaoaaNaSDaSDaSDaSDaSDaSDaTwaSDaTvaSzbhMbhKaMmaaoaRQaRQaRQaRQaTIaRQaRQaRQaaoboQboRboSboTboSboUaaoaadaadaadbcbaadaadaadaadaadaadaadaadaadaadaadaRSaadaadaVPaZIbccbcdbadbcebcdbcdaZIbcfbcgaVPbbEaWYaXabchbchbcibchbchbcjbckbchbclbcmaXcbejacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaadaadaacaacaacaacaadaadasTaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaTnaDeaDeaDebcobcpbcpbcoaDeaTmbbYbbZaRcaTlaVwaWraVwaVzaWsaVzaVwaWraVwaVzbcobcoaVwaVzaTnaDeaDeaDeaDeaadaRQaRQaadaadaRQaRQaRQaaoaaNaSFaSDaSGaSDaSGaSDaSHaSDaTvaSzbihbhKbidaaoaRQaRQaRQaRQaRQaRQaRQaRQaaoaaoboVboWboXboYboZaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaRSaadaadaVPbcqadvaZhbekbcrbcsbctbelbcubcvaVPbemaWYaXabcxbcxaXKbcyaYGbcjbczbcAbcBbcCaXcbcDacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaadaacaacaacaacaacaacaacaacaacaacaacaacaadaacaacaacaacaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaDeaDeaDebbXbbXbbXbbXaTlaTlbbYbbZaRcaTlaDeaTlaDeaDeaTlaDeaDeaTlaYfaVxaWraWsaVxaYgaTnaDeaDeaDeaRQaRQaRQaRQaRQaRQaRQaRQaRQaaoaaNaSDaSDaSDaSDaSDaSDaTwaSDaTvaSzbhMbhKaMmaaoaRQaRQaRQaRQaTIaRQaRQaRQaaoboQboRboSboTboSboUaaoaadaadaadbcbaadaadaadaadaCXaadaadaadaadaadaadaRSaadaadaVPaZIbccbcdbadbcebcdbcdaZIbcfbcgaVPbbEaWYaXabchbchbcibchbchbcjbckbchbclbcmaXcbejacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaadaadaacaacaacaacaadaadasTaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaTnaDeaDeaDebcobcpbcpbcoaDeaTmbbYbbZaRcaTlaVwaWraVwaVzaWsaVzaVwaWraVwaVzbcobcoaVwaVzaTnaDeaDeaDeaDeaadaRQaRQaadaadaRQaRQaRQaaoaaNaSFaSDaSGaSDaSGaSDaSHaSDaTvaSzbihbhKbidaaoaRQaRQaRQaRQaRQaRQaRQaRQaaoaaoboVboWboXboYboZaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaRSaadaCXaVPbcqadvaZhbekbcrbcsbctbelbcubcvaVPbemaWYaXabcxbcxaXKbcyaYGbcjbczbcAbcBbcCaXcbcDacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaNuaadaadaadaadaadaadbcbaadaadaadaadaadaadaTnaTnaTlaTlbcobcobcobcoaTlaTnbbYbbZaRcaTmbcpbcobcpbcpbcobcpbcpbcobcpbcpbcobcobcpbcpaTlaDeaDeaDeaDeaadaadaadaadaadaadaadaadaaobhLaSDaSDaSDaSDaSDaSDaSJaSDaTxaSzbiebifaaoaaoaRQaRQaRQaRQaRQaRQaRQaadaaoaaoaaoaaoaaoaaoaaoaaoaadaadaadaTIaadaadaadaadaadaadaadaadaadaadaadaRSaadaadaVPbcFbcGbcGbcHbcGbcGbcIaZIbcJbcKaVPbemaWYaXKaXaaXaaXaaWZaWZbcLbcLaXaaXaaXKaXcadvacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaTnaDeaDebcobcpbcpbcoaDeaTnbbYbbZaRcaTnbcoaWqaWtaWqaWtaWqaWtaWqaWtaWqaWtaWqaWtbcoaTlaadaadaadaadaadaadaadaadbcMaadaadaadaaoaaoaTyaTyaSzaTyaTyaSzaSzaSzaSzaSzbigbigaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadasTaRSaadaadaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPbemaWYbpzbpzbpzaWZaWZaWZaWZaWZbpzbpzbpzaXcadvacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadbgrbgrbgrbgrbgrbgrbgrbgraadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaacaacaacaacaacaacaacaacaacaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaTnaDeaDebcobcpbcpbcoaDeaTnbbYbbZaRcaTnbcoaWqaWtaWqaWtaWqaWtaWqaWtaWqaWtaWqaWtbcoaTlaadaadaadaadaadaadaadaadbcMaadaadaadaaoaaoaTyaTyaSzaTyaTyaSzaSzaSzaSzaSzbigbigaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadasTaRSaadaadaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPbemaWYbpAbpAbpAaWZaWZaWZaWZaWZbpAbpAbpAaXcadvacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaTnaTlaTlbcobcobcobcoaTlaTnbbYbbZaRcaTnbcoaWsaWraWsaWraWsaWraWsaWraWsaWraWsaWrbcoaTmaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoaeNaeNaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbcOaadaadaadaadaadaadaadaRSaadaadaadbcPaadaadaadaadaadaadaadaadaadaVPbbWbcQbcRbcRbcRbcRbcRbcRbcRbcSbcRbcRbcRbcTadvacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaTmaDeaDeaWqaYgaYfaWtaDeaTnbbYbbZaRcaTnbcpbcobcpbcpbcobcpbcpbcobcpbcpbcpbcpbcpbcpaTnaadaadaadaadaadaadaadaadaadaadaadaadaadbcMaadaadaadaadaadaadaadaadaadaaoaeNaeNaaoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaRSaadaadaadbcPaadaadaadaadaadaadaadaadaadaVPbeobcXbcXbcXbepbcXbcXbcXbcXbcXbcYbcXbcXbcXadvacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac -aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaTnaTnaDeaTlaDeaDeaTlaDeaTnbbYbbZaRcaTnaYfaWtaYfaYgaWqaYgaYfaWtaYfaYgaYfaYgaYfaYgaTnaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaaoaadaadaadaadaadaadaadbcMaadaadaadaadaadaadaadaadaadbcZaadaadaadaadaadaadaadaadaadaadaadbcbaadaadaRSaadaadaadbcPaadaadaadaadaadaadaadaadaadaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPacoacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac +aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaCXaadaadaadaadaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadaadaadaDeaTnaTnaDeaTlaDeaDeaTlaDeaTnbbYbbZaRcaTnaYfaWtaYfaYgaWqaYgaYfaWtaYfaYgaYfaYgaYfaYgaTnaadaadaadaadaadaadaadaadaCXaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaoaaoaaoaaoaadaadaadaadaadaadaadbcMaadaadaadaadaadaadaadaadaadbcZaadaadaadaadaadaadaadaadaadaadaadbcbaadaadaRSaadaadaadbcPaadaadaadaadaadaadaadaadaadaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPaVPacoacoacoaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbcbaadaadaadaadaadaNuaadaadaadaadaadaadaadaadaadaadaadasTaadaDeaDeaTnaTnaTnaTnaTnaTnaTlaTnbbYbbZaRcaTmaTnaTnaTnaTnaTlaTnaTnaTnaTnaTnaTnaTmaTnaTnaTnaadaadaadaadasTaadaadaadaadaadaadaadaadaadaadaadaadaadaadaeFaadaadaadaadaadaadaadaadasTaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadasTaadaadaadaadaadaadaadaadaadaRSaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadbdabafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbagbbZbdbbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbafbdcaadaadaadaadaadaadbddaadaadaadaadaadaadaadaadaadacoacoaadaRQaRQaRQaRQaRQaRQaRQaRQbdpaRQaRQaRQaRQaRQaRQaRQaRQaRQbdpaRQbdmaRQaRQaRQaacaacaacaacaac aabaabaabaabaabaabaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadacoacoaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadasTaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadasTbbYbbZaRcaadaadaadaadaadaadaadaadasTaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadasTaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadaadasTaadaadaadaadaadaadaadaadaadaadaadaadaadbcZaadaadaadaadasTaRSaadaadaadaadaadaadaadaadbgraadaadaadaadaadaadaadacoacoaadaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaRQaacaacaacaacaac diff --git a/maps/yw/cryogaia_borealismajoris.dm b/maps/yw/cryogaia_borealismajoris.dm index 19b3925faa..6c317c40b6 100644 --- a/maps/yw/cryogaia_borealismajoris.dm +++ b/maps/yw/cryogaia_borealismajoris.dm @@ -68,12 +68,12 @@ var/datum/planet/borealis1/planet_borealis1 = null high_color = "#FFFFFF" min = 0.70 - var/lerp_weight = (abs(min - sun_position)) * 4 + var/interpolate_weight = (abs(min - sun_position)) * 4 var/weather_light_modifier = 1 if(weather_holder && weather_holder.current_weather) weather_light_modifier = weather_holder.current_weather.light_modifier - var/new_brightness = (Interpolate(low_brightness, high_brightness, weight = lerp_weight) ) * weather_light_modifier + var/new_brightness = (LERP(low_brightness, high_brightness, interpolate_weight) ) * weather_light_modifier var/new_color = null if(weather_holder && weather_holder.current_weather && weather_holder.current_weather.light_color) @@ -89,9 +89,9 @@ var/datum/planet/borealis1/planet_borealis1 = null var/high_g = high_color_list[2] var/high_b = high_color_list[3] - var/new_r = Interpolate(low_r, high_r, weight = lerp_weight) - var/new_g = Interpolate(low_g, high_g, weight = lerp_weight) - var/new_b = Interpolate(low_b, high_b, weight = lerp_weight) + var/new_r = LERP(low_r, high_r, interpolate_weight) + var/new_g = LERP(low_g, high_g, interpolate_weight) + var/new_b = LERP(low_b, high_b, interpolate_weight) new_color = rgb(new_r, new_g, new_b) diff --git a/maps/yw/cryogaia_lowerlevel.dmm b/maps/yw/cryogaia_lowerlevel.dmm index 6cb9df4403..89ef875eca 100644 --- a/maps/yw/cryogaia_lowerlevel.dmm +++ b/maps/yw/cryogaia_lowerlevel.dmm @@ -449,7 +449,7 @@ "aiG" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/space) "aiH" = (/obj/structure/table/rack,/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals9,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/turf/simulated/floor/tiled/dark,/area/space) "aiI" = (/obj/structure/grille,/obj/structure/window/reinforced/tinted{dir = 1},/obj/structure/window/reinforced/tinted,/obj/structure/window/reinforced/tinted{dir = 4; icon_state = "twindow"},/obj/structure/window/reinforced/tinted{dir = 8; icon_state = "twindow"},/turf/simulated/floor/plating,/area/chapel/main) -"aiJ" = (/mob/living/simple_animal/clockwork/fluff/Ignis,/turf/simulated/floor/lino,/area/chapel/office) +"aiJ" = (/mob/living/simple_mob/clockwork/fluff/Ignis,/turf/simulated/floor/lino,/area/chapel/office) "aiK" = (/obj/machinery/light/small{icon_state = "bulb1"; dir = 1},/turf/simulated/floor,/area/space) "aiL" = (/obj/structure/sign/poster,/turf/simulated/wall/titanium,/area/space) "aiM" = (/obj/structure/table/steel,/obj/random/maintenance/engineering,/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/space) @@ -673,7 +673,7 @@ "amW" = (/obj/structure/cryofeed,/turf/simulated/floor/tiled/techfloor/grid,/area/crew_quarters/sleep/cryo) "amX" = (/obj/machinery/cryopod{dir = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/crew_quarters/sleep/cryo) "amY" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/medical_restroom) -"amZ" = (/obj/machinery/alarm{pixel_y = 22},/obj/structure/closet/crate/hydroponics{desc = "All you need to start your own honey farm."; name = "beekeeping crate"},/obj/item/beehive_assembly,/obj/item/bee_smoker,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/bee_pack,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled/dark,/area/hydroponics) +"amZ" = (/obj/machinery/alarm{pixel_y = 22},/obj/structure/closet/crate/hydroponics{desc = "All you need to start your own honey farm."; name = "beekeeping crate"},/obj/item/beehive_assembly,/obj/item/bee_smoker,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/bee_pack,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled/dark,/area/hydroponics) "ana" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/reagent_containers/dropper,/obj/structure/cable/green{icon_state = "0-2"},/turf/simulated/floor/tiled/dark,/area/hydroponics) "anb" = (/obj/effect/floor_decal/spline/plain,/turf/unsimulated/beach/sand,/area/crew_quarters/pool) "anc" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/carpet,/area/chapel/main) @@ -1030,7 +1030,7 @@ "atP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/turf/simulated/floor,/area/space) "atQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 10},/turf/simulated/floor,/area/space) "atR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/table/standard,/obj/machinery/requests_console{department = "Atmospherics"; departmentType = 3; name = "Atmos RC"; pixel_x = 0; pixel_y = 28},/obj/item/device/t_scanner,/obj/item/device/multitool{pixel_x = 5},/obj/item/device/radio/headset/headset_eng,/obj/item/weapon/cartridge/atmos,/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/obj/item/clothing/ears/earmuffs,/obj/item/clothing/ears/earmuffs,/obj/item/weapon/cartridge/atmos,/obj/item/device/pipe_painter,/turf/simulated/floor/tiled,/area/space) -"atS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/table/standard,/obj/structure/closet/fireaxecabinet{pixel_y = 32},/obj/machinery/cell_charger,/obj/item/weapon/wrench,/turf/simulated/floor/tiled,/area/space) +"atS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/table/standard,/obj/structure/closet/fireaxecabinet{pixel_y = 32},/obj/machinery/cell_charger,/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled,/area/space) "atT" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/table/standard,/obj/machinery/newscaster{pixel_y = 30},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/clothing/gloves/black,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/belt/utility/atmostech,/obj/item/weapon/storage/belt/utility/atmostech,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Fore Starboard"; dir = 2},/turf/simulated/floor/tiled,/area/space) "atU" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/space) "atV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/space) @@ -1780,7 +1780,7 @@ "aIl" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 12; pixel_y = -24},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/space) "aIm" = (/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/space) "aIn" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/table/rack{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/obj/machinery/door/window/northleft,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/weapon/tank/emergency/oxygen/engi,/turf/simulated/floor/tiled/dark,/area/space) -"aIo" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/civilian{c_tag = "CIV - Emergency EVA"; dir = 1},/turf/simulated/floor/tiled/dark,/area/space) +"aIo" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/industrial/outline/red,/obj/effect/floor_decal/industrial/outline/red,/obj/effect/floor_decal/industrial/outline/red,/obj/effect/floor_decal/industrial/outline/red,/obj/effect/floor_decal/industrial/outline/red,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/civilian{c_tag = "CIV - Emergency EVA"; dir = 1},/turf/simulated/floor/tiled/dark,/area/space) "aIp" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/obj/machinery/door/airlock/medical{name = "Morgue"; req_access = list(6)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/morgue) "aIq" = (/turf/simulated/floor/tiled/techfloor,/area/crew_quarters/sleep/cryo) "aIr" = (/obj/structure/closet/crate,/obj/random/drinkbottle,/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor,/area/space) @@ -1819,7 +1819,7 @@ "aIY" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/drinkbottle,/turf/simulated/floor/plating,/area/space) "aIZ" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/random/maintenance/research,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/space) "aJa" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/remains/human,/turf/simulated/floor/plating,/area/space) -"aJb" = (/obj/item/weapon/storage/fancy/cigar/havana,/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/hostile/mimic/crate,/turf/simulated/floor/plating,/area/space) +"aJb" = (/obj/item/weapon/storage/fancy/cigar/havana,/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate,/turf/simulated/floor/plating,/area/space) "aJc" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main) "aJd" = (/obj/structure/table/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4) "aJe" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/crew_quarters/recreation_area_restroom) @@ -1840,7 +1840,7 @@ "aJt" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/tiled,/area/space) "aJu" = (/obj/random/trash_pile,/turf/simulated/floor/plating,/area/space) "aJv" = (/obj/structure/table/steel,/obj/random/maintenance/engineering,/turf/simulated/floor,/area/space) -"aJw" = (/obj/item/weapon/crowbar,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) +"aJw" = (/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled,/area/vacant/vacant_shop) "aJx" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 0},/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/library_conference_room) "aJy" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22; pixel_y = 0},/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/space) "aJz" = (/obj/structure/closet/crate,/obj/item/clothing/glasses/meson/prescription,/obj/item/weapon/storage/box/lights/mixed,/obj/random/maintenance/security,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/space) @@ -1870,7 +1870,7 @@ "aJX" = (/obj/structure/bed/chair/comfy/green{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/carpet,/area/library) "aJY" = (/obj/structure/bed/chair/comfy/brown{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/space) "aJZ" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/table/rack{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/window/northright,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/weapon/tank/emergency/oxygen/engi,/turf/simulated/floor/tiled/dark,/area/space) -"aKa" = (/obj/structure/dogbed,/obj/effect/floor_decal/corner_techfloor_grid{dir = 10},/mob/living/simple_animal/lizard,/turf/simulated/floor/tiled/techfloor,/area/space) +"aKa" = (/obj/structure/dogbed,/obj/effect/floor_decal/corner_techfloor_grid{dir = 10},/obj/item/toy/plushie/lizard,/turf/simulated/floor/tiled/techfloor,/area/space) "aKb" = (/obj/structure/frame{anchored = 1},/turf/simulated/floor/tiled/techfloor,/area/space) "aKc" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/space) "aKd" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/space) @@ -1889,7 +1889,7 @@ "aKq" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/obj/machinery/space_heater,/turf/simulated/floor/tiled/dark,/area/space) "aKr" = (/obj/effect/decal/cleanable/dirt,/obj/random/junk,/turf/simulated/floor/plating,/area/space) "aKs" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/space) -"aKt" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/space) +"aKt" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/weapon/storage/belt/utility,/obj/item/clothing/mask/gas,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/mob/living/simple_mob/mouse,/turf/simulated/floor/plating,/area/space) "aKu" = (/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor/plating,/area/space) "aKv" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor/plating,/area/space) "aKw" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor/plating,/area/space) @@ -1988,7 +1988,7 @@ "aMl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/space) "aMm" = (/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/color/rainbow,/obj/item/weapon/bedsheet/rainbow,/obj/item/weapon/pen/crayon/rainbow,/turf/simulated/floor,/area/space) "aMn" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light/small{dir = 4},/turf/simulated/floor,/area/space) -"aMo" = (/obj/effect/decal/cleanable/dirt,/mob/living/simple_animal/mouse,/turf/simulated/floor/plating,/area/space) +"aMo" = (/obj/effect/decal/cleanable/dirt,/mob/living/simple_mob/mouse,/turf/simulated/floor/plating,/area/space) "aMp" = (/obj/structure/table/rack,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/mask/gas,/obj/item/device/flashlight,/obj/item/clothing/glasses/meson,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor,/area/space) "aMq" = (/obj/machinery/light/small{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/space) "aMr" = (/obj/structure/closet/crate,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/obj/random/maintenance/research,/turf/simulated/floor,/area/space) @@ -2407,7 +2407,7 @@ "aUo" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/table/reinforced,/obj/item/clothing/mask/gas,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/white,/area/space) "aUp" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact"; dir = 10},/obj/structure/table/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/space) "aUq" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/space) -"aUr" = (/obj/structure/table/reinforced,/obj/item/weapon/wrench,/obj/item/weapon/crowbar/red,/obj/item/clothing/glasses/science,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/space) +"aUr" = (/obj/structure/table/reinforced,/obj/item/weapon/tool/wrench,/obj/effect/floor_decal/industrial/outline/red,/obj/item/clothing/glasses/science,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/space) "aUs" = (/obj/structure/table/reinforced,/obj/machinery/button/ignition{id = "Xenobio"; pixel_x = -6; pixel_y = 4},/obj/structure/cable{icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/space) "aUt" = (/obj/machinery/computer/security/telescreen{desc = "Used to monitor the proceedings inside the test chamber."; name = "Test Chamber Monitor"; network = list("Miscellaneous Reseach"); pixel_x = 32; pixel_y = 0},/obj/item/weapon/stool/padded,/obj/effect/floor_decal/corner/purple,/obj/structure/cable{icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/space) "aUu" = (/obj/structure/closet/toolcloset,/turf/simulated/floor/tiled/white,/area/space) @@ -2656,7 +2656,7 @@ "aZd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/vacant/vacant_shop) "aZe" = (/obj/machinery/door/airlock/glass{name = "Construction Area"; req_access = list(32)},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/vacant/vacant_shop) "aZf" = (/obj/machinery/optable,/obj/effect/decal/remains/unathi,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/tiled/white,/area/space) -"aZg" = (/obj/item/inflatable/door/torn,/obj/item/weapon/screwdriver,/turf/simulated/floor,/area/space) +"aZg" = (/obj/item/inflatable/door/torn,/obj/item/weapon/tool/screwdriver,/turf/simulated/floor,/area/space) "aZh" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet/crate,/obj/item/weapon/reagent_containers/food/drinks/bottle/wine,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/random/drinkbottle,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/space) "aZi" = (/obj/structure/table/rack,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/random/maintenance/clean,/turf/simulated/floor/plating,/area/space) "aZj" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/cobweb2{icon_state = "cobweb1"},/turf/simulated/floor,/area/space) @@ -2689,7 +2689,7 @@ "aZK" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/shuttle/floor,/area/space) "aZL" = (/obj/structure/grille/broken,/turf/simulated/shuttle/plating,/area/space) "aZM" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/shuttle/floor,/area/space) -"aZN" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/wrench,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/space) +"aZN" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = -4; pixel_y = 0},/obj/item/weapon/tool/wrench,/obj/random/medical/lite,/turf/simulated/shuttle/floor,/area/space) "aZO" = (/obj/structure/closet/crate/medical,/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/bodybag/cryobag{pixel_x = 5},/obj/item/weapon/storage/firstaid/o2{layer = 2.8; pixel_x = 4; pixel_y = 6},/obj/item/weapon/storage/box/masks{pixel_x = 0; pixel_y = 0},/obj/item/weapon/storage/box/gloves{pixel_x = 3; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/fire{layer = 2.9; pixel_x = 2; pixel_y = 3},/obj/item/weapon/storage/firstaid/adv{pixel_x = -2},/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/shuttle/floor,/area/space) "aZP" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/shuttle/floor,/area/space) "aZQ" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor,/area/space) diff --git a/maps/yw/cryogaia_mining.dmm b/maps/yw/cryogaia_mining.dmm index 2831a26dbe..f5b091e5ed 100644 --- a/maps/yw/cryogaia_mining.dmm +++ b/maps/yw/cryogaia_mining.dmm @@ -70,7 +70,7 @@ "br" = (/obj/structure/disposaloutlet{dir = 8},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/reinforced,/area/vacant/vacant_site/east) "bs" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/reinforced,/area/vacant/vacant_site/east) "bt" = (/turf/simulated/mineral,/area/mine/unexplored) -"bu" = (/mob/living/simple_animal/hostile/carp/large/huge,/turf/simulated/floor/reinforced,/area/vacant/vacant_site/east) +"bu" = (/obj/item/integrated_circuit/transfer/demultiplexer/huge,/turf/simulated/floor/reinforced,/area/vacant/vacant_site/east) "bv" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/rnd/hallway) "bw" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/reinforced,/area/vacant/vacant_site/east) "bx" = (/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/extinguisher,/turf/simulated/floor/plating,/area/outpost/mining_main/maintenance) @@ -87,13 +87,13 @@ "bI" = (/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "bJ" = (/turf/simulated/wall,/area/rnd/outpost/launch) "bK" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/rnd/hallway) -"bL" = (/obj/item/weapon/material/shard,/mob/living/simple_animal/hostile/carp/large,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"bL" = (/obj/item/weapon/material/shard,/obj/item/device/electronic_assembly/clothing/large,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "bM" = (/obj/structure/grille/broken,/obj/item/weapon/material/shard,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "bN" = (/turf/simulated/mineral/floor/cave,/area/mine/explored) "bO" = (/turf/simulated/wall/titanium,/area/vacant/vacant_site/east) "bP" = (/obj/effect/decal/remains/unathi,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "bQ" = (/turf/simulated/floor/reinforced,/area/rnd/xenobiology/secure) -"bR" = (/mob/living/simple_animal/hostile/carp/large,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"bR" = (/obj/item/device/electronic_assembly/clothing/large,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "bS" = (/obj/effect/decal/remains/tajaran,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "bT" = (/obj/structure/disposaloutlet{dir = 8},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/reinforced,/area/rnd/xenobiology/secure) "bU" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/tiled,/area/rnd/outpost/launch) @@ -108,7 +108,7 @@ "cd" = (/obj/tether_away_spawner/underdark_normal,/turf/simulated/floor/reinforced,/area/rnd/xenobiology/secure) "ce" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/rnd/hallway) "cf" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/rnd/outpost/hallway) -"cg" = (/mob/living/simple_animal/retaliate/goat,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"cg" = (/obj/structure/largecrate/animal/goat,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "ch" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/floor/tiled,/area/rnd/hallway) "ci" = (/obj/effect/decal/remains/posi,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cj" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/cable{dir = 4; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/rnd/hallway) @@ -121,7 +121,7 @@ "cq" = (/obj/structure/old_roboprinter,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cr" = (/obj/effect/decal/cleanable/ash,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cs" = (/obj/structure/disposalpipe/segment,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/reinforced,/area/rnd/xenobiology/secure) -"ct" = (/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"ct" = (/obj/random/mob/robotic/hivebot,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cu" = (/turf/simulated/floor/tiled,/area/rnd/hallway) "cv" = (/obj/effect/decal/cleanable/blood/drip,/obj/structure/inflatable,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cw" = (/obj/machinery/bomb_tester,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/steel_grid,/area/rnd/outpost/launch) @@ -134,14 +134,14 @@ "cD" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{dir = 4; icon_state = "2-8"},/obj/structure/cable{icon_state = "1-2"},/turf/simulated/floor/tiled,/area/rnd/hallway) "cE" = (/obj/structure/window/reinforced,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor/tiled,/area/rnd/hallway) "cF" = (/obj/machinery/door/airlock/glass_external{req_one_access = list(48)},/obj/structure/fans/tiny{name = "Thermal Regulator Vent"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/rnd/outpost/hallway) -"cG" = (/obj/effect/decal/cleanable/blood/drip,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"cG" = (/obj/effect/decal/cleanable/blood/drip,/obj/random/mob/robotic/hivebot,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cH" = (/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cI" = (/obj/structure/bed,/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_c) -"cJ" = (/mob/living/simple_animal/hostile/hivebot/range/guard,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"cJ" = (/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cK" = (/obj/item/weapon/material/shard,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cL" = (/obj/effect/decal/cleanable/blood/drip,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cM" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/outpost/mining_main/maintenance) -"cN" = (/obj/item/weapon/material/shard,/mob/living/simple_animal/hostile/carp,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"cN" = (/obj/item/weapon/material/shard,/obj/structure/plushie/carp,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cO" = (/obj/effect/decal/remains/posi,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cP" = (/obj/effect/decal/cleanable/blood/tracks/footprints,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "cQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; use_power = 0},/obj/machinery/camera/network/research_outpost{c_tag = "OPR - Isolation Cell 1"; dir = 4},/turf/simulated/floor/tiled/dark,/area/outpost/research/isolation_a) @@ -154,7 +154,7 @@ "cX" = (/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/outpost/mining_north) "cY" = (/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plating,/area/outpost/mining_main/maintenance) "cZ" = (/obj/machinery/door/airlock/hatch,/obj/structure/barricade,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) -"da" = (/mob/living/simple_animal/hostile/carp,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"da" = (/obj/structure/plushie/carp,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "db" = (/turf/simulated/wall/r_wall,/area/mine/unexplored) "dc" = (/turf/simulated/wall/titanium,/area/mine/unexplored) "dd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/asteroid_steel,/area/mine/explored) @@ -291,9 +291,9 @@ "fE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/outpost/mining_main/storage) "fF" = (/turf/simulated/wall/r_wall,/area/rnd/xenobiology) "fG" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/full,/obj/machinery/door/blast/regular{id = "xbio2"},/turf/simulated/floor/plating,/area/rnd/xenobiology/secure) -"fH" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe/hammer,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/weapon/shovel,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/brown/bordercorner2,/turf/simulated/floor/tiled,/area/outpost/mining_main/storage) +"fH" = (/obj/structure/table/rack,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/weapon/shovel,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/brown/bordercorner2,/turf/simulated/floor/tiled,/area/outpost/mining_main/storage) "fI" = (/obj/machinery/papershredder,/turf/simulated/floor/tiled/steel,/area/rnd/outpost/launch) -"fJ" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/weapon/shovel,/obj/machinery/light,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/outpost/mining_main/storage) +"fJ" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe,/obj/item/weapon/tool/wrench,/obj/item/weapon/tool/crowbar,/obj/item/weapon/shovel,/obj/machinery/light,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/brown/bordercorner2{dir = 9},/turf/simulated/floor/tiled,/area/outpost/mining_main/storage) "fK" = (/obj/structure/table/standard,/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -28},/turf/simulated/floor/tiled,/area/rnd/outpost/launch) "fL" = (/turf/simulated/wall,/area/rnd/xenobiology/xenoflora/lab_atmos) "fM" = (/turf/simulated/wall,/area/outpost/mining_main/north_hall) @@ -689,7 +689,7 @@ "nm" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/dark,/area/outpost/mining_north) "nn" = (/obj/structure/table/standard,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/pen/blue{pixel_x = -5; pixel_y = -1},/obj/item/weapon/pen/red{pixel_x = -1; pixel_y = 3},/turf/simulated/floor/tiled/dark,/area/rnd/xenobiology/secure) "no" = (/obj/machinery/door/airlock/glass_mining,/turf/simulated/floor/tiled/dark,/area/outpost/mining_north) -"np" = (/mob/living/simple_animal/mouse/mining,/turf/simulated/floor/tiled/dark,/area/outpost/mining_north) +"np" = (/mob/living/simple_mob/animal/passive/mouse/mining,/turf/simulated/floor/tiled/dark,/area/outpost/mining_north) "nq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) "nr" = (/obj/machinery/button/remote/blast_door{id = "xbiocellchange"; name = "Xenobiology Cell Transfer"; pixel_x = 30; pixel_y = 8},/turf/simulated/floor/tiled,/area/rnd/xenobiology/secure) "ns" = (/obj/structure/table/standard,/obj/item/weapon/gun/energy/taser/xeno,/obj/item/device/multitool,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) @@ -746,7 +746,7 @@ "or" = (/obj/structure/disposaloutlet{dir = 1},/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/reinforced,/area/rnd/xenobiology/secure) "os" = (/obj/item/weapon/gun/energy/phasegun/pistol,/obj/structure/table/rack/shelf,/turf/simulated/floor/tiled,/area/rnd/xenobiology/secure) "ot" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/outpost/mining_north) -"ou" = (/obj/structure/table/rack,/obj/item/weapon/pickaxe/hammer,/turf/simulated/floor/tiled/dark,/area/outpost/mining_north) +"ou" = (/obj/structure/table/rack,/turf/simulated/floor/tiled/dark,/area/outpost/mining_north) "ov" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora/lab_atmos) "ow" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/light,/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/green{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora/lab_atmos) "ox" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora/lab_atmos) @@ -780,7 +780,7 @@ "oZ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "pa" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/steel,/area/rnd/hallway) "pb" = (/obj/effect/floor_decal/corner/green{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"pc" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/light{dir = 1},/obj/item/weapon/wrench,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) +"pc" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/light{dir = 1},/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "pd" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/machinery/biogenerator,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "pe" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "pf" = (/obj/machinery/reagentgrinder,/obj/structure/table/glass,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) @@ -976,8 +976,8 @@ "sN" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{icon_state = "map"; dir = 1},/obj/machinery/meter,/obj/machinery/button/ignition{id = "burn_chamber"; pixel_y = 28},/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/outpost/mixing) "sO" = (/obj/machinery/atmospherics/pipe/simple/visible/red{icon_state = "intact"; dir = 10},/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/outpost/mixing) "sP" = (/obj/machinery/alarm{frequency = 1441; pixel_y = 22},/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/outpost/mixing) -"sQ" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/item/device/radio/intercom{pixel_y = 24; req_access = list()},/obj/item/weapon/wrench,/turf/simulated/floor/tiled/white,/area/rnd/outpost/mixing) -"sR" = (/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/table/standard,/obj/item/weapon/wrench,/obj/machinery/camera/network/research_outpost{dir = 8},/obj/item/device/analyzer,/turf/simulated/floor/tiled/white,/area/rnd/outpost/mixing) +"sQ" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/corner/purple{dir = 5},/obj/item/device/radio/intercom{pixel_y = 24; req_access = list()},/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled/white,/area/rnd/outpost/mixing) +"sR" = (/obj/effect/floor_decal/corner/purple/full{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/table/standard,/obj/item/weapon/tool/wrench,/obj/machinery/camera/network/research_outpost{dir = 8},/obj/item/device/analyzer,/turf/simulated/floor/tiled/white,/area/rnd/outpost/mixing) "sS" = (/obj/machinery/light,/obj/machinery/camera/network/research{c_tag = "Research - Toxins Test Chamber South"; dir = 1; network = list("Research","Toxins Test Area")},/turf/simulated/floor/tiled,/area/rnd/test_area) "sT" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 6},/obj/machinery/sparker{id = "burn_chamber"; pixel_x = -24},/turf/simulated/floor/reinforced/airless,/area/rnd/outpost/mixing) "sU" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; external_pressure_bound = 0; frequency = 1445; icon_state = "map_vent_in"; id_tag = "burn_out"; initialize_directions = 4; layer = 2.4; pump_direction = 0},/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 10},/turf/simulated/floor/reinforced/airless,/area/rnd/outpost/mixing) @@ -1168,7 +1168,7 @@ "wx" = (/obj/machinery/atmospherics/pipe/simple/visible/blue{dir = 5},/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{scrub_id = "science_outpost"},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/outpost/heating) "wy" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/outpost/heating) "wz" = (/obj/structure/table/standard,/obj/machinery/recharger,/obj/effect/floor_decal/corner/purple/full{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/outpost/hallway) -"wA" = (/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/table/standard,/obj/item/weapon/wrench{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/wrench{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/tiled/white,/area/rnd/outpost/heating) +"wA" = (/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/table/standard,/obj/item/weapon/tool/wrench{pixel_x = 2; pixel_y = 2},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/item/weapon/tool/wrench{pixel_x = -2; pixel_y = -2},/turf/simulated/floor/tiled/white,/area/rnd/outpost/heating) "wB" = (/obj/machinery/door/airlock/glass_science{name = "Toxins Workshop"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/outpost/hallway) "wC" = (/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/table/standard,/obj/item/device/analyzer,/obj/machinery/camera/network/research_outpost{dir = 1},/obj/effect/floor_decal/corner/purple{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/outpost/heating) "wD" = (/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/obj/item/device/radio/intercom{dir = 1; pixel_y = -24},/obj/effect/floor_decal/corner/purple{dir = 10},/obj/structure/table/standard,/obj/fiftyspawner/steel,/turf/simulated/floor/tiled/white,/area/rnd/outpost/heating) @@ -1391,9 +1391,9 @@ "AM" = (/obj/machinery/newscaster{layer = 3.3; pixel_x = 0; pixel_y = -27},/turf/simulated/floor/tiled/steel,/area/rnd/hallway) "AN" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/tiled,/area/outpost/mining_main/refinery) "AO" = (/obj/machinery/conveyor{dir = 2; id = "mining_internal"},/obj/machinery/mineral/output,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/refinery) -"AP" = (/obj/structure/table/steel,/obj/item/weapon/screwdriver,/obj/item/weapon/crowbar,/obj/item/weapon/wrench,/turf/simulated/floor/tiled/asteroid_steel,/area/mine/explored) +"AP" = (/obj/structure/table/steel,/obj/item/weapon/tool/screwdriver,/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/wrench,/turf/simulated/floor/tiled/asteroid_steel,/area/mine/explored) "AQ" = (/obj/machinery/light{dir = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/mine/explored) -"AR" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/wirecutters,/turf/simulated/floor/tiled/white,/area/rnd/workshop) +"AR" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/weapon/tool/wirecutters,/turf/simulated/floor/tiled/white,/area/rnd/workshop) "AS" = (/obj/machinery/door/airlock/glass_external{req_one_access = list(47)},/obj/structure/fans/tiny{name = "Thermal Regulator Vent"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled,/area/outpost/research/hallway/entry) "AT" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/carpet,/area/outpost/mining_main/dorms2) "AU" = (/obj/effect/floor_decal/corner/lime{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/hallway) @@ -1434,7 +1434,7 @@ "BD" = (/obj/structure/sign/warning/caution,/turf/simulated/wall,/area/rnd/xenobiology) "BE" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/effect/floor_decal/spline/plain{dir = 9},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/freezer,/area/rnd/xenobiology) "BF" = (/obj/machinery/portable_atmospherics/powered/scrubber/huge,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/workshop) -"BG" = (/obj/structure/table/standard,/obj/item/weapon/screwdriver,/obj/item/device/assembly_holder/timer_igniter,/obj/machinery/camera/network/research_outpost{dir = 4},/obj/machinery/light_switch{dir = 1; pixel_x = 4; pixel_y = -24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/workshop) +"BG" = (/obj/structure/table/standard,/obj/item/weapon/tool/screwdriver,/obj/item/device/assembly_holder/timer_igniter,/obj/machinery/camera/network/research_outpost{dir = 4},/obj/machinery/light_switch{dir = 1; pixel_x = 4; pixel_y = -24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/workshop) "BH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/white,/area/rnd/lockers) "BI" = (/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/obj/structure/table/standard,/obj/item/weapon/weldingtool,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/white,/area/rnd/workshop) "BJ" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/outpost/mining_main/north_hall) @@ -1525,7 +1525,7 @@ "Dq" = (/turf/simulated/floor/wood,/area/outpost/research/hallway/mid) "Dr" = (/obj/structure/sign/department/anomaly,/turf/simulated/wall,/area/outpost/research/anomaly_analysis) "Ds" = (/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly_analysis) -"Dt" = (/obj/structure/table/standard,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly_analysis) +"Dt" = (/obj/structure/table/standard,/obj/item/weapon/flame/lighter/random,/obj/item/weapon/tool/crowbar,/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly_analysis) "Du" = (/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/wood,/area/outpost/research/hallway/mid) "Dv" = (/obj/machinery/atm,/turf/simulated/wall,/area/outpost/research/hallway/mid) "Dw" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/effect/floor_decal/corner/purple{dir = 5},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) @@ -1575,7 +1575,7 @@ "Eo" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "Ep" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) "Eq" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -21},/mob/living/carbon/human/monkey,/turf/simulated/floor/tiled/white,/area/outpost/research/hallway/mid) -"Er" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/weapon/screwdriver{pixel_y = 15},/obj/item/weapon/melee/baton/loaded,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly_analysis) +"Er" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/weapon/tool/screwdriver{pixel_y = 15},/obj/item/weapon/melee/baton/loaded,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/outpost/research/anomaly_analysis) "Es" = (/obj/machinery/atmospherics/pipe/manifold/visible/yellow{dir = 4},/turf/simulated/floor/plating,/area/outpost/research/atmosia) "Et" = (/obj/machinery/pipedispenser/disposal,/obj/structure/window/reinforced,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/atmosia) "Eu" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/outpost/research/anomaly_analysis) @@ -1761,8 +1761,8 @@ "HS" = (/obj/structure/inflatable/door,/turf/simulated/mineral/floor/cave,/area/mine/explored) "HT" = (/obj/structure/inflatable,/turf/simulated/mineral/floor/cave,/area/mine/explored) "HU" = (/turf/simulated/wall/durasteel,/area/mine/explored) -"HV" = (/obj/vehicle/train/cargo/engine,/turf/simulated/mineral/floor/cave,/area/mine/explored) -"HW" = (/obj/vehicle/train/cargo/trolley,/turf/simulated/mineral/floor/cave,/area/mine/explored) +"HV" = (/obj/vehicle/train/engine,/turf/simulated/mineral/floor/cave,/area/mine/explored) +"HW" = (/obj/vehicle/train/trolley,/turf/simulated/mineral/floor/cave,/area/mine/explored) "HX" = (/obj/machinery/shower{pixel_y = 20},/turf/simulated/mineral/floor/cave,/area/mine/explored) "HY" = (/obj/machinery/floodlight,/turf/simulated/mineral/floor/cave,/area/mine/explored) "HZ" = (/obj/item/weapon/shreddedp,/turf/simulated/mineral/floor/cave,/area/mine/explored) @@ -1791,7 +1791,7 @@ "Iw" = (/turf/simulated/floor/bluegrid,/area/mine/unexplored) "Ix" = (/turf/simulated/floor/greengrid,/area/mine/unexplored) "Iy" = (/obj/structure/grille/broken,/turf/simulated/floor,/area/mine/unexplored) -"Iz" = (/mob/living/simple_animal/hostile/corrupthound,/turf/simulated/mineral/floor/cave,/area/mine/unexplored) +"Iz" = (/mob/living/simple_mob/vore/aggressive/corrupthound,/turf/simulated/mineral/floor/cave,/area/mine/unexplored) "IA" = (/obj/machinery/robotic_fabricator,/turf/simulated/floor/greengrid,/area/mine/unexplored) "IB" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled,/area/outpost/mining_main/airlock) "IC" = (/obj/effect/landmark{name = "bluespacerift"},/turf/simulated/floor/tiled,/area/outpost/mining_main/airlock) @@ -1814,7 +1814,7 @@ "IT" = (/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/outpost/mining_main/south_hall) "IU" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor,/area/outpost/mining_main/south_hall) "IV" = (/obj/machinery/status_display{layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled,/area/outpost/mining_main/airlock) -"IW" = (/obj/item/weapon/crowbar,/obj/item/weapon/wrench,/obj/item/weapon/storage/toolbox/mechanical,/obj/structure/table/steel,/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/mining_main/airlock) +"IW" = (/obj/item/weapon/tool/crowbar,/obj/item/weapon/tool/wrench,/obj/item/weapon/storage/toolbox/mechanical,/obj/structure/table/steel,/obj/machinery/light,/turf/simulated/floor/tiled,/area/outpost/mining_main/airlock) "IX" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/airlock) "IY" = (/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/outpost/mining_main/south_hall) "IZ" = (/obj/item/weapon/storage/backpack/satchel,/obj/structure/table/steel,/turf/simulated/floor/tiled,/area/outpost/mining_main/airlock) @@ -1845,7 +1845,7 @@ "Jy" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/outpost/research/exp_prep) "Jz" = (/obj/structure/closet/excavation,/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/exp_prep) "JA" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/tiled/white,/area/outpost/research/exp_prep) -"JB" = (/obj/item/weapon/storage/excavation,/obj/item/weapon/pickaxe,/obj/item/weapon/wrench,/obj/item/device/measuring_tape,/obj/item/stack/flag/yellow,/obj/structure/table/steel,/obj/effect/floor_decal/corner/purple{dir = 6},/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/exp_prep) +"JB" = (/obj/item/weapon/storage/excavation,/obj/item/weapon/pickaxe,/obj/item/weapon/tool/wrench,/obj/item/device/measuring_tape,/obj/item/stack/flag/yellow,/obj/structure/table/steel,/obj/effect/floor_decal/corner/purple{dir = 6},/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/exp_prep) "JC" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/outpost/research/exp_prep) "JD" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/archaeology,/obj/item/clothing/suit/space/anomaly,/obj/item/clothing/head/helmet/space/anomaly,/obj/item/clothing/mask/breath,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/westleft,/obj/effect/floor_decal/corner/purple{dir = 6},/turf/simulated/floor/tiled/white,/area/outpost/research/exp_prep) "JE" = (/turf/simulated/wall,/area/outpost/research/power) @@ -2025,7 +2025,7 @@ "MW" = (/obj/item/weapon/material/shard,/obj/structure/barricade,/obj/structure/cable/blue{d2 = 8; icon_state = "0-8"},/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "MX" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) "MY" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/rust/steel_decals_rusted2,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) -"MZ" = (/obj/effect/floor_decal/rust,/mob/living/simple_animal/hostile/hivebot,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) +"MZ" = (/obj/effect/floor_decal/rust,/obj/random/mob/robotic/hivebot,/turf/simulated/floor/tiled/old_tile/gray,/area/vacant/vacant_site/east) (1,1,1) = {" aRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaRaR diff --git a/maps/yw/cryogaia_telecomms.dm b/maps/yw/cryogaia_telecomms.dm index 95bda08ed7..a2c67a0fb2 100644 --- a/maps/yw/cryogaia_telecomms.dm +++ b/maps/yw/cryogaia_telecomms.dm @@ -58,6 +58,6 @@ name = "pre-linked multitool (tether hub)" desc = "This multitool has already been linked to the Tether telecomms hub and can be used to configure one (1) relay." -/obj/item/device/multitool/cryogaia_buffered/initialize() +/obj/item/device/multitool/cryogaia_buffered/Initialize() . = ..() buffer = locate(/obj/machinery/telecomms/hub/preset/cryogaia) \ No newline at end of file diff --git a/maps/yw/cryogaia_turfs.dm b/maps/yw/cryogaia_turfs.dm index 044aa75dcb..5e89a6de1d 100644 --- a/maps/yw/cryogaia_turfs.dm +++ b/maps/yw/cryogaia_turfs.dm @@ -180,7 +180,7 @@ CRYOGAIA_TURF_CREATE(/turf/simulated/mineral/floor) /turf/simulated/sky/virgo3b color = "#FFBBBB" -/turf/simulated/sky/virgo3b/initialize() +/turf/simulated/sky/virgo3b/Initialize() SSplanets.addTurf(src) set_light(2, 2, "#FFBBBB") diff --git a/maps/yw/submaps/_tether_submaps.dm b/maps/yw/submaps/_tether_submaps.dm index 18be57a76f..c6d0f28380 100644 --- a/maps/yw/submaps/_tether_submaps.dm +++ b/maps/yw/submaps/_tether_submaps.dm @@ -125,6 +125,7 @@ name = "Spa" flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED + ////////////////////////////////////////////////////////////////////////////////////// // Code Shenanigans for Tether lateload maps /datum/map_template/tether_lateload @@ -143,7 +144,7 @@ flags = MAP_LEVEL_SEALED /datum/map_z_level/tether_lateload/New(var/datum/map/map, mapZ) - if(mapZ) + if(mapZ && !z) z = mapZ return ..(map) @@ -155,7 +156,7 @@ /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each affect_ghosts = 1 -/obj/effect/step_trigger/zlevel_fall/initialize() +/obj/effect/step_trigger/zlevel_fall/Initialize() . = ..() if(istype(get_turf(src), /turf/simulated/floor)) @@ -215,17 +216,17 @@ var/guard //# will set the mobs to remain nearby their spawn point within this dist //Internal use only - var/mob/living/simple_animal/my_mob + var/mob/living/simple_mob/my_mob var/depleted = FALSE -/obj/tether_away_spawner/initialize() +/obj/tether_away_spawner/Initialize() . = ..() if(!LAZYLEN(mobs_to_pick_from)) error("Mob spawner at [x],[y],[z] ([get_area(src)]) had no mobs_to_pick_from set on it!") initialized = TRUE return INITIALIZE_HINT_QDEL - processing_objects |= src + START_PROCESSING(SSobj, src) /obj/tether_away_spawner/process() if(my_mob && my_mob.stat != DEAD) @@ -259,14 +260,14 @@ my_mob.max_tox = gaslist["phoron"] * 1.2 my_mob.max_n2 = gaslist["nitrogen"] * 1.2 my_mob.max_co2 = gaslist["carbon_dioxide"] * 1.2 - +/* //VORESTATION AI TEMPORARY REMOVAL if(guard) my_mob.returns_home = TRUE my_mob.wander_distance = guard - +*/ return else - processing_objects -= src + STOP_PROCESSING(SSobj, src) depleted = TRUE return @@ -282,5 +283,5 @@ prob_fall = 1 guard = 10 //Don't wander too far, to stay alive. mobs_to_pick_from = list( - /mob/living/simple_animal/shadekin - ) + // /mob/living/simple_mob/shadekin //VORESTATION AI TEMPORARY REMOVAL + ) \ No newline at end of file diff --git a/maps/yw/submaps/aerostat/_aerostat.dm b/maps/yw/submaps/aerostat/_aerostat.dm index 6b754e8593..c12d166437 100644 --- a/maps/yw/submaps/aerostat/_aerostat.dm +++ b/maps/yw/submaps/aerostat/_aerostat.dm @@ -48,7 +48,7 @@ shuttle_name = "Excursion Shuttle" destinations = list(/datum/shuttle_destination/excursion/virgo2orbit, /datum/shuttle_destination/excursion/aerostat) -/obj/away_mission_init/aerostat/initialize() +/obj/away_mission_init/aerostat/Initialize() seed_submaps(list(z), 50, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2) new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, z, world.maxx, world.maxy) new /datum/random_map/noise/ore/virgo2(null, 1, 1, z, 64, 64) @@ -64,10 +64,10 @@ prob_fall = 50 guard = 20 mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/hivebot/range = 3, - /mob/living/simple_animal/hostile/hivebot/range/ion = 3, - /mob/living/simple_animal/hostile/hivebot/range/laser = 3, - /mob/living/simple_animal/hostile/corrupthound = 1 + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic = 3, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion = 3, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser = 3, + /mob/living/simple_mob/vore/aggressive/corrupthound = 1 ) /obj/tether_away_spawner/aerostat_surface @@ -78,9 +78,9 @@ prob_fall = 50 guard = 20 mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/jelly = 3, - /mob/living/simple_animal/hostile/viscerator = 2, - /mob/living/simple_animal/hostile/corrupthound = 1 + /mob/living/simple_mob/vore/aggressive/corrupthound = 3, + /mob/living/simple_mob/mechanical/viscerator = 2, + /mob/living/simple_mob/vore/aggressive/corrupthound = 1 ) /obj/structure/old_roboprinter @@ -129,7 +129,7 @@ color = "#eacd7c" VIRGO2_SET_ATMOS -/turf/unsimulated/floor/sky/virgo2_sky/initialize() +/turf/unsimulated/floor/sky/virgo2_sky/Initialize() skyfall_levels = list(z+1) . = ..() diff --git a/maps/yw/submaps/alienship/_alienship.dm b/maps/yw/submaps/alienship/_alienship.dm index be9f764155..7336a0db19 100644 --- a/maps/yw/submaps/alienship/_alienship.dm +++ b/maps/yw/submaps/alienship/_alienship.dm @@ -34,7 +34,7 @@ var/door_on_mode var/teleport_on_mode -/obj/away_mission_init/alienship/initialize() +/obj/away_mission_init/alienship/Initialize() . = ..() if(!mission_mode) //WE ARE NUMBER ONE @@ -120,7 +120,7 @@ var/area/dump_area var/obj/shuttle_connector/shuttle_friend -/area/shuttle/excursion/away_alienship/initialize() +/area/shuttle/excursion/away_alienship/Initialize() . = ..() dump_area = locate(/area/tether_away/alienship/equip_dump) diff --git a/maps/yw/submaps/beach/_beach.dm b/maps/yw/submaps/beach/_beach.dm index 321716e3ad..964ea587af 100644 --- a/maps/yw/submaps/beach/_beach.dm +++ b/maps/yw/submaps/beach/_beach.dm @@ -72,7 +72,7 @@ name = "away mission initializer - beachcave" //In our case, it initializes the ores and random submaps in the beach's cave, then deletes itself -/obj/away_mission_init/beachcave/initialize() +/obj/away_mission_init/beachcave/Initialize() // Cave submaps are first. seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/normal, /datum/map_template/surface/mountains/normal) seed_submaps(list(z), 50, /area/tether_away/cave/unexplored/deep, /datum/map_template/surface/mountains/deep) @@ -95,8 +95,7 @@ prob_fall = 25 //Chance goes down by this much each time it spawns one (not defining and prob_spawn 100 means they spawn as soon as one dies) guard = 40 //They'll stay within this range (not defining this disables them staying nearby and they will wander the map (and through step teleports)) mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/giant_snake = 3, //Snakes are 3x more likely to spawn than, - /mob/living/simple_animal/hostile/frog = 1 //these frogs are, with these values + /mob/living/simple_mob/animal/passive/snake ) /obj/tether_away_spawner/beach_outside_friendly @@ -107,7 +106,7 @@ prob_fall = 25 guard = 40 mobs_to_pick_from = list( - /mob/living/simple_animal/fennec + /mob/living/simple_mob/vore/fennec ) /obj/tether_away_spawner/beach_cave @@ -115,12 +114,14 @@ faction = "beach_cave" atmos_comp = TRUE prob_spawn = 100 - prob_fall = 10 + prob_fall = 40 guard = 20 mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/deathclaw, - /mob/living/simple_animal/hostile/frog, - /mob/living/simple_animal/hostile/hivebot/range/ion + /mob/living/simple_mob/vore/aggressive/frog = 3, //Frogs are 3x more likely to spawn than, + /mob/living/simple_mob/vore/aggressive/deathclaw = 1, //these deathclaws are, with these values, + /mob/living/simple_mob/animal/giant_spider = 3, + /mob/living/simple_mob/vore/aggressive/giant_snake = 1, + /mob/living/simple_mob/animal/giant_spider/ion = 2 ) // These are step-teleporters, for map edge transitions diff --git a/maps/yw/tether_phoronlock.dm b/maps/yw/tether_phoronlock.dm index 9912c1ea23..0d1d1b1052 100644 --- a/maps/yw/tether_phoronlock.dm +++ b/maps/yw/tether_phoronlock.dm @@ -50,7 +50,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior var/frequency = 0 var/datum/radio_frequency/radio_connection -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/initialize() +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize() . = ..() if(frequency) set_frequency(frequency) @@ -97,7 +97,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior /obj/machinery/embedded_controller/radio/airlock/phoron var/tag_scrubber -/obj/machinery/embedded_controller/radio/airlock/phoron/initialize() +/obj/machinery/embedded_controller/radio/airlock/phoron/Initialize() . = ..() program = new/datum/computer/file/embedded_program/airlock/phoron(src) @@ -116,7 +116,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior "processing" = program.memory["processing"] ) - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) + ui = GLOB.nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) ui = new(user, src, ui_key, "phoron_airlock_console.tmpl", name, 470, 290) ui.set_initial_data(data) diff --git a/maps/yw/tether_things.dm b/maps/yw/tether_things.dm index 690579c07e..2acc550713 100644 --- a/maps/yw/tether_things.dm +++ b/maps/yw/tether_things.dm @@ -35,7 +35,7 @@ -/obj/effect/step_trigger/teleporter/planetary_fall/borealis1/initialize() +/obj/effect/step_trigger/teleporter/planetary_fall/borealis1/Initialize() planet = planet_borealis1 . = ..() @@ -90,7 +90,7 @@ var/area/shock_area = /area/tether/surfacebase/tram -/turf/simulated/floor/maglev/initialize() +/turf/simulated/floor/maglev/Initialize() . = ..() shock_area = locate(shock_area) @@ -130,7 +130,7 @@ /obj/machinery/smartfridge/chemistry/chemvator/down name = "\improper Smart Chemavator - Lower" -/obj/machinery/smartfridge/chemistry/chemvator/down/initialize() +/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize() . = ..() var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) if(istype(above)) @@ -252,22 +252,22 @@ var/global/list/latejoin_tram = list() "Beach" = new/datum/holodeck_program(/area/houseboat/holodeck/beach), "Desert" = new/datum/holodeck_program(/area/houseboat/holodeck/desert, list( - 'sound/effects/wind/wind_2_1.ogg', - 'sound/effects/wind/wind_2_2.ogg', - 'sound/effects/wind/wind_3_1.ogg', - 'sound/effects/wind/wind_4_1.ogg', - 'sound/effects/wind/wind_4_2.ogg', - 'sound/effects/wind/wind_5_1.ogg' + 'sound/effects/weather/wind/wind_2_1.ogg', + 'sound/effects/weather/wind/wind_2_2.ogg', + 'sound/effects/weather/wind/wind_3_1.ogg', + 'sound/effects/weather/wind/wind_4_1.ogg', + 'sound/effects/weather/wind/wind_4_2.ogg', + 'sound/effects/weather/wind/wind_5_1.ogg' ) ), "Snowfield" = new/datum/holodeck_program(/area/houseboat/holodeck/snow, list( - 'sound/effects/wind/wind_2_1.ogg', - 'sound/effects/wind/wind_2_2.ogg', - 'sound/effects/wind/wind_3_1.ogg', - 'sound/effects/wind/wind_4_1.ogg', - 'sound/effects/wind/wind_4_2.ogg', - 'sound/effects/wind/wind_5_1.ogg' + 'sound/effects/weather/wind/wind_2_1.ogg', + 'sound/effects/weather/wind/wind_2_2.ogg', + 'sound/effects/weather/wind/wind_3_1.ogg', + 'sound/effects/weather/wind/wind_4_1.ogg', + 'sound/effects/weather/wind/wind_4_2.ogg', + 'sound/effects/weather/wind/wind_5_1.ogg' ) ), "Space" = new/datum/holodeck_program(/area/houseboat/holodeck/space, @@ -341,10 +341,10 @@ var/global/list/latejoin_tram = list() prob_fall = 50 guard = 20 mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/jelly = 3, - /mob/living/simple_animal/hostile/giant_spider/hunter = 1, - /mob/living/simple_animal/hostile/giant_spider/phorogenic = 1, - /mob/living/simple_animal/hostile/giant_spider/lurker = 1, + /mob/living/simple_mob/animal/space/jelly = 3, + /mob/living/simple_mob/animal/giant_spider/hunter = 1, + /mob/living/simple_mob/animal/giant_spider/phorogenic = 1, + /mob/living/simple_mob/animal/giant_spider/lurker = 1, ) /obj/tether_away_spawner/underdark_hard @@ -355,9 +355,9 @@ var/global/list/latejoin_tram = list() prob_fall = 50 guard = 20 mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/corrupthound = 1, - /mob/living/simple_animal/hostile/rat = 1, - /mob/living/simple_animal/hostile/mimic = 1 + /mob/living/simple_mob/vore/aggressive/corrupthound = 1, + /mob/living/simple_mob/vore/aggressive/rat = 1, + /mob/living/simple_mob/animal/space/mimic = 1 ) /obj/tether_away_spawner/underdark_boss @@ -368,7 +368,7 @@ var/global/list/latejoin_tram = list() prob_fall = 100 guard = 70 mobs_to_pick_from = list( - /mob/living/simple_animal/hostile/dragon = 1 + /mob/living/simple_mob/vore/aggressive/dragon = 1 ) // Used at centcomm for the elevator diff --git a/vorestation.dme b/vorestation.dme index 54731d6d8d..f87e127ffa 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2386,6 +2386,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\shantak.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\sif.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\alien.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\space\animals_yw.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bats.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\bear.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\carp.dm" @@ -2812,6 +2813,7 @@ #include "code\modules\reagents\reagent_containers\syringes.dm" #include "code\modules\reagents\reagent_containers\syringes_vr.dm" #include "code\modules\reagents\reagent_containers\unidentified_hypospray.dm" +#include "code\modules\reagents\reagent_containers\food\drinks\bluespacecoffee.dm" #include "code\modules\recycling\conveyor2.dm" #include "code\modules\recycling\disposal-construction.dm" #include "code\modules\recycling\disposal.dm" @@ -3173,6 +3175,6 @@ #include "maps\submaps\surface_submaps\plains\plains_areas.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" -#include "maps\tether\tether.dm" +#include "maps\yw\cryogaia.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE