From 66dc451a6388e7238985c245f9b9156d8dca127a Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie Date: Fri, 15 Jul 2022 21:07:47 +0100 Subject: [PATCH] More map tweaks --- _maps/map_files/MetaStation/MetaStation.dmm | 30 ++++---- .../SyndieBoxStation/SyndieBoxStation.dmm | 75 +++++++++++++------ 2 files changed, 70 insertions(+), 35 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2b438528..54b0c6f8 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -444,7 +444,7 @@ "aiB" = (/obj/structure/window/reinforced{dir = 1},/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) "aiC" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) "aiD" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/open/floor/plasteel/dark,/area/crew_quarters/fitness/recreation) -"aiE" = (/obj/structure/closet/crate{name = "Asshole Containment"},/obj/item/banhammer,/obj/item/toy/plush/mammal/winfre{item_state = "Winfre"; name = "Winfre, Destroyer of Fun"},/turf/open/floor/plating/asteroid/airless,/area/space) +"aiE" = (/obj/structure/closet/crate{name = "Asshole Containment"},/obj/item/banhammer,/turf/open/floor/plating/asteroid/airless,/area/space) "aiF" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "aiG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "aiH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Holodeck Door"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) @@ -536,7 +536,7 @@ "akp" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/machinery/magnetic_controller{autolink = 1; pixel_y = 3},/obj/item/clothing/ears/earmuffs,/obj/item/clothing/glasses/sunglasses{pixel_x = 3; pixel_y = 3},/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plasteel,/area/security/range) "akq" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/security/range) "akr" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light/small{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/security/range) -"aks" = (/obj/structure/table/reinforced,/obj/machinery/chem_dispenser/drinks,/turf/open/floor/plating,/area/maintenance/fore) +"aks" = (/obj/structure/table/reinforced,/obj/machinery/chem_dispenser/drinks{dir = 4},/turf/open/floor/plating,/area/maintenance/fore) "akt" = (/obj/structure/chair/comfy{dir = 8},/obj/item/restraints/handcuffs,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/showroomfloor,/area/maintenance/fore) "aku" = (/obj/machinery/light{dir = 8},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "akv" = (/obj/structure/chair/stool{pixel_y = 8},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) @@ -2037,7 +2037,7 @@ "aNi" = (/obj/structure/closet/secure_closet/personal,/obj/structure/sign/map/right{desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; pixel_y = 32},/obj/item/clothing/suit/hooded/wintercoat,/obj/item/clothing/shoes/winterboots,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/locker) "aNj" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/locker) "aNk" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/locker) -"aNl" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/pump,/obj/effect/turf_decal/delivery,/obj/structure/sign/poster/official/random{pixel_y = 32},/turf/open/floor/plasteel,/area/crew_quarters/locker) +"aNl" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/pump,/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/crew_quarters/locker) "aNm" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 1},/obj/machinery/firealarm{pixel_y = 27},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/crew_quarters/locker) "aNn" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/status_display/evac{pixel_y = 30},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/crew_quarters/locker) "aNo" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible,/obj/machinery/portable_atmospherics/scrubber,/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = 26},/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/crew_quarters/locker) @@ -4256,8 +4256,8 @@ "bDR" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/white/corner,/area/hallway/secondary/entry) "bDS" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "bDT" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plating,/area/maintenance/port) -"bDU" = (/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) -"bDV" = (/obj/effect/turf_decal/bot,/obj/structure/railing,/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) +"bDU" = (/obj/effect/turf_decal/bot,/obj/vehicle/ridden/grocery_cart{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) +"bDV" = (/obj/effect/turf_decal/bot,/obj/structure/railing,/obj/vehicle/ridden/grocery_cart{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "bDW" = (/turf/open/floor/wood,/area/security/vacantoffice) "bDX" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/wood,/area/security/vacantoffice) "bDY" = (/obj/structure/table/wood,/obj/item/flashlight/lamp,/turf/open/floor/wood,/area/security/vacantoffice) @@ -4342,7 +4342,7 @@ "bFz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "bFA" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "bFB" = (/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) -"bFC" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/bot,/obj/structure/railing,/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) +"bFC" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/bot,/obj/structure/railing,/obj/vehicle/ridden/grocery_cart{dir = 4},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "bFD" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/wood,/area/security/vacantoffice) "bFE" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/wood,/area/security/vacantoffice) "bFF" = (/obj/structure/filingcabinet,/turf/open/floor/wood,/area/security/vacantoffice) @@ -4432,8 +4432,8 @@ "bHl" = (/obj/machinery/door/airlock/external{name = "Transport Airlock"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/turf/open/floor/plating,/area/hallway/secondary/entry) "bHm" = (/obj/machinery/status_display/evac{pixel_x = 32},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/white/corner,/area/hallway/secondary/entry) "bHn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) -"bHo" = (/obj/effect/turf_decal/bot,/obj/structure/railing{dir = 8},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) -"bHp" = (/obj/item/radio/intercom{pixel_y = -28},/obj/effect/turf_decal/bot,/obj/structure/railing{dir = 8},/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) +"bHo" = (/obj/effect/turf_decal/bot,/obj/structure/railing{dir = 8},/obj/vehicle/ridden/grocery_cart,/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) +"bHp" = (/obj/item/radio/intercom{pixel_y = -28},/obj/effect/turf_decal/bot,/obj/structure/railing{dir = 8},/obj/vehicle/ridden/grocery_cart,/turf/open/floor/plasteel/grimy,/area/hallway/secondary/entry) "bHq" = (/obj/structure/light_construct{dir = 8},/turf/open/floor/wood,/area/security/vacantoffice) "bHr" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/structure/table/wood,/obj/item/paper_bin{pixel_x = -2; pixel_y = 6},/turf/open/floor/wood,/area/security/vacantoffice) "bHs" = (/obj/machinery/door/airlock{id_tag = "AuxShower"; name = "Shower"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/crew_quarters/toilet/auxiliary) @@ -8171,6 +8171,7 @@ "faq" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/machinery/vending/mealdor,/turf/open/floor/plasteel,/area/hallway/secondary/entry) "fqe" = (/obj/structure/chair/sofa{dir = 8},/turf/open/floor/wood,/area/crew_quarters/bar) "fSS" = (/obj/structure/reagent_dispensers/watertank,/turf/open/floor/plating{icon_state = "platingdmg3"},/area/maintenance/port) +"gbL" = (/obj/structure/sign/departments/restroom,/turf/closed/wall,/area/crew_quarters/toilet/restrooms) "gCy" = (/obj/structure/table/wood,/obj/item/clipboard,/obj/item/paper,/turf/open/floor/wood,/area/security/vacantoffice) "gNd" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/burger/superbite{pixel_x = -10; pixel_y = 10},/obj/item/reagent_containers/food/snacks/store/cake/birthday{pixel_y = -5; pixel_x = -3},/obj/item/reagent_containers/food/snacks/chocolatebunny{pixel_x = 10; pixel_y = 10},/turf/open/floor/plasteel/showroomfloor,/area/maintenance/fore) "hbu" = (/obj/structure/chair/office/dark{dir = 1},/turf/open/floor/wood,/area/security/vacantoffice) @@ -8189,9 +8190,10 @@ "mRW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "mSr" = (/obj/structure/chair/wood,/turf/open/floor/carpet/purple,/area/maintenance/port/fore) "ngg" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/table/wood,/obj/item/flashlight/lamp,/turf/open/floor/wood,/area/security/vacantoffice) -"njR" = (/obj/item/bedsheet/random,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/toy/plush/random,/turf/open/floor/plating,/area/maintenance/fore) +"njR" = (/obj/item/bedsheet/random,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/toy/plush/random,/obj/structure/bed,/turf/open/floor/plating,/area/maintenance/fore) "nmb" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = 20},/turf/open/floor/plasteel/white,/area/science/research) "nmK" = (/obj/machinery/newscaster{pixel_x = -30},/turf/open/floor/carpet,/area/science/research) +"nOe" = (/obj/structure/sign/departments/restroom,/turf/closed/wall,/area/crew_quarters/toilet/auxiliary) "ojj" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "omF" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/command{dir = 4; name = "Captain's Quarters"; req_access_txt = "20"},/turf/open/floor/plasteel/dark,/area/crew_quarters/heads/captain/private) "oDK" = (/obj/effect/turf_decal/bot_white,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/gateway{dir = 4},/turf/open/floor/plasteel/dark,/area/gateway) @@ -8200,6 +8202,8 @@ "pWE" = (/obj/structure/rack,/obj/item/storage/box/donkpockets/donkpocketspicy,/turf/open/floor/plating,/area/maintenance/port/fore) "qmc" = (/obj/effect/decal/cleanable/salt,/turf/open/floor/plating,/area/maintenance/fore) "qKo" = (/obj/structure/chair/sofachair,/turf/open/floor/wood,/area/security/vacantoffice) +"rJH" = (/obj/structure/sign/carts,/turf/closed/wall,/area/hallway/secondary/entry) +"sok" = (/obj/structure/sign/carts,/turf/closed/wall,/area/security/vacantoffice) "sKK" = (/obj/machinery/door/airlock/maintenance{dir = 8; req_one_access_txt = "12;25;46"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard) "ujn" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plating,/area/maintenance/port/fore) "unZ" = (/obj/machinery/light_switch{pixel_x = -28},/turf/open/floor/wood,/area/security/vacantoffice) @@ -8306,13 +8310,13 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaoDaoDaoDaoDaoDaoDaoDaySaoDaafaafaafaafakZayTawQaoOaiVaaaaaaaaaaaaaaaaaaayUayUayUayVayWayVayVayXayVayVayYayYayYayYayZayYazaakZaafaxNazbazcazdazeazfaxNaaaaaaaaaaaaaaaaaaaaaaaaaicazgazhaziaicazgazjaziaicazgazkaziaicazlaiWazmaicaiWaznazoazpazqazrazrazsaztazuazrazrazvaicaicaicaicaicaqSayrazwazxazyayraswaswaswaswazzazAazBawjawkaswaswaswalZazCapPaowapQapQazDapQaxCaxCaxCaxCaxCazEazFazGazHazIazJazKazKazKazLazMaafaafaafaaaaaaaaaaaaaaaaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaafaafaafaoDaoDaoDaoDaqeaoDaoDaoDazNaoDaoDaoDaoDaafaaaaafaiVavDawQazOakZaaaaaaaaaaaaaaaaaaayUazPazQayVazRazSazTazUazVayVazWazXazYazZaAaayYazaakZaaaaxNaAbaAcaAdaAeaAfaxNaaaaaaaaaaaaaaaaaaaAgaAhajQaAiaAjaAkaicaAlaAmaAkaicaAnaAjaAkaicaAoaApaAqaicaAraAsaAtaAuaAvazraAwaAxaAyaAzaAAaABazvaACaADaAEaCHaAGaAHayraAIaAJaAKayraALaAMaANaswaAOaAPaAQaARaASaATaAUaAUayGaAWaxCaxCaxCaxCaxCaxCaxCaAXaAYaAZaBaaBbaBcaBdaBeazMaBfaBgaBhaBiaBjaBkackackaafaaaaaaaaaaaaaaaaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaoDaoDaoDaoDaoDaoDaoDaafaoDaafaafaoDaoDaafaafakZakZarMawQakZakZaaaaaaaaaaaaaaaaBlaBmaBnaBnaBoaBpaBqaBraBsaBtaBuaBvaBwaBxaByaBzayYaBAakZaaaaxNaBBaBCaBDaBEaBFaxNaaaaaaaaaaaaaaaaBGaBHaBIajQaBJaAjaBKaicaBJaAjaBLaicaBJaAjaBMaicaBNaBOaBPaicaBQaBRaBSaBTaBUazraBVaBWaBXaBYaBZaCaazvaCbaCcapFapFaCdaCeayraCfaCgaChayraCiaCjaCjaCkaClaCmaCnaswaswaswaswaswalZaCoaxCaCpaCqaCraCsaCtaCuaCvaCwaCxaCyaCzaCAaCBaCCaCDazKaCEaCFaCFazKaCDaCGackaafaaaaaaaaaaaaaaaaaaaoEaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaoDaoDaoDaoDaoDaafaafaafaoDaoDaoDaaiaaaaafaafaafaaaakZamkamkawQaiVaaaaaaaaaaaaaaaaaaaaaayUaCIaCJaCKaBpaBnaCLaCMaCNayVaCOaCPaCQaCRaCSayYazaakZaafaxNaCTaCUaCVaCWaCXaxNaaaaaaaaaaaaaaaaaaaAgaCYajQaCZaDaaDbajQaCZaDaaDbajQaCZaDaaDbajQaDcaDdaDeajQajQaDfaDgaylaDhaDiaDjaDkaDlaDmaDnaDoazvaDpayrayrayraDqayrayraDraDsayrayraDtaDuaDvaDwaDxaDyaDzawjaDAatUatVaswaDBaDCaxCaDDaAZaDEaBbaDFaDGaDHaDIaDJaDKaDLaDLaDMaDNaDOaDPaDQaDRaDRaDPaDSaDTaDUaDUazMaxCaxCaxCaaaaaaaoEaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaoDaoDaoDaoDaoDaafaafaafaoDaoDaoDaaiaaaaafaafaafaaaakZamkamkawQaiVaaaaaaaaaaaaaaaaaaaaaayUaCIaCJaCKaBpaBnaCLaCMaCNayVaCOaCPaCQaCRaCSayYazaakZaafaxNaCTaCUaCVaCWaCXaxNaaaaaaaaaaaaaaaaaaaAgaCYajQaCZaDaaDbajQaCZaDaaDbajQaCZaDaaDbajQaDcaDdaDeajQajQaDfaDgaylaDhaDiaDjaDkaDlaDmaDnaDoazvaDpayrayrayraDqayrayraDraDsayrgbLaDtaDuaDvaDwaDxaDyaDzawjaDAatUatVaswaDBaDCaxCaDDaAZaDEaBbaDFaDGaDHaDIaDJaDKaDLaDLaDMaDNaDOaDPaDQaDRaDRaDPaDSaDTaDUaDUazMaxCaxCaxCaaaaaaaoEaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaDVaDVaDVaDVaDVaDVaDVaDVaDVaDVaDVawQakZakZaaaaaaaaaaaaaaaaaaayUayUayUayVaDWaBnaDXaDYaDZayVaEaaEbaEcaEdaEeayYazaakZaaaaxNaEfaEgaEhaEiaxNaxNaaaaaaaaaaaaaaaaaaaAhaEjaAhaEkaElaEkaEmaEkaElaEkaEnaEkaElaEkaEoaEpaEqaEraEsaEtaEuaEvajQawfazvaEwaExaEyaEzaEAaEBazvaECayraEDaEEaEFaEGaEGaEHaEIaEJaEKaELaEMaENaEOaEPaEQaveaERaESaETaEUaswaEVawAaxCaEWaEXaEYaEZaFaaFbaFcaFdaFeaFfaFgaFhaFiaFiaFjaFkaFlaFiaFiaFmaFnaFoaFpaCEaFqaFraFsaxCaafaafaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaaaaaaafaafaaaaoDaDVaFtaFtaFtaFtaFtaFtaFtaFtaFtaDVaFuaFvakZaaaaaaaaaaaaaaaaaaaafaafaafayUaFwaFxaFyaFzaFAayVaFBaFCaFDaFEaFFayYazaakZaaaaafaaaaFGaFHaFIaaaaafaaaaAhaAgaAgaAgaAhaAhaFJaFKaEqaFLaFMaFNaFOaFPaFQaFRaFQaFSaFOaFTaFUaFVaFWaFXaFYaFZaGaajQawfazvazvaGbaGcazvaGdazvazvaDpayrayrayraGeaGfaGgaGhaGiaGjaGkaGlaGmaGnaGoaGoaGpaGqaswaswaswaswaswaGraGsaxCaGtaGuaGvaGwaGxaGyaGzaGAaGBaGCaGDaGEaGFaGGaGGaGHaGIaGIaGJaGKaGLaGMaGNaGOaGPaGPaGQaxCaaaaaaaoEaGRaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaaaaaaaaaafaaaaaaaDVaFtaFtaFtaFtaFtaFtaFtaFtaFtaDVawJaGSakZaaaaaaaaaaaaaaaaaaaaaaaaaafayUaGTaGUaGVaGWaGXayVaGYaGZayYayYayYayYaHaakZaHbaHcaHdaHeaHfaHgaHhaHiaHbaAhaHjaHkaHkaHlaHmaHnaHoaHpaHqaHraHsaHtaHuaHvaHwaHuaHxaHyaHzaHAaHBaHCaHDaHEaHFaHGajQawfaHHazvaHIaHJazvaHKaHLaHMaHNayraHOaHPaHQaHRayraHSaHTaHUayraHVaHWaHXaHYaHXaHZaIaaIbaIcaIdaIeaswaIfaIgaxCaIhaIiaIjaIkaIlaCuaImaInaIoaIpaFpaIqaIraIsaItaIuaIvakBaIvaIuaIwaIxaFpaFsaIyaIzaIAaxCaafaafaoEaGRaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaafaDVaFtaFtaFtaFtaFtaFtaFtaFtaFtaDVawQaIBakZaaaaaaaaaaaaaaaaaaaaaaaaaafayVayVayVaICaIDayVayVaIEaIFaIGaIHaIIaIJaIKaILaIMaINaIOaIPaIQaIOaIRaISaITaAhaIUaIVaIWaIXaIXaIYaIXaIXaIXaIXaIXaIXaIXaIXaIYaIXaIZaJaaJbaJcaJdaJdaJeaJeaJeaJeaJeaJdaJfaJdaJgaJgaJgaJgaJhaJgaDpayrayrayraJiaJjayraJkayraJlayraJmaJnaJoawjaJpaJqaJrawjaJsaJtaJuaswaJvaGraxCaxCaxCaxCaxCaxCaCuaJwaInaGBaJxaJyaIqaJzaIsaItaJAaJBaJBaJBaJAaJCaJDaxCaCEaCEaCEaFsaxCaaaaaaaoEaGRaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaoEaoEaoEaoEaoEaoEaoEaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaaaaaaaaaaDVaFtaFtaFtaFtaFtaFtaFtaFtaFtaDVawQaoNaiVaaaaaaaaaaaaaaaaaaaaaaaaaafaafaJEaJFaJGaJHaJIaJJaJKaJLaJMaJNaJOaJPaJQaJRaJSaJTaJUaJVaJWaJXaJYaJZaKaaKbaKcaKdaKeaKfaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaKgaKhaKiaKjaJdaKkaKlaKmaKnaKoaKpaKqaKraKsaJdaKtaKuaKvaKwaKxaJgaKyayraKzaKAaGfaJjayraKBayraKCayraKDaGmaKEaKFaKFaKFaKFaKFaKFaKFaKFaKFalZaKGaxCaKHaKIaKJaKKaxCaKLaEXaInaGBaKMaxCaIqaKNaJAaJAaKOaKPaKPaKQaJAaIwaKRaxCaCEaCEaCEaFsaxCaaaaaaaoEaGRaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaaaaKSaKSaKSaKSaKSaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaDVaFtaFtaFtaFtaKTaFtaFtaFtaFtaDVawQaoNakZaaaaaaaaaaaaaaaaaaaaaaaaaKUaJEaJEaKVaKWaKXaKXaKYaKZaLaaLbaLcaLdakZaLeakZakZakZakZaLfaLgaLhaLiaLjaLhaLgaLgaLgaLgaLkaaaaaaaLlaLlaLlaLlaLlaLlaLlaaaaaaaIXaLmaLnaLoaLpaLqaKqaLraLsaLtaLuaLvaLwaLxaJdaLyaLzaLAaLBaLCaJgaLDayrayrayraLEaLEayrayrayrayrayraLFaLGaLHaKFaLIaLJaLKaLLaLMaLNaLOaKFaLPaDCaxCaKIaKIaLQaFsaLRaAZaLSaLTaGBaGCaFpaIqaLUaLVaLWaLXaLYaLYaLYaLZaMaaMbaFpaCEaCEaCEaMcaxCaafaafaoEaGRarsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaoEaoEaoEaoEaoEaoEaMdaMeaMfaMgaMfaMhaMiaoEaoEaoEaoEaoEaoEaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaDVaFtaFtaFtaFtaKTaFtaFtaFtaFtaDVawQaoNakZaaaaaaaaaaaaaaaaaaaaaaaaaKUaJEaJEaKVaKWaKXaKXaKYaKZaLaaLbaLcaLdakZaLeakZakZakZakZaLfaLgaLhaLiaLjaLhaLgaLgaLgaLgaLkaaaaaaaLlaLlaLlaLlaLlaLlaLlaaaaaaaIXaLmaLnaLoaLpaLqaKqaLraLsaLtaLuaLvaLwaLxaJdaLyaLzaLAaLBaLCaJgaLDayrayrayraLEaLEgbLayrayrayrayraLFaLGaLHaKFaLIaLJaLKaLLaLMaLNaLOaKFaLPaDCaxCaKIaKIaLQaFsaLRaAZaLSaLTaGBaGCaFpaIqaLUaLVaLWaLXaLYaLYaLYaLZaMaaMbaFpaCEaCEaCEaMcaxCaafaafaoEaGRarsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaoEaoEaoEaoEaoEaoEaMdaMeaMfaMgaMfaMhaMiaoEaoEaoEaoEaoEaoEaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaafaDVaFtaFtaFtaFtaFtaFtaFtaFtaFtaDVawQaoNakZaaaaaaaaaaaaaaaaaaaaaaaaaMkaMlaMkaMmaMnaMoaMpaMqaMraMsaMtaMuaMvaMwaMxaMyaMzaMAaMzaMBaLgaMCaMDaMEaMFaMGaMHaMIaMJaMKaMLaMMaMMaMNaMOaMPaMQaMRaMSaMSaMTaMUaMVaHyaKjaJdaMWaKqaMXaKqaMYaMZaNaaKqaKqaJdaNbaNcaLAaNdaNeaJgaNfaNgaNhaNiaNjaNkaNlaNmaNnaNoaNpaNqaNraNsaKFaNtaNuaNuaNuaNvaNwaNxaKFaNyaDCaxCaNzaNzaFsaNAaLRaGuaNBaNCaNDaNEaNFaNGaNHaNIaNJaNKaNJaNLaNJaNMaNNaNOaFpaNPaCEaNPaxCaxCaaaaaaaoEaGRaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaaaaKSaKSaKSaKSaNQaNRaNSaNTaNUaNTaNVaNWaNQaKSaKSaKSaKSaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNXaaaaafaafaDVaFtaFtaFtaFtaFtaFtaFtaFtaFtaDVawQavEakZaafaaaaaaaaaaaaaaaaaaaaaaNYaNZaOaaObaMnaOcaOcaOdaOcaLaaOeaOfaOgakZakZakZakZakZakZawQaLgaOhaOiaOjaOkaOlaOlaOlaOmaLkaaaaLlaOnaOoaOoaOoaOoaOoaOpaLlaaaaIXaOqaOraJbaJdaOsaOtaOuaKqaOvaKqaOwaOxaKqaOyaOzaOAaOBaOCaODaJgaOEaOFaOGaOGaOGaOHaOIaOIaOJaOJaOKaOLaOMaONaOOaOPaOQaOQaOQaORaOSaOTaKFaOUaOVaxCaNzaOWaOXaOYaxCaOZaEXaPaaGBaGCaFpaIqaPbaPcaPdaPeaPfaPfaPfaPgaPhaPiaFpaPjaCEaCEaPkaxCaafaafarsaGRaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaPlaPmaPnaPnaPnaPnaPnaPoaPoaPpaPoaPoaPqaPqaPqaPqaPqaPraPsaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaDVaFtaFtaFtaFtaFtaFtaFtaFtaFtaDVawQakUakZaafaaaaaaaaaaaaaaaaaaaaaaKUaJEaPtaPuaMnaPvaPwaPxaPyaPzaPAaPBaPCaPDaPEaPFaPGaPHakZaPIaLgaPJaOiaPKaPLaPMaPMaPNaPOaLkaaaaPPaPQaOoaPRaPSaPTaOoaPUaPPaaaaIXaIZaJaaJbaJdaPVaPWaPXaPYaPZaPYaQaaQbaQcaJdaQdaQeaQfaQgaQhaJgaQiaQjaQkaQkaQlaQmaQnaQoaQpaQqaQraQsaQtaQuaQvaQwaQxaQyaQzaQAaQBaQCaKFapPaDCaxCaxCaxCaxCaxCaxCaCuaQDaQEaQFaQGaQHaIqaQIaJAaJAaQJaQKaQKaQLaJAaJCaQMaxCaCEaCEaCEaFsaxCaaaaaaaoEaGRaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdaQNaQOaQPaQPaQPaQPaQPaQPaQQaQPaQPaQPaQPaQPaQPaQRaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -8336,10 +8340,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaXQbboaXQaXQaXQaXQaXQaXQbboaXQaaaaSdbszbsAbsBbdrafZbsCagQbsCbsDbdrbsEbsFbsGbsHbsIbsJbsKbsHbsHbsLbsMbsNbsObsPbsHbsQbsHbsHbsHbsRbsSbsTbsTbsUbsVbsWbsXbngbsYbsZbtabngbtbbtcbtdbtebtfbqWbtgbqRbthbtibtjbtkbtlbtkbtmbtnbtobqWbtpbtqbtrbfbbtsbttbtubtvbtwbfbbfbbfbbtxbtybtzbpqbtAbtBbtCbpqbtDbtEbtFbtGbtHbtIbtJbtKbrAaZdbYUbprbtNbtObtPbprbYUbtUbpsbpybtVbtWbkCbtXbtYbtZbuabubbucbudbuebufbugbkCbkCbuhbuibujaPsaafaaaaaabkPaafaaaaaaaafaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaafaaaaaaaaabukaaaaafaMdbulbumbunbuobupbuqburbusbutbuubuvbuwbuxbuybuzbuAbuvbuBbuCbuDbuEaTAbjbbuFaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaafaaaaafaaaaXQaURaXQbuGbuHbcObuIaXQaURaXQaXQaSdbezbqjbuJbdrbuKbsCbsCbsCbuLbdrbuMbuNbuObuPbuQbuRbuSbuTbuUbuVbuWbuXbuQbuYbuZbuRbvabvbbvcbuSbvdbuQbuQbvebvfbvgbsXbngbvhbvibvjbvkbvlbvmbvnbvobtfbvpbvqbvrbvrbvrbvsbvtbvubvvbvwbvrbvrbvrbvxbvybilbfbbvzbvAbvBbvCbvDbfbbvEbvFbvGbvHbtzbpobvIbvJbvKbpqbvLbvMbvNbvObprbprbprbprbvPbprbprbprbtRbtSbvQbprbaEbGFbpsbvUbtVbvVbkCbvWbvWbvWbvWbvXbvWbvWbvYbvZbwabkCbwbbwcbkCbwdbkCaafaafaaabkPaafaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbweboebwfbwgbogaQRbmvaQOaQPaTAaTAbwhbwibwibwibwjbwkbwibwibwibwiaTAaTAaTAaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaXQbbnaXQaSdaXQbeyaXQaXRaXSbwlbwmaXQbeyaXQbrtbwnbwobqjbqkbdroUTbwpbqnbwpbqnbdrbwqbwrbwsbdrbwtbwubwvbdrbwwbwxbwwbwybwybwybwzbwAbwybwybwybwybwybwybwybwBbwCbwDbwEbwFbwGbwHbwIbwJbwIbwKbwLbwMbwNbwObwPbwQbwRbwQbwQbwSbwTbwUbvrbvrbwVbvrbwWbwXbfbbwYbwZbxabxbbxcbxdbfbbxebeYbxfaYFbxgbpqbpqbpqbpqbpqbxhbxibprbprbprbxjbxkbprbxlbxmbxnbprbnMbtSbpubprbvRbxsbxtbxubxvbxwbxxbxybxzbxAbxBbxCbxDbvWbxEbxFbxGbxHbxIbxJbxKbxLbxMackaafaafbetaafaafaafaafaaaaafaaaaafaaaaafaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaoEaMdbmvaMiaaaaaaaTAbxNbwibxObxPbxQbxRbxSbxTbxUbwiaTAbxVaaaaaaaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaXRaXSbxWbxXbxYaXSaXSbxZaZybyabybbycbycbydbyebyfbygbyhbyiboxbyjbykbylbymbyncwibyjbyobypbyqbyqbyrbyqbyqbysbytaXubwybyvbywbyxbyybyzbwybyAbyBbwybyCbyDbwybyEbfebhYbngbyFbyGbyHbyIbyJbyKbyLbyMbtfbyNbyObvrbyPbyQbyRblJbnmbwXbySbyTbyUbvrbyVbyWbfbbyXbyYbyZbzabzbbzcbzdbzebeYbgHbzfbzgbprbzhbzibzjbzkbzlbzmbznbprbxobxpbxqbxrbzsbztbzubprbprbzobprbprbprbzwbzxbzybzzbzAbzBbzBbzBbzBbzCbzBbzBbzBbzDbzEbzFbzGbzHbzIbzJbzKbzLbzBbzBbzBbetaaaaaaaaaaafaaaaafaaaaafaaaaaiaaaaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaoEaMdbmvaNWaKSaaaaTAbwhbzMbzNbzObzPbzQbzNbzRbzSbwiaTAaaaaaaaKSaKSbohaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaXRaXSbxWbxXbxYaXSaXSbxZaZybyabybbycbycbydbyebyfbygbyhbyiboxbyjbykbylbymbyncwibyjbyobypnOebyqbyrbyqbyqbysbytaXubwybyvbywbyxbyybyzbwybyAbyBbwybyCbyDbwybyEbfebhYbngbyFbyGbyHbyIbyJbyKbyLbyMbtfbyNbyObvrbyPbyQbyRblJbnmbwXbySbyTbyUbvrbyVbyWbfbbyXbyYbyZbzabzbbzcbzdbzebeYbgHbzfbzgbprbzhbzibzjbzkbzlbzmbznbprbxobxpbxqbxrbzsbztbzubprbprbzobprbprbprbzwbzxbzybzzbzAbzBbzBbzBbzBbzCbzBbzBbzBbzDbzEbzFbzGbzHbzIbzJbzKbzLbzBbzBbzBbetaaaaaaaaaaafaaaaafaaaaafaaaaaiaaaaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaoEaMdbmvaNWaKSaaaaTAbwhbzMbzNbzObzPbzQbzNbzRbzSbwiaTAaaaaaaaKSaKSbohaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaZuaZvaZvbzTaZvbzUbzVbzWbzWbzXbzWbzYbzZbAabAbbAcbAdbAebAfbAgbAhbAibAjbAkbAlbAmbAnbAobApbAqbArbAsbrubyqbAubAvbBrbwybAxbAybyxbyybAzbwybAAbABbwybAAbABbwybACbgIbnfbngbngbADbngbngbngbADbAEbngbngbAFbAGbAHblJbtkbtkbAIbAJbAKbALbAMbANbAObAPbAQomFbiqbASbATbAUbAVbAWbfbbAXbeYbAYaYFbAZbBabBbbBcbBbbBbbBbbBebBbbBfbzpbzpbzrbzpbBibBkbBlbBjbBmbzpbBgbBobprbpvbpsbBsbBtbBubBvbBwbBxbBybBzbBAbBBbBCbBDbBEbBFbBGbBHbBIbBJbBKbBLbBMbBNbzBbetaafaafaafaafaafaafaaaaaiaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaoEaPlbBQbBRbBSaWnbBTaTAbwibBUbBVbBWbBXbBYbBZbCabwiaTAaWoaWsbCbbhvbhvbCcaPsaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaXQaSdaXQbbnaXQaSdaXQaXQaXQaSdaXQaSdaSdaSdbCdbCebJmbCfbChbChbChbChbCgbCgbCibCgbCgbCgbyqbyqbCjbCkbyqbyqbyqbClbCmbwybCnbCobyxbCpbCqbwybCrbwybwybCsbwybwybCtbdtbCubCvabdbCwbCxbCybCzbCwbCAbCBbCCbwXbCDbwQbCEbtkbCFbCGbCHbCIbCJbtkbCKbvrbCLbCMbfbbCNbCObiqbCPbCQbCRbfbbCSbeYbfdbCTbAZbprbCUbCVbCWbCVbCXbCYbCZbDabBgbBpbtLbzpbtMbtQbBqbDbbDcbDdbDebDfbprbvTbpsbDjbDkbDlbDmbDnbDobDpbDqbDrbDsbDtbDubDvbDwbDxbDybDzbDAbDBbDCbDDbDEbDFbetbDGbDGbDGbDGbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaoEaaabDHbDIaQNaMiaaaaTAbwibDJbDKbzNbDLbDMbDNbDObwiaTAaaaaMdaQNaXIbjbbDPaaaaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaXQbDQbezbDRaSdbDSbFBbFBbFBbDVbCgqKobFEbDZbEabCgbEbbEbbEcbEdbEebEfbyqbClbEgbwybEhbEibyxbyybEjbEkbCobElbEmbCobEnbEobwCbdtbhYbEpbEqbErbEsbEsbEsbEsbEtbCCbEubEvbEwbilbilbExbEybEzbEAbEBbECbExbilbilbEDbEvbEEbfbbARbfbbfbbfbbfcbfbbEFbEGbEHbEIbAZbEJbEKbEKbEKbELbEKbEMbEKbtTbBgbKkbzqbDgbKkbBdbDhbDibEObDgbzpbEPbprbEVbpsbEWbDkbEXbEYbEZbFabFbbFcbFdbFebFfbFgbFhbFibDxbFjbFkbFlbFmbFnbFobFpbFqbFrbFsbFtbFubFubDGaafaaabBPaaabBOaaaaaiaaiaafaaiaagaagaaiaaiaagaagaagaagaagaaiaagaagaoEaoEaMdaQNaMiaaaaTAbFvbFvbFvbFwbFxbFwbFvbFvbFvaTAaaaaMdaQNaMiaoEaoEaoEaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaXQbDQbezbDRrJHbDSbFBbFBbFBbDVsokqKobFEbDZbEabCgbEbbEbbEcbEdbEebEfbyqbClbEgbwybEhbEibyxbyybEjbEkbCobElbEmbCobEnbEobwCbdtbhYbEpbEqbErbEsbEsbEsbEsbEtbCCbEubEvbEwbilbilbExbEybEzbEAbEBbECbExbilbilbEDbEvbEEbfbbARbfbbfbbfbbfcbfbbEFbEGbEHbEIbAZbEJbEKbEKbEKbELbEKbEMbEKbtTbBgbKkbzqbDgbKkbBdbDhbDibEObDgbzpbEPbprbEVbpsbEWbDkbEXbEYbEZbFabFbbFcbFdbFebFfbFgbFhbFibDxbFjbFkbFlbFmbFnbFobFpbFqbFrbFsbFtbFubFubDGaafaaabBPaaabBOaaaaaiaaiaafaaiaagaagaaiaaiaagaagaagaagaagaaiaagaagaoEaoEaMdaQNaMiaaaaTAbFvbFvbFvbFwbFxbFwbFvbFvbFvaTAaaaaMdaQNaMiaoEaoEaoEaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabFyaXQaXQbezbDRaSdbFzbFAbFBbFBbFCbCgbHqbFDbDWbOmbCgbFGbFHbFIbFJbyqbyqbyqbFKbFLbwybFMbCobyxbyybFNbFNbFNbFNbFNbFObFNbFPbFQbFRbFSbFTbFUbFVbFUbFUbFUbFVbFWbFUbFXbFYbFZbGabGbbGcbGdbGdbGebGfbGdbGgbGhbGibGjbGkbGlbGcbGcbGmbGcbGnbGobGcbGpbGqbGrbGsbGtbGubBbbGvbBbbBbbBbbGwbBbbGxbzpbzpbzrbzpbzpbERbESbzpbEUbzpbzpbGybprbpvbpsbGGbGHbvVbGIbGJbGKbGLbGMbFabFabGNbGObDqbGPbGQbGRbGSbGTbGUbGVbGWbGXbGYbetbGZbHabFubHbbDGaafaaabBPaaabBOaaabBPaaaaaaaafaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaoEaMdaQNaMiaaaaTAbHcbHdbHebFwbHfbFwbHgbHdbHhaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabHibHjbHkbHlbezbHmaSdbHnbHobHpbFBbDUbCgunZngggCybHrbCgbyqbHsbyqbEdbHtbHubyqbHvbHwbwybHxbEibHybHzbHAbHBbHCbFNbFNbFNbFNbFPbwCbHDbHEbHFbHGbHHbHGbHIbHJbHKbHLbHMbHNbHObHPbHQbHRbHQbHSbHSbHTbHUbHSbHVbHWbHXbHYbHZbIabIbbIcbIdbIebIfbIgbHZbIhbIibIjbIkbIlbImbInbIobIpbIqbIrbIsbInbItbGzbGAbGBbzpbGCbzpbGDbGEbIubIvbIwbIxbprbIFbpsbIGbIHbIIbIJbIKbILbILbIMbILbINbIObIPbIQbIRbISbITbIUbIVbIWbIXbIYbIZbJabJbbJcbJdbFubJebDGaafaaabBPaaabBOaaabeuaoEaoEaoEaoEaaibeubeuaoEaoEaaiaoEbeuaoEaaiaoEaagaoEaMdaQNaMiaaaaTAbJfbJgbJhbFwbJibFwbJhbJgbJjaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXQaXQaXQbezbJkaSdbJlaSdaSdbCgbCgbCgbDWbDXhbubFFbCgbJnbJobyqbJpbyqbyqbyqbCmbClbJqbCobCobyxbJrbJsbJtbJubCobJvbCobCobEobwCbdtbJwbJxbJybJzbJAbJBbJybJybJCbJCbJDbJEbJCbJFbCCbJGbJHbJIbJJbJKbJHbJLbCCbJFbJMbJNbJObJPbJMbJMbJQbJRbJSbJMbJTbJUbJVbJWbJXbJYbJZbKabJZbKbbKcbBbbBbbBhbENbBgbIybGAbKfbKebBnbIzbIAbGAbICbEQbprbpvbpsbKmbKnbKobzKbKpbKqbKqbKqbKqbKrbKsbKtbDCbKubGQbKvbKwbKxbKybKzbKAbKBbGYbetbDGbDGbDGbDGbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEbKCbKDaMiaaaaTAbKEbJgbJgbKFbKGbKHbJgbJgbKIaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm b/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm index e1149065..9c729b35 100644 --- a/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm +++ b/_maps/map_files/SyndieBoxStation/SyndieBoxStation.dmm @@ -21243,10 +21243,16 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aVr" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/hydroponics) "aVs" = ( @@ -21964,13 +21970,12 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aWL" = ( -/obj/machinery/processor, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/machinery/hydroponics/constructable, +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/kitchen) +/turf/open/floor/plasteel/dark, +/area/hydroponics) "aWM" = ( /obj/machinery/light, /turf/open/floor/plasteel/stairs/left{ @@ -22731,8 +22736,11 @@ /turf/open/floor/engine, /area/hallway/primary/aft) "aYo" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/processor, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aYp" = ( @@ -27299,6 +27307,7 @@ /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, +/obj/machinery/reagentgrinder, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "biW" = ( @@ -58293,10 +58302,6 @@ pixel_x = -4; pixel_y = -4 }, -/obj/item/toy/plush/mammal/marilyn{ - pixel_x = 4; - pixel_y = 4 - }, /obj/effect/decal/cleanable/semen, /turf/open/floor/plating{ icon_state = "platingdmg3" @@ -61421,10 +61426,6 @@ name = "Asshole Containment" }, /obj/item/banhammer, -/obj/item/toy/plush/mammal/winfre{ - item_state = "Winfre"; - name = "Winfre, Destroyer of Fun" - }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "dQj" = ( @@ -62038,6 +62039,15 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"oKV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Hydroponics"; + req_access_txt = "35"; + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/hydroponics) "oQA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -62568,6 +62578,27 @@ /obj/machinery/bloodbankgen, /turf/open/floor/pod/light, /area/medical/sleeper) +"xXD" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "Hydroponics"; + req_access_txt = "35"; + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/kitchen) "xYc" = ( /obj/item/crowbar, /obj/item/wrench, @@ -102029,7 +102060,7 @@ aJi aSu aSB aSB -aWL +aSB aYo bhy aJi @@ -102286,7 +102317,7 @@ aJi aJi aSI aUb -aJi +xXD aJi aJi aJi @@ -102544,7 +102575,7 @@ aOH aSJ aUc aVr -aOH +aWL aYs aZU aZW @@ -102804,7 +102835,7 @@ aUd aUd aYt aSJ -bbg +oKV bem bnP bsu