From 4ac1a63b1b8d927e1e1aeda90021f4afc90f3d19 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 31 Jan 2015 02:39:04 +0100 Subject: [PATCH 01/17] Mapfix, dbconfig update, sec camera template network fix --- config/example/dbconfig.txt | 2 +- maps/cyberiad.dmm | 23 +++++++++++------------ nano/templates/sec_camera.tmpl | 2 ++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt index 6f9a348e768..4bb4e58b096 100644 --- a/config/example/dbconfig.txt +++ b/config/example/dbconfig.txt @@ -23,4 +23,4 @@ FEEDBACK_PASSWORD mypassword # Track population and death statistics # Comment this out to disable -#ENABLE_STAT_TRACKING \ No newline at end of file +ENABLE_STAT_TRACKING \ No newline at end of file diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index 53bf50e7e66..3c37362f306 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -1976,7 +1976,7 @@ "aLZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aMa" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aMb" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) -"aMc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor,/area/hallway/secondary/entry) +"aMc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8; initialize_directions = 11; level = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor,/area/hallway/secondary/entry) "aMd" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aMe" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aMf" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4; initialize_directions = 11; level = 1},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -2377,7 +2377,7 @@ "aTK" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor,/area/hallway/primary/port) "aTL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor,/area/hallway/primary/port) "aTM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor,/area/hallway/primary/port) -"aTN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4; initialize_directions = 11; level = 1},/turf/simulated/floor,/area/hallway/secondary/entry) +"aTN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor,/area/hallway/primary/port) "aTO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor,/area/hallway/primary/port) "aTP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor,/area/hallway/primary/port) "aTQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor,/area/hallway/primary/port) @@ -5695,7 +5695,7 @@ "cfA" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 4; frequency = 1443; icon_state = "on"; id = "air_in"; on = 1},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cfB" = (/obj/machinery/atmospherics/binary/pump{dir = 8; on = 1},/obj/machinery/light/small{dir = 1},/obj/structure/sign/fire{pixel_y = 32},/turf/simulated/floor/plating,/area/maintenance/incinerator) "cfC" = (/obj/machinery/embedded_controller/radio/airlock/access_controller{frequency = 1449; id_tag = "incinerator_access_control"; name = "Incinerator Access Console"; pixel_x = -26; pixel_y = 6; req_access_txt = "12"; tag_exterior_door = "incinerator_airlock_exterior"; tag_interior_door = "incinerator_airlock_interior"},/obj/machinery/ignition_switch{id = "Incinerator"; pixel_x = -24; pixel_y = -6},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4; level = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cfD" = (/obj/machinery/atmospherics/pipe/simple/insulated,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4; level = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cfD" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4; level = 1},/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfE" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4; level = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfF" = (/obj/machinery/atmospherics/pipe/manifold/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cfG" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) @@ -5760,7 +5760,7 @@ "cgN" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "12"},/obj/machinery/access_button{command = "cycle_exterior"; layer = 3.1; master_tag = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 0; pixel_y = -23},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "cgO" = (/turf/simulated/floor/plating,/area/maintenance/incinerator) "cgP" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; heat_proof = 1; icon_state = "door_locked"; id_tag = "incinerator_airlock_interior"; locked = 1; name = "Mixing Room Interior Airlock"; req_access_txt = "12"},/obj/machinery/access_button{command = "cycle_interior"; master_tag = "incinerator_access_control"; name = "Incinerator airlock control"; pixel_x = 0; pixel_y = -22},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cgQ" = (/obj/machinery/atmospherics/pipe/simple/insulated,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cgQ" = (/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgR" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/machinery/hologram/holopad,/mob/living/simple_animal/mouse,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgS" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cgT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock East"},/obj/machinery/door/airlock/maintenance{name = "Incinerator Access"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -5822,11 +5822,11 @@ "chX" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 0; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "chY" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room) "chZ" = (/obj/machinery/atmospherics/binary/pump{dir = 4; on = 1},/obj/structure/sign/fire{pixel_y = -32},/turf/simulated/floor/plating,/area/maintenance/incinerator) -"cia" = (/obj/machinery/atmospherics/pipe/simple/insulated{dir = 4},/obj/machinery/door_control{id = "disvent"; name = "Incinerator Vent Control"; pixel_x = 0; pixel_y = -24; req_access_txt = "12"},/obj/machinery/meter,/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cia" = (/obj/machinery/door_control{id = "disvent"; name = "Incinerator Vent Control"; pixel_x = 0; pixel_y = -24; req_access_txt = "12"},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4; level = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cib" = (/obj/machinery/light,/obj/machinery/atmospherics/tvalve/mirrored/digital{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cic" = (/obj/machinery/atmospherics/pipe/simple/insulated{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cid" = (/obj/machinery/atmospherics/pipe/simple/insulated{dir = 4},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) -"cie" = (/obj/machinery/atmospherics/pipe/simple/insulated{dir = 4},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cic" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/atmospherics/pipe/simple/visible{dir = 4; level = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cid" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/atmospherics/pipe/simple/visible{dir = 4; level = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) +"cie" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4; initialize_directions = 11; level = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor,/area/hallway/secondary/entry) "cif" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor{icon_state = "floorgrime"},/area/maintenance/incinerator) "cig" = (/obj/machinery/power/apc{dir = 4; name = "Engineering Maintenance APC"; pixel_x = 27; pixel_y = 2},/obj/structure/disposalpipe/segment,/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/aft) "cih" = (/obj/structure/table,/obj/machinery/cell_charger{pixel_y = 5},/obj/machinery/status_display{layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plating,/area/storage/tech) @@ -6786,7 +6786,6 @@ "cAz" = (/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/hallway/primary/aft) "cAA" = (/obj/machinery/vending/coffee,/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/hallway/primary/aft) "cAB" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "yellowcorner"},/area/hallway/primary/aft) -"cAC" = (/obj/machinery/atmospherics/pipe/simple/insulated{dir = 4},/turf/simulated/wall/r_wall{desc = "A specially coated wall that resists temperatures for Science"; max_temperature = 1e+009; name = "Coated Reinforced Wall"},/area) "cAD" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/hallway/primary/aft) "cAE" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/hallway/primary/aft) "cAF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor{dir = 4; icon_state = "yellowcorner"},/area/hallway/primary/aft) @@ -12653,10 +12652,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaJHaOkaKSaKTaJAaKUaJBaKUaJBaKUaJBaKUaJAaKVaKWaGdaERaMcaOmaOnaOoaOpaOqaDyaOraOsaOtaOuaNuaNRaOxaOyaOyaHnaOzaOAaOBaOCaODaOEaOFaOGaOHaOIayaaaaaabaaaaOJaOKaOJaaaaabaaaayaaDTaDUaOLaOMaOlaOOaOPaDUaAYaaiaHDaHEaFmaOSaOTaFpaOUaFpaOVaOWaOXaaiaOYaOZaPaaPbaPcaPdaPeaPfaaaaaaaaiaPgaPhaPiaaqaPjaHIaHIaHIaPkaHIaHIaHIaaJaPlaPmaaqaPnaosaaqaPoaaqaaqaPpaPqaPraPsaPtaaqaPuaPvaaqaPnaaqaaqaaqaaqaPwaaqaaqaosaaqaaqaaqaaqaPxaJwaaqaPyaNTaPzaPAaPBaPCaPDaPEaPFaPGaaqaPHaPIaPJaPKaPLaOeaMuaMvaMwaPMaPNaaiaPOaOiaOiaOjaMGaMGaMGaMGaMHaMIaaaaaaaaaaaaaaaaaaaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPPaPQaIdaJzaJAaJBaJBaPRaJBaJBaPSaJBaJAaJHaPTaPUaERaPVaPWaPXaPYaPXaPXaPXaPXaPXaPZaDyaySaQaaQaaQaaQaaQaaQbaQcaQdaHnaHnaHnaHnaQbaQeaQfaQgaQhaQiaQiaQjaQkaQlaQiaQiaQmaQgaQnaQgaQoaDUaQpaQqaQraQsaQtaaiaaiaaiaaiaQuaQvaQwaQxaQwaQyaQzaaiaaiaQAaPbaPbaPbaPbaQBaOvaQDaQEaQFaaiaQGaPhaQHaaqaaqaaqaaqaaqaaqaaqaaqaaqaaJaQIaQJaQKaQLaQMaQNaQOaQPaaqaQQaQRaQSaQTaQUaaqaQVaQWaQXaQYaQXaQZaRaaRbaRcaRdaReaRfaRgaRhaRiaaqaRjaMbaRkaRlaRmaPzaRnaPBaPCaRoaaqaRpaRqaRraRsaRtaOdaOdaaqaOgaMuaMvaMwaRuaRvaaiaRwaRxaRyaRzaRAaRBaMGaMGaRCaMIaaaaaaaaaaaaaaaaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPPaIdaIeaIdaIdaIfaIgaIdaIdaIeaPQaRDayaaREaPVaCyaRFaRFaRGaRFaRHaySaRIaRJaDyaRKaRLaRMaRNaROaRPaRNaRQaRNaRNaRNaRRaRNaRNaRSaRTaRUaRVaRWaRXaRVaRYaRVaRVaRVaRVaRZaSaaSbaRNaRNaScaSdaSeaSfaSgaShaSiaSjaSkaSlaSmaSmaSmaSmaSmaSmaSnaSoaSpaSqaSraSsaStaSuaSvaSwaPbaPbaSxaSyaSzaSyaSAaSBaSCaSDaSEaSFaSGaaqaSHaSIaSJaSKaSLaSLaSMaSNaSOaSPaaqaSQaSRaSSaSSaSTaaqaSUaSVaSWaSXaSYaSYaSZaTaaTbaTaaTcaTdaTeaTfaTgaaqaPxaThaaqaOwaTjaTjaTkaTlaTjaTmaaqaTnaToaaqaTpaTqaOdaTraaqaTsaTtaONaMwaOgaOgaaiaTvaaiabmafaaaiaaiaaiaaiaaiabAacOaaaaaaaaaaaaaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCyaTwaTxaHcaHcaHcaHcaTyaTwaCyaHeayaaTzaTAaTBaTCaTDaTEaTEaTFaySaTGaRJaTHaTIaRLaTJaTKaTLaTMaTMaTMaTOaTOaTOaTPaTQaTQaTRaTSaTTaTMaTMaTUaTVaTWaQCaTYaTYaTZaTYaUaaTVaTVaTVaTiaSdaSeaSfaSgaSgaSgaSgaUcaSgaSgaSgaSgaSgaSgaUdaUeaUfaUgaUhaUiaUjaUkaUlaUmaUnaUnaUnaUoaUpaUpaUpaUqaSGaSGaSGaUraUsaSGaaqaUtaUuaSLaSLaUvaSLaUwaUxaSOaUyaaqaUzaUAaUBaUCaUDaaqaUEaUFaUGaUHaUIaUJaaqaUKaULaUKaaqaaqaaqaosaaqaaqaPxaJwaaqaUMaNTaNTaNTaUNaNTaUOaaqaaqaaqaaqaaqaaqaaqaUPaaqaMwaMwaMvaMwaUQaURaaqaUSaUTaUUaUVaUWaUXaUYaUZaVaaaaaaaaaaaaaaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCyaTwaTxaHcaHcaHcaHcaTyaTwaCyaHeayaaTzaTAaTBaTCaTDaTEaTEaTFaySaTGaRJaTHaTIaRLaTJaTKaTLaTMaTMaTNaTOaTOaTOaTPaTQaTQaTRaTSaTTaTMaTMaTUaTVaTWaQCaTYaTYaTZaTYaUaaTVaTVaTVaTiaSdaSeaSfaSgaSgaSgaSgaUcaSgaSgaSgaSgaSgaSgaUdaUeaUfaUgaUhaUiaUjaUkaUlaUmaUnaUnaUnaUoaUpaUpaUpaUqaSGaSGaSGaUraUsaSGaaqaUtaUuaSLaSLaUvaSLaUwaUxaSOaUyaaqaUzaUAaUBaUCaUDaaqaUEaUFaUGaUHaUIaUJaaqaUKaULaUKaaqaaqaaqaosaaqaaqaPxaJwaaqaUMaNTaNTaNTaUNaNTaUOaaqaaqaaqaaqaaqaaqaaqaUPaaqaMwaMwaMvaMwaUQaURaaqaUSaUTaUUaUVaUWaUXaUYaUZaVaaaaaaaaaaaaaaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaGbayaaTBaAPaGdaVbaVcaVdaVeaGdaAPaVfaVgayaaVhaPVaTBaViaVjaTEaTEaTFaySaVkaRJaDyaTIaRLaVlaVmaVnaRNaRNaVoaVpaVqaRNaVraVsaVtaVsaVuaVvaVsaVsaVwaVsaVsaVxaVyaVsaVzaVsaVAaRNaRNaRNaVBaVCaVDaVEaVFaVGaVFaVHaVIaVHaVHaVHaVHaVHaVHaVJaVKaVLaVLaVLaVLaVMaVLaVNaVOaVLaVLaVPaVQaVRaVRaVRaVRaVRaVRaVRaVSaSGaSGaaqaVTaVUaVVaVWaVWaVXaVYaUxaSOaVZaaqaaqaaqaaqaaqaWaaaqaWbaWcaWdaWeaQXaWfaaqaWgaWhaWiaWjaWkaWlaWmaWnaaqaPxaJwaaqaWoaWpaNTaWqaWraNTaWsaWsaaqaWtaWuaWvaaqaWwaWxaWyaMwaMwaWzaWAaOgaWBaaqaWCaUTaUUaWDaWEaUTaUTaWFaWGaaaaaaaaaaaaaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaySaDwaTwaPUaERaDyaDyaESaPUaTwaPUaWHaWIaWJaTuaDwaWLaWLaRGaWLaRHaySaWMaRJaDyaySaQaaQaaWNaQaaQaaQaaQaaQaaQaaWOaWPaQaaQaaQaaQaaQaaQaaWQaWRaWQaQaaWSaQaaWTaVmaWUaWVaWWaWXaRNaWYaQaaWZaWZaXaaXaaXaaXbaQEaQEaQEaQEaQEaQEaQEaaiaXcaXdaXeaXdaXfaXfaXgaXhaXiaXjaXkaaiaXlaQEaQEaQEaQEaQEaQEaXmaXnaXnaXnaaqaXoaXpaXqaXqaXqaXqaXraKyaXsaXtaXuaXvaXwaXxaXyaXzaaqaaqaXAaXlaXBaQEaXCaaqaXDaXEaXFaXFaXFaXFaXGaXHaaqaXIaJwaaqaXJaNTaWqaWqaWraWqaNTaXKaaqaXLaXMaXNaaqaMwaXOaXPaXQaXQaXRaXSaXTaXUabZaXVaXWaXXaXYaUVaUTaUTaXZaWGaaaaaaaaaaaaaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaMJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCyaYaaDyaYbaYcaYdaYeaYfaYgaYeaYhaYiaYeaYeaTNaYkaYlaYmaYnaYnaYnaYoaYnaYpaYqaySaYraYsaYtaYuaYvaYwaYxaYyaYzaYAaYBaYCaYDaYEaYFaYGaYHaYIaYJaYKaYHaYLaQaaQaaYMaQaaQaaQaaQaaYNaYOaQaaYPaWZaYQaSgaSlaYRaaaaaaaaaaaaaaaaaaaaaaaiaYSaYTaYUaYVaYWaYXaYYaYZaZaaZbaZcaaiaaaaaaaaaaaaaaaaaaaaaaEFaZdaSGaZeaaqaZfaXpaXtaXtaXtaXtaXtaZgaZhaXtaXtaXtaXwaZiaZiaZjaZkaZlaZmaZnaZoaZpaZqaaqaZraZsaZtaZuaZuaZtaZvaZwaaqaPxaZxaaqaZyaZzaNTaWqaWraNTaZAaZAaaqaaqaZBaaqaaqaZCaWxaWAaZDaZDaZEaWAaOgaaqaaqaZFaUTaZGaZGaZHaZGaUTaZIaWGaaaaaaaaaaZJaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCyaYaaDyaYbaYcaYdaYeaYfaYgaYeaYhaYiaYeaYecieaYkaYlaYmaYnaYnaYnaYoaYnaYpaYqaySaYraYsaYtaYuaYvaYwaYxaYyaYzaYAaYBaYCaYDaYEaYFaYGaYHaYIaYJaYKaYHaYLaQaaQaaYMaQaaQaaQaaQaaYNaYOaQaaYPaWZaYQaSgaSlaYRaaaaaaaaaaaaaaaaaaaaaaaiaYSaYTaYUaYVaYWaYXaYYaYZaZaaZbaZcaaiaaaaaaaaaaaaaaaaaaaaaaEFaZdaSGaZeaaqaZfaXpaXtaXtaXtaXtaXtaZgaZhaXtaXtaXtaXwaZiaZiaZjaZkaZlaZmaZnaZoaZpaZqaaqaZraZsaZtaZuaZuaZtaZvaZwaaqaPxaZxaaqaZyaZzaNTaWqaWraNTaZAaZAaaqaaqaZBaaqaaqaZCaWxaWAaZDaZDaZEaWAaOgaaqaaqaZFaUTaZGaZGaZHaZGaUTaZIaWGaaaaaaaaaaZJaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDwaZKaZLaZKaZKaZKaZKaZKaZKaZLaZKaZKaZMaDyaZNaZOaDyaDyaZPaDyaZQaZRaZSaZTaZUaySaYsaYsaZVaYuaZWaYAaYAaYAaYAaYAaYBaZXaYAaYAaYAaYAaYHaZYaZZbaaaYHaYLbabbacbadbaebafaYPbagbahbaibajbakbalaYQaSgaSlaYRaaaaaaaaaaaaaaiaaiaaiaaibambanbaobapbaqbarbasbatbaubavbawaaiaaiaaiaaiaaaaaaaaaaaaaEFaZdaSGaSGbaxaXtbaybazbaAaXtbaBbaCaJcbaDbaEbaFaXtaXwaZiaZibaGbaHaZibaIbaJbaKbaLaZibaMbaNbaOaZtaZuaZuaZtbaPbaQaaqaPxbaRaaqaXJaNTaWqaWqaWraWqaNTaNTbaSbaTaNTbaUaaqbaVbaWbaXaZDaZDbaYbaXbaZaaqbbabbbaUTbbcbbcbbdbbcaUTaXZbbebbfbbgbbgbbhaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayaayabbibbjbbjbbjbbjbbjbbjbbjaGjayaaySbbkbblaySbbmbbmbbmbbmbbmbbnaySaySaySaySaYsbbobbpaYubbqaYAaYAbbrbbsbbtbbubbraYAaYAaYAbbvaYHbbwbbxbbyaYHaYLbabbbzbbAbbBbbCaYPbbDbbEbbFbbGbbHbbIbbJbbKaSlbbLaoJaaiaaiaaiaaibbMbbNbbObbPbbQbbQbbRbbSbbQbbTbbQbbUbbVbbWbbXbbYbbZaaiaaiaaiaaiaXlbcaaZdaSGaSGaaqbcbbaybaEbaAaXtbccbcdaXtbcebcfbaFaXtaXwaZiaZibcgbchbcibcjbckbclbcmaZibcnbaNbcoaZtaZuaZubcpbcqbaQaaqaPxbcraaqbcsbctbcuaWqaWrbcvaNTaNTbcwaNTbcxbcyaaqbczbcAbcBaZDaZDbcCbcBbcDaaqbcEbbbaUTaUTaUTaUVaUTaUTbcFbcGbcHbcIbcJbcKaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabcLbcLbcLbcLbcLbcLbcLbcLbcLbcLbcLbcLaabbcMaGeaDAbcNbbmbcObcPbcQbcRbcSbcTbcUbcVbbmbcWaUbaTXbcZaYubdaaYAaYAbbrbbtbdbbdcbbraYAaYAbddbdeaYHaYHaYHaYHaYHaYLbabbabbabbabbabaYPbdfbbGbdgbbGbdhbbIaYQbdiaSlaSmaSmbdjbdkbdlaaibdmbaobdnbbQbbQbbQbdobdpbdqbdpbdrbdsbdtbdpbdubdvbdwaaibdxbdkbdybdzbdAaZdaSGaSGbaxaXtbdBaXtaXtaXtbdCbdDaXtbcebdEbaFaXtaXwaZiaZibdFbdGbdHbdIbdJbdKbcmbdLaaqbdMbcoaZtaZuaZuaZtbcqbdNaaqbdOaaqaaqaaJaaqaaqbdPaWrbdQbdRaNTbdSbdTaRnbdUabZbdVbdWbdXbdYbdYbdZbeaaWKabZbecbedaUTbeeaUTaUVaUTaUTbefbegbbfbbgbbgbehaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaKQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -12699,7 +12698,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacepbvfbvfbvfbvfbvgcescetceucevcevcewaaqcexbYsaEFaaacdgceycezceAceBceCceDceEceBceBceFceGceHceIacFacFceJceKbZSceLceMceNcdwcdwcdwcdwceOaaibDmbDmaaqcePcbpceRceSceTceUceUceVceWceXceYceZcfaaaqcfbcagcfcaaicfdcdNcfeaaiaaaaaaaaicffcfgbveaaibDncficfjcfjcfjcfjcfjcfjcfkcflcfmcfnachachcfocfpachachcfqcfrcfsaaqaaicftcfucfvaaiaaiaaiaaicfwcfxcfvaaiaaibsfcfybsfbJtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTMaaiaaibZGbZGbRbbRbbRbbRbbRbbRbbRbbRbaaiaaiaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacfzcfAbwJcfBbwJcfCcfDcfEcfFcfFcfGaaqcfHbWYaEFaaacdgcfIcfJaiVcfKccccfLcfMcfNcfOaaqcdpbYCbYDcfPaaicfQaaqcfRcfScfTcfUcfVcdwcdwcfWcfXaaibDmcfYaaqcfZcgacgbcgccgccgccgdcgecgccgccgfcgbcggaaicghcagcgiaaicgjcdNcgkaaiaaaaaaaaicglcgmcgnaaicgobDmcfYaaiaaiaaiaaiaaiaoHaoIaoJaaiaaicgpcgqcgrcgsaaicgtcguamdaaicgvcgwcgwcgwcgxcgycgzcgAcgBcgCcgDcgEaaicgFcgGcgHcgIcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgJcgKcgLaaibSnaaibRbbRbbRbbRbbRbbRbbRbaaiaaiaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaacfzcgMcgNcgOcgPceucgQceucgRceucgScgTcgUcgVcgWaaacgXcbYcgYccacgZccccccchachbchcabJchdchecchchgaaichhchichjchkchlabmchmcdwcdwcdwchnaaibDmbDmaaqaaqaaJchochpchqchraaqchschtchuchvbUlaaJaaicfbcagcfcaaichwcdNcdOaaiaaaaaaaaichxchychzaaibDmbDmbDmaaiaabaaaaaaaabaaaaabaaaaaaaaichAchBchCchDchEchFchGchHchIchJchKchLchLchMchNchNchOchPchQchQchRaaiaaicELaamaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaichTchUchVaaiaaibRbbRbchWbRbbRbaaiaaiaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacfzchXcACchZcACciacibciccidciecifaaqbYrcigaaiaaaaaaaaaaaaaaicihciicijcijcikcilaaqcimbYCbUbcinciocKKciqcipcipcipcircdPcdwcitcdwciuaaibDmbDmaaqcivciwcixciycizciAaaqcizciAciyciBciCciDaaicghciEcgiaaichwcdNciFaaiaaiaaiaaiaaiaaiaaiaaiciGbDmbDmaaiaabaaaaaaaaaaabaabaabaaaaaiciHciIciIciJciKciLciMciNciOciPciQciRciSciTciUciVchNchNchNciWciXaaiciYciZcjaaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacjbcjccjdbSoaaqaaiaaibRbbRcbRbaaiaaiaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacfzchXbwJchZbwJciacibcidciccfEcifaaqbYrcigaaiaaaaaaaaaaaaaaicihciicijcijcikcilaaqcimbYCbUbcinciocKKciqcipcipcipcircdPcdwcitcdwciuaaibDmbDmaaqcivciwcixciycizciAaaqcizciAciyciBciCciDaaicghciEcgiaaichwcdNciFaaiaaiaaiaaiaaiaaiaaiaaiciGbDmbDmaaiaabaaaaaaaaaaabaabaabaaaaaiciHciIciIciJciKciLciMciNciOciPciQciRciSciTciUciVchNchNchNciWciXaaiciYciZcjaaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacjbcjccjdbSoaaqaaiaaibRbbRcbRbaaiaaiaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacOabAaaiaaiaaiaaiaaiaaiaaiaaiaJmaJmaJmaJmaJmaaiaaqaaqaaqaaqaaqaaqcjecjfaaiaaiaaiaaiaaiaaiaaqaaqaaqaaqaaqaaqaaqcjgbYCbUbcjhcjicjjcjkcjlcjmcjncjocjpcjqcjrcjscjtaaibDmbDmaaqcjucjvcixciyciycjwaaqcjxciyciyciBcixcjyaaiaaiaaiaaiccIcjzcdNcjAaaicjBbDmbDmbDmbDmcjCbDmbDmbDmbDmaaiaaaaaaaaaaaaaaaaabaabaaaaaicjDcjEcjEcjFcjGcjHcjIcjJcjKcjLcjMchNchNchNcjNcjOchNcjPchNciWcjQaaicjRcjScjTaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacjUbCfbCfbCgaaqaaqaaiaaiaaiaaibPkaabaabaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacjVcjWcjXcjYcjZcjZckackbckcckdckeckfckgckhcBIcBIcBIcBJcBKcBLcBGcBGcAKcAIcAEcADcBHcADcADcADcAEcADcADcAHcAGcAFcefbYCbUbckxceickzafaaaicfUacFaujckAckBacFatEcblaaibDmbDmaaqckCceQckEckFckGckHaaqckIckGckJckKckEcJZaaibDmbDmbDmckMchwcdNchwckNbDmbDmbDmbDmbDmbDmbDmbDmbDmbDmaaiaaaaaaaaaaaaaaaaabaabaabaaickOckPckPckPcbAaaickQafacbAckRckSckTckTckUcjLcjLckVckTckWckXckYaaickZclaclbaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacjVcjWclccldclecldclfclgclhclicljclkcllclmclnclnclnclnbYCbUcbUcbUcclnclpclnclnclnclnclnclnclnclnclnclnclqclrclscltcisclvckwclxclyaaiclzclAclBclCclDclEclFclGachcfjckyabJclIclJclKclLciyclMaaqclMciyclLclNcixclOaaiclPachachbnbclQclRclSaaiclTaoIaoIclUaaiaaiaaiaoHaoIaoJaaiaaaaaaaaaaaaaaaaaaaabaabaaiclVclWclXclYaaiclZcmacmbaaicmccmdcmdcmdcmecmfcmgcmhcmdcmdcmdcmiaaiaDpcmjcmkaFRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/nano/templates/sec_camera.tmpl b/nano/templates/sec_camera.tmpl index 2aa8655da04..fb130a17d9e 100644 --- a/nano/templates/sec_camera.tmpl +++ b/nano/templates/sec_camera.tmpl @@ -21,6 +21,7 @@ Used In File(s): \code\game\machinery\computer\camera.dm {{:helper.link(value.name, '', {'switchTo' : value.camera})}} {{/if}} {{/for}} +{{if data.networks}}

