From 09321d6c0bf633fd4cac2c4873be570199ebcaa2 Mon Sep 17 00:00:00 2001 From: Markolie Date: Wed, 21 Jan 2015 23:37:05 +0100 Subject: [PATCH] Use station_name proc where possible, mapfix --- code/controllers/shuttle_controller.dm | 8 ++++---- code/game/objects/items/flag.dm | 14 +++++++------- code/game/objects/items/weapons/manuals.dm | 3 --- code/modules/admin/admin.dm | 2 +- code/modules/admin/verbs/onlyoneteam.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 4 ++-- code/modules/economy/Economy_TradeDestinations.dm | 2 +- code/modules/mob/mob_helpers.dm | 5 +++++ maps/cyberiad.dmm | 10 +++++----- 9 files changed, 26 insertions(+), 24 deletions(-) diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 21fad6ce176..9eb45f5d8d6 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -217,8 +217,8 @@ var/global/datum/shuttle_controller/shuttle_controller ) VS.announcer = "NSV Icarus" - VS.arrival_message = "Attention, Cyberiad, we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not." - VS.departure_message = "Your guests are pulling away, Cyberiad - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip." + VS.arrival_message = "Attention, [station_name()], we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not." + VS.departure_message = "Your guests are pulling away, [station_name()] - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip." VS.interim = locate(/area/vox_station/transit) VS.warmup_time = 0 @@ -240,8 +240,8 @@ var/global/datum/shuttle_controller/shuttle_controller ) MS.announcer = "NSV Icarus" - MS.arrival_message = "Attention, Cyberiad, you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors." - MS.departure_message = "Your visitors are on their way out of the system, Cyberiad, burning delta-v like it's nothing. Good riddance." + MS.arrival_message = "Attention, [station_name()], you have a large signature approaching the station - looks unarmed to surface scans. We're too far out to intercept - brace for visitors." + MS.departure_message = "Your visitors are on their way out of the system, [station_name()], burning delta-v like it's nothing. Good riddance." MS.interim = locate(/area/syndicate_station/transit) MS.warmup_time = 0 diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index c779a03aac2..22b5285556a 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -95,7 +95,7 @@ /obj/item/flag/pony name = "Equestria flag" - desc = "The flag of the independant, sovereign nation of Equestria, whatever the fuck that is." + desc = "The flag of the independent, sovereign nation of Equestria, whatever the fuck that is." icon_state = "ponyflag" /obj/item/flag/ian @@ -160,32 +160,32 @@ /obj/item/flag/cargo name = "Cargonia flag" - desc = "The flag of the independant, sovereign nation of Cargonia." + desc = "The flag of the independent, sovereign nation of Cargonia." icon_state = "cargoflag" /obj/item/flag/med name = "Medistan flag" - desc = "The flag of the independant, sovereign nation of Medistan." + desc = "The flag of the independent, sovereign nation of Medistan." icon_state = "medflag" /obj/item/flag/sec name = "Brigston flag" - desc = "The flag of the independant, sovereign nation of Brigston." + desc = "The flag of the independent, sovereign nation of Brigston." icon_state = "secflag" /obj/item/flag/rnd name = "Scientopia flag" - desc = "The flag of the independant, sovereign nation of Scientopia." + desc = "The flag of the independent, sovereign nation of Scientopia." icon_state = "rndflag" /obj/item/flag/atmos name = "Atmosia flag" - desc = "The flag of the independant, sovereign nation of Atmosia." + desc = "The flag of the independent, sovereign nation of Atmosia." icon_state = "atmosflag" /obj/item/flag/command name = "Command flag" - desc = "The flag of the independant, sovereign nation of Command." + desc = "The flag of the independent, sovereign nation of Command." icon_state = "ntflag" //Antags diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index f42d21298fb..699cada546e 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -77,9 +77,6 @@ dat = {"Engineering notes on single-stage Supermatter engine,
-Waleed Asad
- Station,
- Cyberiad
- A word of caution, do not enter the engine room, for any reason, without radiation protection and mesons on. The status of the engine may be unpredictable even when you believe it is .off.. This is an important level of personal protection.

