From 1183e5fa80046c67aec5b1658221669de114327d Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 5 Jan 2018 16:15:55 -0500 Subject: [PATCH 1/2] Sizegun QoL/nerf I want clicking it in-hand to let me change the size (so I can do it with Z). And I want the box to show the currently set size when I'm changing it instead of always just showing 200. So that's what it does now. Also jeez. If we have the technology to make a military-grade battery recharge in just a few seconds, why don't we use it other places? Makes the thing not self-recharge. Just stuff it in a recharger. There are plenty. Added various rechargers everywhere in public places on the map, since there weren't enough, just to be sure. --- code/modules/vore/resizing/sizegun_vr.dm | 4 ++-- maps/tether/tether-01-surface.dmm | 26 +++++++++++++----------- maps/tether/tether-03-station.dmm | 11 +++++----- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index c77837db640..8ec188b00f0 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -9,11 +9,11 @@ icon_state = "sizegun-shrink100" // Someone can probably do better. -Ace item_state = null //so the human update icon uses the icon_state instead fire_sound = 'sound/weapons/wave.ogg' - charge_cost = 100 + charge_cost = 240 projectile_type = /obj/item/projectile/beam/sizelaser origin_tech = list(TECH_BLUESPACE = 4) modifystate = "sizegun-shrink" - self_recharge = 1 + battery_lock = 1 var/size_set_to = 1 firemodes = list( list(mode_name = "select size", diff --git a/maps/tether/tether-01-surface.dmm b/maps/tether/tether-01-surface.dmm index 92b9b7e7551..945af25fb24 100644 --- a/maps/tether/tether-01-surface.dmm +++ b/maps/tether/tether-01-surface.dmm @@ -630,7 +630,7 @@ "amf" = (/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/obj/item/weapon/storage/briefcase/inflatable{pixel_y = 3},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = -3},/obj/structure/table/reinforced,/obj/effect/floor_decal/industrial/warning,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/storage/surface_eva) "amg" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/table/rack{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/obj/machinery/door/window/northleft,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/weapon/tank/emergency/oxygen/engi,/turf/simulated/floor/tiled/dark,/area/storage/surface_eva) "amh" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/table/rack{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/window/northright,/obj/item/clothing/mask/gas,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/weapon/tank/emergency/oxygen/engi,/turf/simulated/floor/tiled/dark,/area/storage/surface_eva) -"ami" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/civilian{dir = 1},/turf/simulated/floor/tiled/dark,/area/storage/surface_eva) +"ami" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/steel,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/machinery/recharger,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining) "amj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/turf/simulated/floor/tiled,/area/hallway/lower/first_west) "amk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/lower/first_west) "aml" = (/obj/random/junk,/turf/simulated/floor/plating,/area/vacant/vacant_site) @@ -887,7 +887,7 @@ "arc" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/structure/extinguisher_cabinet{dir = 4; icon_state = "extinguisher_closed"; pixel_x = -30; tag = "icon-extinguisher_closed (EAST)"},/turf/simulated/floor/tiled,/area/tether/surfacebase/atrium_one) "ard" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/lightgrey/border{dir = 8},/obj/machinery/power/apc{cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; pixel_x = -30},/obj/structure/cable{icon_state = "0-4"},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "are" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"arf" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"arf" = (/obj/structure/table/glass,/obj/item/weapon/book/codex,/obj/machinery/recharger,/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room) "arg" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/bed/chair{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "arh" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "ari" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/locker) @@ -2055,7 +2055,7 @@ "aNA" = (/obj/effect/floor_decal/techfloor,/obj/effect/decal/cleanable/dirt,/obj/structure/table/steel,/obj/random/drinkbottle,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining) "aNB" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/steel,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining) "aNC" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/steel,/obj/item/weapon/tape_roll,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining) -"aND" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/steel,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining) +"aND" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/storage/primary) "aNE" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/steel,/obj/item/weapon/storage/firstaid/regular,/obj/random/medical/lite,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining) "aNF" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/random/junk,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/techfloor,/area/maintenance/lower/mining) "aNG" = (/turf/simulated/floor/plating,/area/maintenance/lower/mining) @@ -3904,7 +3904,7 @@ "bxd" = (/obj/structure/bookcase,/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room) "bxe" = (/obj/structure/bookcase,/obj/machinery/light/small,/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room) "bxf" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/mauve/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/mauve/bordercorner2{dir = 9},/obj/machinery/light,/obj/item/device/radio/intercom{dir = 2; pixel_y = -24},/turf/simulated/floor/tiled,/area/rnd/reception_desk) -"bxg" = (/obj/structure/table/glass,/obj/item/weapon/book/codex,/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room) +"bxg" = (/obj/structure/table/woodentable,/obj/item/weapon/coin/silver,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/recharger,/turf/simulated/floor/wood,/area/crew_quarters/recreation_area) "bxh" = (/obj/structure/table/glass,/obj/item/device/flashlight/lamp/green,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/wood,/area/tether/surfacebase/reading_room) "bxi" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/surfacebase/reading_room) "bxj" = (/obj/structure/railing{dir = 4},/obj/effect/floor_decal/corner_oldtile/green{dir = 9},/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/surfacebase/outside/outside3) @@ -4357,7 +4357,7 @@ "bFO" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Recreation Area"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/recreation_area) "bFP" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/recreation_area) "bFQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area) -"bFR" = (/obj/structure/table/woodentable,/obj/item/weapon/coin/silver,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/wood,/area/crew_quarters/recreation_area) +"bFR" = (/obj/structure/table/reinforced,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/item/device/radio/off,/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera/network/civilian{dir = 1},/obj/item/clothing/glasses/goggles,/obj/item/clothing/glasses/goggles,/turf/simulated/floor/tiled/dark,/area/storage/surface_eva) "bFS" = (/obj/structure/closet,/obj/random/maintenance/security,/obj/random/contraband,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/clothing/suit/storage/vest/hoscoat/jensen{armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); desc = "Its an old, dusty trenchcoat... what a shame."; name = "trenchcoat"},/turf/simulated/floor/plating,/area/maintenance/lower/south) "bFT" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three) "bFU" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/tether/surfacebase/north_stairs_three) @@ -5650,6 +5650,8 @@ "ceH" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/obj/structure/bed/chair,/turf/simulated/floor/tiled/steel_grid,/area/assembly/robotics) "ceI" = (/turf/simulated/wall{can_open = 1},/area/maintenance/lower/south) "ceJ" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/mauve/border{dir = 9},/obj/machinery/status_display{pixel_y = 30},/turf/simulated/floor/tiled/steel_grid,/area/outpost/research/xenobiology) +"ceK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/table/standard,/obj/machinery/recharger,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"ceL" = (/obj/structure/table/marble,/obj/effect/floor_decal/spline/plain{dir = 8},/obj/machinery/recharger,/turf/simulated/floor/tiled/white,/area/crew_quarters/bar) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaacaacaacaacaacaacaacaacaacaacaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -5681,7 +5683,7 @@ aaaaadaadaadaadaadaadaadaadaadaadaeoaeVaeoadKaahaahaahaahaahaahaahaahaahaahaahaa aaaaadaadaadaadaadaadaadaadaadaadafqaeoaeoadKaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaeWbwUafsaftauPafvafwafraeWaahaahaahaexafxafyafzaexafAafBafCaerafeafDaeFaeFafEafFafGafHafIafJafJafKafJafLafMafNafNafOafoafPaeJaahaahaahaahaahaaUafQaaUaahaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadafqafRaeoadKaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaeWafSafTafTafUafTafVafWaeWaahaahaahaexafXafYafZagaagbagcagdaerageagfaeFaggaeFaghagiaeJagjagkaglagmagnagoagpagqagqagqagraGKaeJaahaahaahaahaahaaUabHaaUaahaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadadKadKadKadKaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaeWagtafTafrafrafraguagvaeWaahaahaahaexaexaexaexaeyagwabTabTaeraeraeraeraeraeraeraeraeJaeJaeJagxagyaeJaeJaeJaeJaeJaeJaeJaeJaeJaahaahaahaaUaaUaaUabHaaUaaUaaUaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaadaaa -aaaaadaadaadaadaadaadaadaadaadaadaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaeWagzafTafragAafraguagBaeWaahaahaahaahaahaahaahabTagwabTaahaahaahaahaahaahaahaahaahaahaahaeJagCagDaeJaahaahaahaahaahaahaahaahaahaahaahaaUagEagFagGagHabHaaUaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaaa +aaaaadaadaadaadaadaadaadaadaadaadaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaeWagzafTafragAaNDaguagBaeWaahaahaahaahaahaahaahabTagwabTaahaahaahaahaahaahaahaahaahaahaahaeJagCagDaeJaahaahaahaahaahaahaahaahaahaahaahaaUagEagFagGagHabHaaUaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaeWagIagJafTafUafTaguagKaeWabTabTabTabTabTabTabTabTagLabTaahaahaahaahaahaahagMagMagMaahaahaeJagNagOaeJaahaahaahaahaahaahaahaahaahaahaahaaUagPagQagRagSagTaaUaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaahaahaahaahaahaahaahaahaahagUagUagUagUagUaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaahaeWagVagWagXagYagXagZahaaeWabTafAafAafAahbafAafAafAagLabTaahaahaahaahaahaahagMahcagMaahaahaeJahdaheaeJaahaahaahaahaahaahaahaahaahaahaahaaUabHahfahgahhabHaaUaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaahaahaahaahaahaahaahaahaahagUahiahjahkagUagUaahaahahlahlahlahlahlahlahlahlahlahlahlahlahlahlahlahlahlahlahlahlahlaeWaeWahmahnahnahnahoaeWaeWabTafAahpahqahrahqahsahsahtabTaahagMagMagMagMagMagMahuagMagMagMagMahvahwagMagMagMagMagMagMahxahxahxahxaahaahaaUahyahzahAahBagTaaUaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaaa @@ -5691,7 +5693,7 @@ aaaaadaadaadaadaFvaadaadaadaadaadaadaadaahaahaahaiyajmajnaiyagUajoagUagUagUagUag aaaaadaadaadaadaadaadaadaadaadaadaadaadakbakbakcaiyakdakeaiyakfakgagUakhakiakjakkaSPakmaknakoakpahlahlahlakqakraksakqahlahlahlahlahlahlahlahlahlahlahlahlahlaktakuakuakvakuakuakwakxahXakyakyakzakAahXahXahXahXagMakBakCajUakDakEakEakEakEakEakEakEakEakEakDajUajVawZagMahxakGahxahxaahaahaahaahaaUajlaaUaahaahaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadakbakbakHayKakJakKazjakMakNakOakPakQakQakQakRakSakTaiHakUahlakVakWakXakYakZalaalbakVakVakVakVakVakVakVakVakVakVakVakVaktalcaldalealdalfalgalhahXalialiahXaljalkahXaahaahagMallakCajUalmalnaloaloaloaloaloaloaloalpalmajUajValqagMalralsaltalraahaahaahaahaaUajlaaUaahaahalralralralralraahaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadakbakbakHaBoalvalwaHfalyalzalAalBalCalDalCalEalFalGakoalHahlakValIalJalKakZalaakXakVakVakVakVakVakVakVakVakVakVakVakVaktalLaldalMaldalNalgalOahXahXahXahXakyalPahXaahaahagMalQakCajUalmalRalSalSalSalSalSalSalSalTalmajUajVakFagMalralralUalralralralralraaUalVaaUalralralralWalXalYalraahaadaadaadaadaadaadaadaadaadaadaadaadaaa -aaaaadaadaadaadaadaadaadaadaadaadaadaadakbakbalZaiyamaambaiyamcamdagUameamfamgamhamiakmamjakoamkahlakVamlakXammamnalJakXakVakVakVakVakVakVakVakVakVakVakVakVaktamoaldampamqamralgalOalgbxabxaahXamsamtahXaahaahagMalQakCajUalmalRamualSalSalSalSalSamualTalmajUajVamvamwahcamxamyamzamzamAamzamBalYalYalYalYalYalYalYamCalYalraahaahaahaadaadaadaadaadaadaadaadaadaadaaa +aaaaadaadaadaadaadaadaadaadaadaadaadaadakbakbalZaiyamaambaiyamcamdagUameamfamgamhbFRakmamjakoamkahlakVamlakXammamnalJakXakVakVakVakVakVakVakVakVakVakVakVakVaktamoaldampamqamralgalOalgbxabxaahXamsamtahXaahaahagMalQakCajUalmalRamualSalSalSalSalSamualTalmajUajVamvamwahcamxamyamzamzamAamzamBalYalYalYalYalYalYalYamCalYalraahaahaahaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaadaahaahamDamDamDamDamDamEamEamEamEamFamFamFamFamFamGamHamIahlakVakXakXakXalJakXakXakXakVakVakVakVakVakVakVakVakVakVakVaktaktamJamKamLamMalgalOalgbykahXahXahXahXahXaahaahagMbcCakCajUamOalRalSalSalSalSalSalSalSalTamOajUajVakFagMalralralralralramPamPamQamPamRamPamSamSamTalYalYalYalraahaahaahaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaahaahaahamUamVamWamXamUamYamZanaamUanbancandaneanfangakoakpahlakVakXalJakXakXamlamlakXakXakXakVakVakVakVakVakVakVakVakVakVaktaktanhanianjalgankalOalOalgaahaahaahaahaahaahagManlakCajUamOalRalSalSanmanmanmalSalSalTamOajUajVannagMaahaahaahalranoanoalralralralralralralralralralralralraahaahaahaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaadaahaahaahamUanpanqanramUansantanuamUanvanwanwanxanyanzaiHanAahlanBakXalaakXakXakXakXalJalJalaakVakVakVakVakVakVakVakVakVakVakVaktaktaktaktalganCanDalOalgaahaahaahaahaahaahagManEakCajUamOalRalSalTanFanFanGalRalSalTamOajUajVanHagMaahaahaahalranIalralraahaahaahaahaahaahaahaahaahaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaaa @@ -5700,7 +5702,7 @@ aaaaadaadaadaadaadaadaadaadaadaadaadaahamUaogamUaohaoiaojamUaokaolaomamUamFamFam aaaaadaadaadaadaadaadaadaadaadaadaahaahamUaoEaoFaoGaoHaoIaoJaoKaoLaoMamUaoNaoOaoPaoQahlaoRakoaoSahlaoTakXakXakXalJalJaoUakVakVakVakVakVakVakVakValgaoVaoWaoXalOalOaoYalOalOalOalOalOalOaoZapaapaapaapaapaapaapaapbapcakCajUamOalRalSalSaloaloaloalSalSalTamOajUajVaHgaoeapeapfapgaphapiaoeapjapkaoeaoeaoeaahaahaahaahaahaahaahaahaadaadaadaadaadaadaadaadaadaadaadaadaaa aaaaadaadaadaadaadaadaadaadaadaadaahaahamUarsaoFaoGapmapnapoappapmaoMamUapqaprapsaptahlapuapvakpahlapwakXakXalJapxakVakVakVakVakVakVakVakVakVakValgapyalOapzapAapAapAanCanCanCanCapBapCalgapDalgalgapEapFalgalgagMapGakCajUamOalRalSalSalSalSalSalSalSalTamOajUajVapHaoeapeapIapJapKapLaoeapMapNapOaoDaoeaahapPapPapPapPapPapPapPapQapRapRapSapTapTapTapTapSapRapRapUaaa aaaaadaadaadaadaadaadaadaadaadaadaahaahamUapVapWapXapYapZaqaaqbaqcaqdamUaqeaprapsaqfahlaqgakoaqhaqiaqjaqjaqjaqjakVakVakVakVakVakVakVakVakVakVakValgaqkalOaqlaqmalgalgalgalgalgalgalgalgalgaahaahaahalgaqnagMahcaqoaqpakCajUalmalRamualSalSalSalSalSamualTalmajUajVaqqaoeaqrapIaqsaqtaVaaoeaquaqvaoeaoeaoeaahapPbJLaqxaqyaqzaqAaqBaqCaqDaqEaqFaqEaqEaqEaqEaqFaqEaqGapPaaa -aaaaadaadaadaadaadaadaadaadaadaadaahamUamUamUaqHaqIaqJaqKaqLaqMaqNaqOamUaqeaqPaqQaqRahlaqSakoaqTaqUaqVaqWaqXaqjakVakVakVakVakVakVakVakVakVakVakValgaqYaqZaraarbalgaahaahaahaahaahaahaahaahaahaahaahalgaqnagMagMagMarcakCajUalmalRalSalSalSalSalSalSalSalTalmajUajVakFaoeardarearfargarhaoeariarjarkaoDaoeaahapParlarmarmarmarnarmaqCaqDaqEaqFaqEaqEaqEaqEaqFaqEaroapPaaa +aaaaadaadaadaadaadaadaadaadaadaadaahamUamUamUaqHaqIaqJaqKaqLaqMaqNaqOamUaqeaqPaqQaqRahlaqSakoaqTaqUaqVaqWaqXaqjakVakVakVakVakVakVakVakVakVakVakValgaqYaqZaraarbalgaahaahaahaahaahaahaahaahaahaahaahalgaqnagMagMagMarcakCajUalmalRalSalSalSalSalSalSalSalTalmajUajVakFaoeardareceKargarhaoeariarjarkaoDaoeaahapParlarmarmarmarnarmaqCaqDaqEaqFaqEaqEaqEaqEaqFaqEaroapPaaa aaaaadaadaadaadaadaadaadaadaadaadaahamUarqarparrarsartarsaruarvarwarxamUaryarzarAarAahlarBakoarCaqjarDarEarFaqjarGarGarGarGarGarGarGarGarGarGarGalgarHalOalgalgalgaahaahaahaahaahaahaahaahaahaahaahalgaqnaqnarIagMarJakCajUalmarKanmanmanmanmanmanmanmarLalmajUajVarMaoearNapfapfarOarPaoearQaoeaoeaoeaoeaahapParRarmarSarTarUarmaqCaqDaqEarVarWarWarWarWarVaqEaqGapPaaa aaaaadaadaadaadaadaadaadaadaadaahaahamUarXarparrarZasaasbascasdaseaseasfasgashasiasjaskaslakoasmarGarGasnasoarGaspasqasrassasrasrasrasrasrasrasrastasuasvalgaahaahaahaahaahaahaahaahaahaahaahaahaahalgaqnaqnaqnagMaswakCajUakDakEakEakEakEakEakEakEakEakEakDajUajVasxasyaszapfapfarOasAasBasCasDasEasFaoeaahapPasGarmasHasIasJarmaqCaqDarWarVarWarWarWarWarVarWasKapPaaa aaaaadaadaadaadaadaadaadaadaadaahaahamUarqarpasNasOasOasOasOasOasOasPasQasRasSasTasUasVasWasXasYarGasZbasatbatcatdateatfatfatfatfatfatfatfatfatfatfatgathatiatiatjatjatjatjatjatjagMagMaahaahaahaahagMagMagMaqnagMatkakCbuhajUajUajUajUajUajUajUajUajUajUajUbuhatlatmatnatoatpatpatqatrapfatsapfapiasFaoeaahapPbJLattattarmatuarmaqCaqDarWarVarWarWarWarWarVarWaroatvaaa @@ -5794,7 +5796,7 @@ aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaL aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaMtaMuaMvaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLXaMwaMxaMyaLXaMzaMAaMBaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaMCaMCaMCaLOaLOaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLXaMDaMEaMFaMGaMHaMAaMIaLZaLMaLMaLNaMJaMKaMLaMMaMNaMOaMPaMQaMRaMSaMTaMUaLNaMVaMWaMXaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaLOaLOaMYaMZaMZaNaaNbaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLZaLZaLZaLZaLZaLXaLXaLXaLXaNcaMAaLZaLZaLMaLMaLNaNdaLSaLSaMraNeaLSaLSaLSaLSaMraLSaNfaNgaNhaNiaNjaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK -aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaNkaNlaNmaNmaNmaNmaNnaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLZaNoaNpaNqaNraNsaNtaNuaLZaLZaNvaLZaLMaLMaLMaLNaNwaMraNxaNyaNzaNAaNBaNCaNDaNEaNyaNFaLNaNGaNGaNHaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK +aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaNkaNlaNmaNmaNmaNmaNnaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLZaNoaNpaNqaNraNsaNtaNuaLZaLZaNvaLZaLMaLMaLMaLNaNwaMraNxaNyaNzaNAaNBaNCamiaNEaNyaNFaLNaNGaNGaNHaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaNIaLOaNJaMZaMZaMZaNKaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLZaNLaNMaNNaNOaNPaNQaNRaNSaNTaNUaLZaLMaLMaLMaLNaNVaLSaNfaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaNGaNHaNWaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaNXaLOaNYaNZaOaaMZaObaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLZaNLaOcaNNaOdaLZaLMaLMaLMaOeaOfaLZaLMaLMaLMaLNaOgaNyaOhaLNaOiaOjaOjaOjaOjaOkaOjaOjaOlaOmaNGaOnaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK aLKaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaOoaOoaOoaOoaOoaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLOaNIaLOaMZaMZaLOaOpaOqaLOaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLZaNLaOcaNNaOraLZaLMaLMaLMaOsaNvaLZaLMaLMaLMaLNaLNaLNaLNaLNaOjaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLNaLMaLMaLMaLMaLMaLMaLMaLMaLMaLMaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLLaLK @@ -5922,7 +5924,7 @@ bsobspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbs bsobspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbtvbtJbtJbtvbtKbuwbuxbuybuzbuAbuBbtwbuCbuDbuEbuFbuGbuHbuIbuJbuKbuLbuMbuNbuObuPbuQbuRbuSbuTaAVbuUbtzbuVbuWbuXbuYbsubuZbtnbvabvbbvcbvdbvebsHbsqbsqbsqbsqbsqbsqbtsbvfbtsbtsbvgbtsbtsbvhbtsbtsbsqbsqbsqbsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbtvbtJbtJbtvbvibvjbvkbvlbvjbvkbvmbtwbvnbuDbvobvpbvqbtwbvrbvsbvtbvubvvafubtzbvxbvybvzbvAbvBbuTbvCbtzbvDbvEbvFbvGbsubvHbvIbvJbvKbvLbvMbvNbsubsqbsqbsqbsqbsqbsqbtGbuubvObvPbuubvQbvRbuubvSbtsbsqbsqbsqbsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbvTbvTbvUbvVbvWbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbtvbtJbtJbtvbvXbvjbvkbvlbvjbvkbvmbtwbvYbvZbwabwbbwcbtwbwdbvsbwebwfbwgbwhbtzbwibvybwjbwkbwlbwlbwmbtzbwnbwobssbssbsubsubsubwpbwpbwqbwrbsubsubsqbsqbsqbsqbsqbsqbtGbwsbwtbwubwubwubwvbwwbwxbtsbsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbspbso -bsobspbspbspbspbspbspbspbspbspbspbvTbvTbwybwzbwAbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbtvbwBbwBbtvbwCbvjbvkbvlbvjbvkbwDbtwbtwbtwbtwbtwbtwbtwbwEbwFbtxaiUbvsainbtzbwIbwJbwKbwLbwMbwNbwObtzbwPbwQbwRbwSbwTaIjaklbwWbwXbwYbwZaqwbwTbsqbsqbsqbsqbsqbsqbtGbxbbxcakLbxdbxeamNbxgbxhbxibsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbspbso +bsobspbspbspbspbspbspbspbspbspbspbvTbvTbwybwzbwAbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbtvbwBbwBbtvbwCbvjbvkbvlbvjbvkbwDbtwbtwbtwbtwbtwbtwbtwbwEbwFbtxaiUbvsainbtzbwIbwJbwKbwLbwMbwNbwObtzbwPbwQbwRbwSbwTaIjaklbwWbwXbwYbwZaqwbwTbsqbsqbsqbsqbsqbsqbtGbxbbxcakLbxdbxeamNarfbxhbxibsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbvTbvTbxjbspbxkbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbtvbxlbxmbxnbxobxpbxqbxrbxpbvkbxsbxtbxubxvbxubxvbxwbtxbxxbxybxzbvubvsanQbtzbtzbxBbxCbxDbxDbxEbtzbtzbxFbxGbxHbxIbwTbxJbxKbxLbxMbxNbxObxPbxQbsqbsqbsqbsqbsqbxRbtsbxSbxTbxSbtsbtsbtsbtsbxUbxVbsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbvTbvTbxjbspbxkbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsrbsqbsqbsqbtvbxWbxXbxXbxXbxXbxXbxYbxmbvkbxZbxtbyabxvbybbxvbycbtxbydbyeaiBbygbyhbyibyjaArbylbymbynbyobypbyqbyrbysbssbxGbytbwTbyubyvbywbyxbyybxObyzbxQbsqbsqbsqbsqbsqbsqbyAbyBbyCbyDbyEbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbvTbvTbyFbyGbyHbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbyIbyIbtvbtvbtvbyKbyLbyLbyLbyLbyMbyNbxmbyObyPbxtbyQbyRbySbyTbySbtxbxxbyUbtxbyVbyWbyXbyYbyZbzabzbbzcbzdbzealubzgbssbssbzhbzibwTbzjbzkbzkbzkbzkbzlbzmbwTbyIbyIbsqbsqbsqbsqbyAbznbzobzpbyEbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbspbso @@ -5935,7 +5937,7 @@ bsobspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbs bsobspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbDJbDKbDLbDMbDNbDObDPbDQbDRbDRbDSbDTbDUbtWbDWbDWbDlbDXbDYbDYbDZbEabEabEbbDlbyIbEcbEcbyIbDpbEdbEebEfbEgbEhbEibEjbDubDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbCUbEnbEobEpbDDbEqbABbErbEsbEtbEubEvbEwbExbEybABbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbDJbEzbEAbEBbECbECbECbEDbEEbEEbEEbEFbEGbEHbEIbEIbDmbEJbEJbEJbEJbEJbEJbEKbDlbyJbyJbyJbyJbELbEMbENaERbEPbEQbERbESbETbDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbCUbEUbABbABbEVbABbABbABbEWbABbABbABbEWbEXbEWbABbABbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbDJbEYbEZbFabFbbFbbFcbFcbFcbFcbFcbFdbFebFfbFgbFhbFibFjbFjbFjbFkbFjbFlbFmbFnbyJbyJbyJbyJbDpbDpbFobDpaSFbGtbFrbFsbFtbDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbFubFvbFwbFxbFybFzbABbFAbFBbFCbFDbABbFEbFFbFGbBFbABbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbso -bsobspbspbspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbDfbFHbEZbFIbFJbFJbFKbFKbFKbFKbFKbFLbFMbEHbEIbFNbFObEJbEJbEJbFPbEJbFQbFRbFnbyJbyJbBcbyJbDpbFTbFUbFVbGtbGtbDpbFWbFtbDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbFXbFYbABbFZbGabGbbGcbGdbGebGfbGgbGhbGgbGibGjbGkbABbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbso +bsobspbspbspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbDfbFHbEZbFIbFJbFJbFKbFKbFKbFKbFKbFLbFMbEHbEIbFNbFObEJbEJbEJbFPbEJbFQbxgbFnbyJbyJbBcbyJbDpbFTbFUbFVbGtbGtbDpbFWbFtbDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbFXbFYbABbFZbGabGbbGcbGdbGebGfbGgbGhbGgbGibGjbGkbABbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbtubDfbGlbEZbFIbFJbFJbFKbFKbFKbFKbFKbFLbFMbEHbEIbGmbDlbGnbGobGobGpbGqbEJbGrbDlbyJbyJbyJbyJbDpbFqbGsbDpbGtbGtbDpbGubFtbDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbGvbGwbGxbGxbGxbGybGxbGzbGAbGzbGzbGzbGzbGBbGBbGBbGBbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbDfbGCbEZbFIbFJbFJbGDbDRbGEbFKbFKbFLbFMbEHbEIbGFbDlbGGbGHbGIbGJbGKbEJbbwbDlbyJbyJbyJbyJbDpbGMbGNbDpbGtbGtbDpbGObFtbDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbFXbGPbGQbGRbGSbGTbGUbGVbGWbGXbGYbGZbGVbHabHbbHcbHdbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbDJbEYbEZbFIbFJbFJbHebHfbHgbFKbFKbFLbFMbEHbEIbGmbDlbDlbDlbDlbHhbHibDmbDlbDlbAxbAxbHjbHjbDpbDpbDpbDpbDpbDpbDpbHkbHlbDvbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbDzbHmbHnbHobHpbHqbHrbHsbGVbHtbGWbGWbHubGVbHvbHwbHxbHdbsqbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbso @@ -5951,7 +5953,7 @@ bsobspbspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbs bsobspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsrbsqbsqbsqbLBbLCbLDbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbLEbLEbLEbLFbDubJcbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbLfbFXbLGbLHbLIbLJbLKbLjbLjbLLbLabKabLabLabLabLabLMbLcbsqbspbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbLNbLNbLObLObLObLNbLNbLNbLNbLObLObLPbLQbLRbLSbLSbLSbLSbLSbLSbLEbsqbsqbsqbsqbLEbLTbLEbznbDubJcbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbLUbLVbLWbLXbLdbKRbLZbMabMabMbbMcbMdbLabLabLabLabMebLcbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbLNbMfbMgbMhbMgbMibMjbMkbeSbMmbMgbMnbLQbMobMpbMpbMpbMpbMpbMpbLEbLEbMqbMqbLEbLEbMrbLEbznbDubJcbEkbElbElbElbElbElbElbElbElbElbElbElbElbElbElbElbEmbMsbFXbMtbKtbMubJVbMvbMwbMxbJGbMybJGbMzbMAbMBbMBbMBbJGbCxbsqbspbspbspbspbspbspbspbspbspbspbspbspbso -bsobspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbMCbMDbMgbMgbMgbMEbMEbMEbMEbMFbMGbMHbLQbMIbMpbMJbMJbMJbMJbMpbeMbjUbMMbMMbMNbMObMPbMQbMRbMSbJcbMTbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMVbMsbFXbMWbMXbkObJVbpSbNabNbbNcbNdbNebNdbNfbNdbNdbNgbJVbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbso +bsobspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbMCbMDbMgbMgbMgbMEbMEbMEbMEbMFbMGbMHbLQbMIbMpbMJbMJbMJbMJbMpbeMbjUbMMbMMbMNbMObMPbMQbMRbMSbJcbMTbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMUbMVbMsbFXbMWbMXbkObJVbpSbNabNbceLbNdbNebNdbNfbNdbNdbNgbJVbsqbsqbspbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbMCbMEbNhbMgbMgbMEbMEbMEbMEbNibMgbNjbLQbNkbMpbMJbMJbMJbMJbMJbuabNmbNnbNobNpbNqbNqbNrbNsbNtbNubNvbNwbNwbNwbNwbNwbNwbNwbNwbNwbNwbNwbNwbNwbNwbNwbNwbNxbNybNzbNAbJVbJVbNBbMwbMwbNcbNCbNCbNCbNCbNCbNCbNDbJVbsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbMCbNEbMgbMgbMgbNFbNFbNGbNFbNibMgbNHbLQbNIbMpbMJbMJbMJbMJbMJbuabNJbNKbNLbNMbNNbNNbNObCkbNPbBYbNQbCnbCnbCnbCnbCnbCnbCnbNRbCebCebNSbCebCebCebCebCebNTbNUbNzbNVbNWbNXbNBbLjbLjbNYbNZbNZbNZbNZbNZbNZbNZbOabsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbso bsobspbspbspbspbspbspbspbspbspbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbsqbMCbMgbObbOcbOdbOdbOdbOdbOdbOebOfbOgbOhbOibMpbMJbMJbMJbMJbOjbVRbOkbOlbOmbOnbOobOpbOqbCKbOrbCIbOsbOtbOubOvbOwbOxbCKbCKbOybOrbOzbOAbOzbOzbOzbOBbOzbOCbODbNzbNVbOFbOFbNBbLjbLjbOGbOHbOHbOHbOHbOHbOHbOHbOabsqbsqbsqbspbspbspbspbspbspbspbspbspbspbspbso diff --git a/maps/tether/tether-03-station.dmm b/maps/tether/tether-03-station.dmm index c5eee36c686..3697c05fecd 100644 --- a/maps/tether/tether-03-station.dmm +++ b/maps/tether/tether-03-station.dmm @@ -1725,7 +1725,7 @@ "aHi" = (/obj/structure/sign/securearea,/turf/simulated/wall/r_wall,/area/teleporter) "aHj" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled,/area/teleporter) "aHk" = (/obj/structure/table/standard,/obj/item/weapon/hand_tele,/turf/simulated/floor/tiled/dark,/area/teleporter) -"aHl" = (/obj/structure/table/woodentable,/obj/machinery/recharger{pixel_y = 0},/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/wood,/area/library_conference_room) +"aHl" = (/obj/structure/table/woodentable,/obj/machinery/recharger,/turf/simulated/floor/grass,/area/crew_quarters/visitor_dining) "aHm" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor/wood,/area/library_conference_room) "aHn" = (/turf/simulated/floor/wood,/area/library_conference_room) "aHo" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/library_conference_room) @@ -1764,7 +1764,7 @@ "aHV" = (/obj/structure/table/reinforced,/obj/item/weapon/folder{pixel_x = -4},/obj/item/weapon/folder/red{pixel_y = 3},/obj/item/weapon/folder/blue{pixel_x = 5},/obj/item/weapon/folder/yellow,/obj/item/weapon/stamp/internalaffairs,/obj/item/weapon/stamp/denied{pixel_x = 4; pixel_y = -2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/weapon/book/manual/security_space_law,/obj/item/weapon/book/manual/command_guide,/obj/item/weapon/book/manual/standard_operating_procedure,/turf/simulated/floor/tiled/dark,/area/lawoffice) "aHW" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) "aHX" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/yellow,/obj/item/weapon/pen,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/wood,/area/library_conference_room) -"aHY" = (/obj/structure/table/woodentable,/obj/item/weapon/tape_roll,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/wood,/area/library_conference_room) +"aHY" = (/obj/structure/table/woodentable,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/obj/item/device/flashlight/lamp/green{pixel_x = 1; pixel_y = 5},/turf/simulated/floor/wood,/area/library_conference_room) "aHZ" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/packageWrap,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/wood,/area/library_conference_room) "aIa" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/wood,/area/library_conference_room) "aIb" = (/turf/space,/area/shuttle/antag_space/docks) @@ -5541,6 +5541,7 @@ "ccC" = (/obj/structure/closet/secure_closet/personal/patient,/obj/effect/floor_decal/borderfloorwhite{dir = 6},/obj/effect/floor_decal/corner/pink/border{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/status_display{pixel_x = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_b) "ccD" = (/obj/structure/closet/secure_closet/personal/patient,/obj/effect/floor_decal/borderfloorwhite{dir = 6},/obj/effect/floor_decal/corner/pink/border{dir = 6},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/status_display{pixel_x = 32},/turf/simulated/floor/tiled/white,/area/medical/patient_c) "ccE" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1380; id_tag = "tether_dock_pump"},/obj/machinery/light/small,/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "tether_dock_sensor"; pixel_x = 0; pixel_y = -25},/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "tether_dock_airlock"; pixel_x = 0; pixel_y = 30; req_one_access = list(13); tag_airpump = "tether_dock_pump"; tag_chamber_sensor = "tether_dock_sensor"; tag_exterior_door = "tether_dock_outer"; tag_interior_door = "tether_dock_inner"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_two) +"ccF" = (/obj/structure/table/woodentable,/obj/item/weapon/tape_roll,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/recharger,/turf/simulated/floor/wood,/area/library_conference_room) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -5598,7 +5599,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBbEebDxatOatOaSCaSCaSCaS aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaTZaVaaVfbataWFbdsaoqaTKaTJaTMaTLaoqaoqaTOaoqaUlaTQaUoaUnaTKaUpaUlatWaKtaUQaAWaAWaAWaUUaUVaaVapiapjaUXaUWauRauRauRauRauRauRaBmauSauUaqpaseaseaseauOavqauVavrauVauVavtauOaseaseaseaseaseatLavuapuamgamgamgamgamgamgamgamgamgamgalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaTZaVabdXbeFaVbbeGaVdaVIaVHaVLaVJaVWaVNaWoaWnaWraWpaWtaWsaWwaWoaWnaWyaWKaWCaAWaWMaBXaUUaWOaaVaWRaWQaWUaWTauRavwavwavwavwauRaPkaqpatLaqpaseaseaseauMavqaqpaqpavxaqpavtauMaseattatvatuaseatLavyamMamgamgamgamgamgamgamgamgamgamgalAamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaXyaXxaRbaRbaQwaQwaQwaQwaXCaQwaRbaRbafPafPaXXafPafPalFaXZaXZaXZaYbaYdaXZaoJaoJaoJaaVaaVaaVaqsaqtaYBaYfauRavwavwavwavwavwbBaaqpatLaqpaseaseaseauMavqaqpavBavzavCavtauMaseattavDatuaseatLavEamMamgamgamgamgamgamgamgamgamgamgaqBamhaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaGBaGBaRbaYEaYHaYFaYJaBgaZdaRVaZgaRbaZkaZiaZnaZlaZqafPaoGaZraZUaZSaZWaBwbavbePbYEaoJaacaikaraarbbaxardauRavwavwavwavwavwbBaaqpatLaqpaseaseaseauMavqaqpavHavGaqpavtauMaseattatvatuaseatLavIamMamgamgamgamgamgamgamgamgamgamgarhamhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaGBaGBaRbaYEaYHaYFaYJaBgaZdaRVaZgaRbaZkaZiaZnaZlaZqafPaoGaZraZUaZSaZWaBwbavbePbYEaoJaacaikaraarbbaxardauRavwavwavwavwavwbBaaqpatLaqpaseaseaseauMavqaqpavHavGaqpavtauMaseattaHlatuaseatLavIamMamgamgamgamgamgamgamgamgamgamgarhamhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWahWahWahWbcoaXzaRVaRXbaAaTmbaDbaBbaFaRbbaIbaGbbnbaJbbpafPbbsbbqbbxbbubbzbbybbDbbDbbAaoJaacaikarzarAbckarCauRavwavwavwavwavKbCoaqpatLaqpaseaseaseauMavqaqpaqpaqpaqpavtauMaseattatvatuaseatLavIamMamgamgamgamgamgamgamgamgamgamgalAamhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaabcobclbcpbaybcnbcrbcwaRVbduaRbbdxbdvbebbdybefbedbeJbegbeLbeKbeNbeMbfobYtbhEaoJaacaikarZasabfsascauRauRauRauRauRauRavLaqpatLaqpaseaseaseauOavqavMavNavNavNavtauOaseaseaseaseaseatLaHrashashashashashashashashasiamMasialAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaabcobftbfvaRXbfSaRXbfTaRVbfUaRbbfWafLafLamZbfYafPaoIbfZbgCbgBbgEbgDaoIbgFaoJaeiaacaikasCasDbgHasFavPavPavPavPavPavPavQaqpatLaqpaseaseasfayOauOauOauMauMauMauOayMasfaseatJaseaseatLavIasIasJasKasLaSoasNasOasIasPasQasRalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -5626,9 +5627,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabn aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCFaFpaFqaFraCFaaaaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaaaaaaaaaaCKaDJaFtaFuaCKaacaCOaFvaFwaFxaFyaFzaDuaDuaDuaDuaFAaCOaFBaFCaFDawEaDzaDzaDzaDzaacaacaacaacaAgaFEaFEaBxaEJaAMaFFaELaELaEMaFGaFHaFIaAgaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaboeaFTaFUaFVaFWaDFaDHaaaaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsbpDaFYaFZaGaaGbaDKaCKaacaCOaGcbSzaGeaCObWHbWDaGibWKbVMaGkaCOaFBaFCayUaGlawEaacaacaacaacaacaacaacaAgccwaBxaBxaEJaAMaGnaGoaGpbWNaGqaGraAgaAgaacaacaacaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbtcbuaGxcbvaGzaGAaDHaaaaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFscbwcbycbxcbGaGFaGGaCKaacaCOaCOaCOaCOaCOaCOaCOaCOaCOaCOaCOaCOccxaGIaGJawEaGKaGKaGKaacaacaacaacaacaGLaGLaGLaGMaGNaGOaGLbWQaGLaAgaAgaAgaAgaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqdaGZaFUaHaaDFaDGaDHaaaaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsbqeaHcaFZaHdaDKaDLaCKaacaacaacaacaacaacaacaacaacaGKaHfaHgaGKaGKaHhaHiaGKaHjaHkaGKaacaacaacaacaGLaGLaHlaHmaHnaHoaHpccybYaaGLaGLaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqdaGZaFUaHaaDFaDGaDHaaaaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsbqeaHcaFZaHdaDKaDLaCKaacaacaacaacaacaacaacaacaacaGKaHfaHgaGKaGKaHhaHiaGKaHjaHkaGKaacaacaacaacaGLaGLaHYaHmaHnaHoaHpccybYaaGLaGLaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaCFaHsaHtaHuaCFaaaaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaFsaaaaaaaaaaCKaHvaHwaHxaCKaacaacaacaacaacaacaacaacaacaGKaHfaHfaHyaHzaHAaHBbWpaHDaHEaGKaacaacaacaacaGLaHFaHnaHGaHHaHIaHJaHKaHKaHLaGLaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabnUaDEaDFaDGaDHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabnVaDJaDKaDLaCKaacaacaacaacaacaacaacaacaacaGKaHMaHNaHOaHPaHQaHRaHSaHTaHUaGKaacaacaacaacaGLbYHaHnaHWaHXaHYaHZaIaaHnaHnaGLaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabnUaDEaDFaDGaDHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabnVaDJaDKaDLaCKaacaacaacaacaacaacaacaacaacaGKaHMaHNaHOaHPaHQaHRaHSaHTaHUaGKaacaacaacaacaGLbYHaHnaHWaHXccFaHZaIaaHnaHnaGLaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabnUaDEaElaEmaDHaaaaIbaIbaIbaIbaIbaaaaaaaaaaaaaaaaaaaaaaaaaaabnVaDJaEnaIcaCKaacaacaacaacaacaacaacaacaacaGKaIdaIeaIfaIfaIgaIhaIhaIiaIjaGKaacaacaacaacaGLaIkaIlaImaInaIoaIpaIaaHnaIqaGLaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacchcchcchcchaaaaaabnUaDEaENaDFaDHaaaaIbaIbaIbaIbaIbaaaaaaaIraIraIraIraIraaabEaaFZaDJaEOcbXaCKaacaacaacaacaacaacaacaacaacaGKaGKaGKaItaIuaIuaIuaIvaGKaGKaGKaacaacaacaacaGLaHnaHnaHnaIwaIwaIwaHnaHnaIxaGLaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacchcchcchcchaaaaaaaCFaFpaIyaIzaCFaaaaIbaIbaIbaIbaIbaaaaaaaIraIraIraIraIraaabnVaIAaDJaFtaIBaCKaacaacaacaacaacaacaacaacaacaacaacaGKaGKaGKaGKaGKaGKaGKaacaacaacaacaacaacaGLaICaIFaHnaHnaIEaHnaHnaIFaIGaGLaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa From 82a9a3c89eec616c24b77bc18f9db7c2b325e0e0 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 5 Jan 2018 20:56:07 -0500 Subject: [PATCH 2/2] Sizegun verb change --- code/modules/vore/resizing/sizegun_vr.dm | 54 ++++++++++++++---------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 8ec188b00f0..27f2d770b8c 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -22,6 +22,37 @@ fire_sound = 'sound/weapons/pulse3.ogg' )) +/obj/item/weapon/gun/energy/sizegun/New() + ..() + verbs += /obj/item/weapon/gun/energy/sizegun/proc/select_size + +/obj/item/weapon/gun/energy/sizegun/attack_self(mob/user) + . = ..() + select_size() + +/obj/item/weapon/gun/energy/sizegun/consume_next_projectile() + . = ..() + var/obj/item/projectile/beam/sizelaser/G = . + if(istype(G)) + G.set_size = size_set_to + +/obj/item/weapon/gun/energy/sizegun/proc/select_size() + set name = "Select Size" + set category = "Object" + set src in view(1) + + var/size_select = input("Put the desired size (25-200%)", "Set Size", size_set_to*100) as num + if(size_select>200 || size_select<25) + usr << "Invalid size." + return + size_set_to = (size_select/100) + usr << "You set the size to [size_select]%" + +/obj/item/weapon/gun/energy/sizegun/examine(mob/user) + ..() + var/size_examine = (size_set_to*100) + user << "It is currently set at [size_examine]%" + // // Beams for size gun // @@ -51,26 +82,3 @@ H.updateicon() else return 1 - -/obj/item/weapon/gun/energy/sizegun/consume_next_projectile() - . = ..() - var/obj/item/projectile/beam/sizelaser/G = . - if(istype(G)) - G.set_size = size_set_to - -/obj/item/weapon/gun/energy/sizegun/verb/select_size() - set name = "Select Size" - set category = "Object" - set src in view(1) - - var/size_select = input("Put the desired size (25-200%)", "Set Size", 200) as num - if(size_select>200 || size_select<25) - usr << "Invalid size." - return - size_set_to = (size_select/100) - usr << "You set the size to [size_select]%" - -/obj/item/weapon/gun/energy/sizegun/examine(mob/user) - ..() - var/size_examine = (size_set_to*100) - user << "It is currently set at [size_examine]%"