Networks

Please select the networks you'd like this console to monitor. @@ -35,3 +36,4 @@ Used In File(s): \code\game\machinery\computer\camera.dm {{/for}}
+{{/if}} From 1430eb11f125391e6fed48fc686cea6e4e7c9802 Mon Sep 17 00:00:00 2001 From: DZD Date: Fri, 30 Jan 2015 21:26:15 -0500 Subject: [PATCH 02/17] Theft Objective Tweaking - AI stealing objective actually requires an AI inside the intellicard now. - RD and xenobiologists no longer get the slime extract objective. - HoS and Warden can no longer get ablative vest objective. - HoP can no longer get corgi meat objective. - CE, RD, Scientists, Engineers, and Life Support Specialists can no longer get plasma objective. - Slime extract objective requires that slime extract be unused. - Renames "nuclear gun" objective to "advanced energy gun" to clear up some confusion. --- code/game/gamemodes/objective.dm | 2 +- code/game/gamemodes/steal_items.dm | 26 +++++++++++++++++++++++--- nano/debug.html | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index abdb1832d6f..ddaf95b8ffb 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -743,7 +743,7 @@ datum/objective/minimize_casualties check_completion() if(owner.kills.len>5) return 0 return 1 - + //Vox heist objectives. datum/objective/heist diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 5a92a88c673..dccaabeff59 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -17,13 +17,16 @@ return 0 var/list/all_items = owner.current.get_contents() for(var/obj/I in all_items) //Check for items - if(istype(I, typepath)) + if(istype(I, typepath) && check_special_completion(I)) //Stealing the cheap autoinjector doesn't count if(istype(I, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) continue return 1 return 0 +/datum/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc) + return 1 + /datum/theft_objective/antique_laser_gun name = "the captain's antique laser gun" typepath = /obj/item/weapon/gun/energy/laser/captain @@ -52,6 +55,13 @@ name = "a functional AI" typepath = /obj/item/device/aicard +datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C) + if(..()) + for(var/mob/living/silicon/ai/A in C) + if(istype(A, /mob/living/silicon/ai) && A.stat != 2) //See if any AI's are alive inside that card. + return 1 + return 0 + /datum/theft_objective/defib name = "a defibrillator" typepath = /obj/item/weapon/defibrillator @@ -73,12 +83,20 @@ protected_jobs = list("Research Director") /datum/theft_objective/slime_extract - name = "a sample of slime extract" + name = "a sample of unused slime extract" typepath = /obj/item/slime_extract + protected_jobs = list("Research Director","Xenobiologist") + +/datum/theft_objective/slime_extract/check_special_completion(var/obj/item/slime_extract/E) + if(..()) + if(E.Uses > 0) + return 1 + return 0 /datum/theft_objective/corgi name = "a piece of corgi meat" typepath = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi + protected_jobs = list("Head of Personnel") /datum/theft_objective/capmedal name = "the medal of captaincy" @@ -133,6 +151,7 @@ /datum/theft_objective name = "an ablative armor vest" typepath = /obj/item/clothing/suit/armor/laserproof + protected_jobs = list("Head of Security", "Warden") /datum/theft_objective/number var/min=0 @@ -170,6 +189,7 @@ typepath = /obj/item/weapon/tank min=28 max=28 + protected_jobs = list("Chief Engineer", "Engineer", "Scientist", "Research Director", "Life Support Specialist") /datum/theft_objective/number/plasma_gas/getAmountStolen(var/obj/item/I) return I:air_contents:toxins @@ -201,7 +221,7 @@ flags = THEFT_FLAG_SPECIAL /datum/theft_objective/special/nuke_gun - name = "nuclear gun" + name = "advanced energy gun" typepath = /obj/item/weapon/gun/energy/gun/nuclear /datum/theft_objective/special/diamond_drill diff --git a/nano/debug.html b/nano/debug.html index 969956bacb2..b0938554f34 100644 --- a/nano/debug.html +++ b/nano/debug.html @@ -16,7 +16,7 @@ - +