The engine has two basic modes of functionality. He has observed that it is capable of both a safe level of operation and a modified, high output mode.

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index c051d5dd150..a9bafc2e71e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -913,7 +913,7 @@ var/global/nologevent = 0 usr << "AI [key_name(S, usr)]'s laws:" else if(isrobot(S)) var/mob/living/silicon/robot/R = S - usr << "CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independant)"]: laws:" + usr << "CYBORG [key_name(S, usr)] [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"]: laws:" else if (ispAI(S)) usr << "pAI [key_name(S, usr)]'s laws:" else diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index 9f8adc23b1a..48e643a8d24 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -17,7 +17,7 @@ continue del(I) - H << "You are part of the Cyberiad dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs." + H << "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs." H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear) // H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 37b168ddec8..84ac2feac52 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -94,7 +94,7 @@ displays_id = 0 /obj/item/clothing/under/rank/centcom/blueshield - desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears \"N.C.S. Cyberiad\" on the left shounder." + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears \"N.S.S. Cyberiad\" on the left shounder." name = "\improper Nanotrasen Navy Uniform" icon_state = "officer" item_state = "g_suit" @@ -103,7 +103,7 @@ flags = FPRINT | TABLEPASS | ONESIZEFITSALL /obj/item/clothing/under/rank/centcom/representative - desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.C.S. Cyberiad\" on the left shounder." + desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.S.S. Cyberiad\" on the left shounder." name = "\improper Nanotrasen Navy Uniform" icon_state = "officer" item_state = "g_suit" diff --git a/code/modules/economy/Economy_TradeDestinations.dm b/code/modules/economy/Economy_TradeDestinations.dm index f35e16e015d..09bbabdab37 100644 --- a/code/modules/economy/Economy_TradeDestinations.dm +++ b/code/modules/economy/Economy_TradeDestinations.dm @@ -43,7 +43,7 @@ var/list/weighted_mundaneevent_locations = list() /datum/trade_destination/icarus name = "NMV Icarus" - description = "Corvette assigned to patrol NSS Cyberiad local space." + description = "Corvette assigned to patrol the station's local space." distance = 0.1 willing_to_buy = list() willing_to_sell = list() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 47e84b497cb..0432e4baef6 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -150,6 +150,11 @@ proc/isorgan(A) if(L && L.implanted) return 1 return 0 + +proc/isnewplayer(A) + if(istype(A, /mob/new_player)) + return 1 + return 0 proc/hasorgans(A) return ishuman(A) diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 97c07e82465..0534d1bbed4 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -107,8 +107,8 @@ "acc" = (/obj/structure/lattice,/obj/machinery/camera{c_tag = "Brig Secure Armory Exterior North"; dir = 4; network = list("SS13")},/turf/space,/area) "acd" = (/obj/effect/decal/cleanable/cobweb,/obj/structure/table,/obj/item/clothing/suit/straight_jacket,/obj/item/clothing/glasses/sunglasses/blindfold,/turf/simulated/floor{icon_state = "dark"},/area/security/execution{name = "\improper Prisoner Transfer Center"}) "ace" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/table,/obj/item/device/radio/electropack,/obj/item/device/assembly/signaler{code = 2; frequency = 1449},/turf/simulated/floor{icon_state = "dark"},/area/security/execution{name = "\improper Prisoner Transfer Center"}) -"acf" = (/obj/machinery/light/small{dir = 1},/obj/machinery/power/apc{dir = 1; name = "Prisoner Transfer Center APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/stool/bed/chair{name = "Electric Chair"},/turf/simulated/floor{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/execution{name = "\improper Prisoner Transfer Center"}) -"acg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/decal/cleanable/cobweb2,/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/clothing/head/helmet,/turf/simulated/floor{icon_state = "dark"},/area/security/execution{name = "\improper Prisoner Transfer Center"}) +"acf" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/decal/cleanable/cobweb2,/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/clothing/head/helmet,/obj/machinery/light/small{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/security/execution{name = "\improper Prisoner Transfer Center"}) +"acg" = (/obj/machinery/power/apc{dir = 1; name = "Prisoner Transfer Center APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/stool/bed/chair{name = "Electric Chair"},/turf/simulated/floor{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/execution{name = "\improper Prisoner Transfer Center"}) "ach" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall/r_wall,/area) "aci" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4; initialize_directions = 11; level = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/permabrig) "acj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/security/hos) @@ -12598,7 +12598,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiabCabDabEabFabGabHabIabJabKabLaaiaaaaaaaaaaaaabzabAabMabzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaafaafaafaafaafaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiabNabOabPabQabRabSabTabUabVabVaaiaaaaaaaaaaaaaaaabzabAabAabzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaafaafaafaafaafaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabWaaaaaaaaaabWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiaaiabXabYabZacaacbaaiaccaaaaaaaaaaaaaaaabzabAabAabzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabWabWabWabWabWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiacdaceacfacgachaciabTaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaabzabAabAabzaaiaaiaaiacjackaaiaaiaaiabzabzabzabzabzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabWabWabWabWabWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiacdaceacgacfachaciabTaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaabzabAabAabzaaiaaiaaiacjackaaiaaiaaiabzabzabzabzabzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabWaaaaaaabWaaaaaaabWabWabWabWabWabWabWaaaaaaabWaaaaaaabWaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaclacmacnacoacpacqacraaiacsaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaabzactacuaaiacvacwacxacyaczacAaaiabAabAabAabAabAabzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabWabWabWabWaaaabWabWabWabWabWabWabWabWabWaaaabWabWabWabWaaaaabaabaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiacBacCacDacEacFacGacraaiaaiaaiacHacIacJaaiaaiaaiaaaaaaaaaaaaabzacuaaiacKacLacMacLacLacNaaiaaiaaiaaiaaiaaiaaiabAacOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaaaaahaahaahaahaahaaaaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabWabWabWabWaaaabWabWabWabWabWabWabWabWabWaaaabWabWabWabWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiaaiacPacQaaiaaiacRacSacTacUacVaaiaaiaaaaaaaaaaaaaaaabzaaiacWacXacYacZadaadbaaiadcaddadeadfadgadhadiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabBabBabBabBabBabBabBabBabBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahaahaahaahaahaaaaahaahaahaahaahaaaaahaahaahaahaahaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -12805,8 +12805,8 @@ cQecQPcQXcQKcQLcQRcQOcQScQMcQUcQVcQWcQNcQYcQTcQQcQOcQRcQVcQXcQKcQScQWcQLcQYcQUcP cQhcQLcQUcQNcQScQTcQXcQOcQVcQRcQYcROcRPcRQcROcROcQXcQTcQYcQUcQNcQOcQMcQScQKcQRcPVcQZcRacRbcRccRgcRdcRecQwcQicQjcQkcQlcQmcQncQocQZcRacRbcRccRgcRdcRecRfcQicQjcQkcQlcQmcQncQocQZcQqcQEcQFcQLcQUcQNcQScQTcQXcQOcQVcQRcQYcQMcQQcQKcQWcQPcQXcQTcQYcQUcQNcQOcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcRRcRRcRRcRRcRRcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRScRicRicRicRicRkcRTcRUcRVcRUcRWcRkcRXcRYcRZcSacRXcRkcRpcRpcRBcRpcRpcRkcRqcRqcRqcRqcRqcRkcRrcRrcRrcRrcRrcRkcRDcREcREcREcRFcRv cPUcQScQRcQQcQOcQWcQUcQXcQYcQTcSbcRPcSccSdcSecSfcROcQWcQKcQRcQQcQXcQVcQOcQNcQTcQbcQkcQlcQmcQncQocQZcRacQrcRccRgcRdcRecRfcQicQjcQkcQlcQicQjcQkcQlcRacRbcRccRgcRdcRecRfcQicQjcQkcQAcQEcQFcQScQRcQQcQOcQWcQUcQXcQYcQTcQKcQVcQPcQNcQMcQQcQUcQWcQKcQRcQQcQXcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcRRcShcSicSjcSkcShcRRcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRicRScRicRicSlcRkcSmcRUcRVcRUcSncRkcRXcSocSpcSqcRXcRkcRpcRpcRBcRpcRpcRkcRqcRqcRqcRqcRqcRkcRrcRrcRrcRrcRrcRkcSrcREcREcREcSscRv cPXcQOcQTcQPcQXcQMcQRcQUcQKcStcSucSccSdcSecSvcSvcSwcSxcQNcQTcQPcQUcQYcQXcQQcQWcPYcRgcRdcRecRfcQicQjcQkcQAcQmcQncQocQZcRacRbcRccRgcSycSzcSAcSBcSCcSDcQlcQmcQncQocQZcRacRbcRccRgcQucQEcQFcQOcQTcQPcQXcQMcQRcQUcSbcStcSEcSFcSGcSHcSIcQScQRcQMcQNcQTcQPcQUcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSJcSKcSLcSgcSKcSMcSgcSKcSNcSgcSOcSPcSgcSKcSMcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcRRcShcShcSQcSRcSScShcShcRRcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRicRwcRScRicRJcRkcRLcRLcRLcRLcRLcRkcSTcSocSpcSqcSTcRkcRpcRpcRpcRpcRpcRkcRqcRqcRqcRqcRqcRkcRrcRrcRrcRrcRrcRkcSrcREcREcREcSscRv -cQacQXcQWcQLcQUcQVcQTcQRaaacSUcSVcSVcSWcSXcSccSYcSYcSxcQQcQWcQLcQRcQKcQUcQPcQMcQgcRfcQicQjcQkcQlcQmcQncQDcQZcRacRbcRccRgcRdcRecRfcSAcSZcTacTbcTccTdcQocQZcRacRbcRccRgcRdcRecRfcQxcQEcQFcQXcQWcQLcQUcQVcQTcSwcSxcTecTecTecTecTecSFcTfcQTcQVcQQcQWcQLcQRcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcTgcThcSgcTgcSPcSgcTgcTicSgcTgcSMcSgcTgcSLcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcShcShcSScSScTjcSScSScShcShcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRicRicRicRScRicRkcTkcTlcTkcTlcTkcRkcTmcSocSpcSqcTmcRkcRpcRpcRpcRpcRpcRkcRqcRqcRqcRqcRqcRkcRrcRrcRrcRrcRrcRkcSrcREcREcREcSscRv -cPZcQUcQMcQScQRcQYcQWcQTaaacTncSWcSWcTocTpcTqcSdcSdcTrcQPcQMcQScQTcQNcQRcQLcQVcQdcRbcRccRgcRdcRecRfcQicQycQkcQlcQmcQncQocQZcRacRbcTscTtcTucTvcSZcTwcQjcQkcQlcQmcQncQocQZcRacRbcQscQEcQFcQUcQMcQScQRcQYcStcSxcTecTecTecTecTecTecTecTxcStcQXcQPcQMcQScQTcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcShcSScSScSScSScSScSScSScShcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRicTycRicRicRScRkcRycRzcRycRzcRycRkcTmcSocSpcSqcTmcRkcRpcRBcRpcRBcRpcRkcRqcRqcRqcRqcRqcRkcRrcRCcRrcRCcRrcRkcSrcREcREcREcSscRv +cQacQXcQWcQLcQUcQVcQTcQRcQNcSUcSVcSVcSWcSXcSccSYcSYcSxcQQcQWcQLcQRcQKcQUcQPcQMcQgcRfcQicQjcQkcQlcQmcQncQDcQZcRacRbcRccRgcRdcRecRfcSAcSZcTacTbcTccTdcQocQZcRacRbcRccRgcRdcRecRfcQxcQEcQFcQXcQWcQLcQUcQVcQTcSwcSxcTecTecTecTecTecSFcTfcQTcQVcQQcQWcQLcQRcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcTgcThcSgcTgcSPcSgcTgcTicSgcTgcSMcSgcTgcSLcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcShcShcSScSScTjcSScSScShcShcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRicRicRicRScRicRkcTkcTlcTkcTlcTkcRkcTmcSocSpcSqcTmcRkcRpcRpcRpcRpcRpcRkcRqcRqcRqcRqcRqcRkcRrcRrcRrcRrcRrcRkcSrcREcREcREcSscRv +cPZcQUcQMcQScQRcQYcQWcQTcQQcTncSWcSWcTocTpcTqcSdcSdcTrcQPcQMcQScQTcQNcQRcQLcQVcQdcRbcRccRgcRdcRecRfcQicQycQkcQlcQmcQncQocQZcRacRbcTscTtcTucTvcSZcTwcQjcQkcQlcQmcQncQocQZcRacRbcQscQEcQFcQUcQMcQScQRcQYcStcSxcTecTecTecTecTecTecTecTxcStcQXcQPcQMcQScQTcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcShcSScSScSScSScSScSScSScShcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRicTycRicRicRScRkcRycRzcRycRzcRycRkcTmcSocSpcSqcTmcRkcRpcRBcRpcRBcRpcRkcRqcRqcRqcRqcRqcRkcRrcRCcRrcRCcRrcRkcSrcREcREcREcSscRv cPVcQRcQVcQOcQTcQKcQMcQWcSGcSvcSYcSYcTzcSecTocSWcSWcSYcTAcQVcQOcQWcQQcQTcQScQYcPTcQlcQmcQncQocQZcRacRbcQscRgcRdcRecRfcQicQjcQkcQlcSzcTucTvcSZcTacTBcRccRgcRdcRecRfcQicQjcQkcQlcQBcQEcQFcQRcQVcQOcQTcQKcSUcTecTecTecTecTecTecTecTecTecSUcQUcQLcQVcQOcQWcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcSKcThcSgcTCcSLcSgcSKcSLcSgcTDcSMcSgcSKcSPcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcTEcSScSScSScSScSScSScSScTEcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcRJcRicTFcRicRwcRkcRlcRmcRlcRmcRlcRkcTGcTHcTIcTJcTGcRkcRpcRpcRpcRpcRpcRkcRqcRqcRqcRqcRqcRkcRrcRrcRrcRrcRrcRkcTKcTLcTLcTLcTMcRv cQbcQTcQYcQXcQWcQNcSGcSGcTNcSccTOcTOcTPcSXcTzcSWcSWcSYcTAcTAcTQcQMcQPcQWcQOcQKcQccRacRbcRccRgcRdcRecRfcQxcQjcQkcQlcQmcQncQocQZcRacTRcTScTTcTUcSzcTTcQicQjcQkcQlcQmcQncQocQZcRacQrcQEcQFcQTcQYcQXcQWcQNcSIcTecTecTecTecTecTecTecTecTecSbcQRcQScQYcQXcQMcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcTgcSLcSgcTgcSMcSgcTgcSMcSgcTgcTVcSgcTgcTWcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcShcTXcSScSScTYcSScSScTZcShcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUacUbcUbcUbcUbcUbcRRcUbcUbcUbcUbcUbcRRcUbcUbcUbcUbcUbcRRcUccUccUccUccUccRRcUccUccUccUccUccRRcUccUccUccUccUccRRcUccUccUccUccUccUd cPYcQWcQKcQUcQMcQQcTQcSYcSVcUecSYcSVcUecSdcTPcSdcTPcTOcTpcTocTfcQVcQLcQMcQXcQNcQfcQjcQkcQlcQmcQncQocQZcQqcRbcRccRgcRdcRecRfcQicQjcQncQlcQmcQncQocRccRacRbcRccRgcRdcRecRfcQicQjcQzcQEcQFcQWcQKcQUcQMcQQcSFcTecTecTecTecTecTecTecTecTecSEcQTcQOcQKcQUcQVcQFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgcSgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRRcShcUfcSScSScSScSScSScUgcShcRRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacRhcUhcUicUjcUhcUicRkcUkcUkcUkcUkcUkcRkcUlcUlcUlcUlcUlcRkcUmcUmcUncUocUocRkcUpcUpcUpcUpcUpcRkcUqcUrcUrcUrcUscRkcUtcUucUucUucUvcRv