From abd94bfda9a128ff93aa3abc2a4669513d872386 Mon Sep 17 00:00:00 2001 From: Fluff Date: Thu, 22 Jun 2023 09:16:25 -0400 Subject: [PATCH] Fixing turfs and typos Fixed some typos, turfs, and tried to make the staffs feel a tad better without making the foes to strong. --- .../submaps/gateway/maddnesslab.dmm | 3649 +++++++++-------- .../simple_mob/subtypes/gateway/imperion.dm | 1 - .../simple_mob/subtypes/gateway/vistors.dm | 4 +- .../simple_mob/subtypes/gateway/wizards.dm | 10 +- 4 files changed, 1925 insertions(+), 1739 deletions(-) diff --git a/maps/southern_cross/submaps/gateway/maddnesslab.dmm b/maps/southern_cross/submaps/gateway/maddnesslab.dmm index 8d8960f4a4..0b01a361c9 100644 --- a/maps/southern_cross/submaps/gateway/maddnesslab.dmm +++ b/maps/southern_cross/submaps/gateway/maddnesslab.dmm @@ -4,6 +4,10 @@ /obj/random/maintenance/foodstuff, /turf/simulated/floor/carpet/brown, /area/awaymission/mol/vistortunnel/orange) +"az" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass2, +/area/awaymission/mol/vr/shattered) "aB" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet/oracarpet, @@ -39,6 +43,12 @@ /obj/machinery/door/airlock, /turf/simulated/floor/tiled/red, /area/awaymission/mol/kitchen/chamberA) +"be" = ( +/obj/effect/floor_decal/stairs/wood_stairs{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/realitycore) "bf" = ( /obj/structure/table/marble, /obj/effect/floor_decal/corner/green/diagonal, @@ -83,6 +93,12 @@ }, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"ce" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "ch" = ( /mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror, /obj/effect/floor_decal/corner/grey/diagonal, @@ -148,6 +164,18 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"di" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper{ + name = "Notes"; + info = "We just pulled a cultist from the void. They were sleeping so we just nudge them into their room and prayed." + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/random/maintenance/research, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "dk" = ( /obj/structure/flora/tree/jungle_small, /turf/simulated/floor/grass2, @@ -160,6 +188,13 @@ /obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) +"dB" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/realitycore) "dH" = ( /turf/simulated/floor/wood, /area/awaymission/mol/vr/shattered) @@ -219,6 +254,12 @@ /obj/item/stolenpackage, /turf/simulated/floor/carpet/purple, /area/awaymission/mol/vistortunnel/purple) +"eb" = ( +/obj/structure/bed/chair/office{ + dir = 1 + }, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/mol/realitycore) "ed" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -296,6 +337,15 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"fD" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper{ + name = "Notes"; + info = "Vistor Purple has the capability to manpulate light, turning itself seemingly invisible to the naked eye." + }, +/obj/random/maintenance/research, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "fF" = ( /obj/effect/floor_decal/corner/lightorange, /obj/effect/floor_decal/corner/pink{ @@ -314,6 +364,13 @@ }, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) +"gy" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/realitycore) "gB" = ( /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/grass, @@ -328,6 +385,12 @@ /obj/machinery/door/airlock, /turf/simulated/floor/carpet/oracarpet, /area/awaymission/mol/mines) +"gO" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/vr/shattered) "gR" = ( /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/bmarble, @@ -589,6 +652,12 @@ "jz" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/vistortunnel) +"jM" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "jS" = ( /obj/effect/decal/mecha_wreckage/gorilla, /obj/effect/floor_decal/corner/black/diagonal, @@ -661,6 +730,19 @@ "lh" = ( /turf/simulated/floor/carpet/oracarpet, /area/awaymission/mol/mines) +"ll" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/mol/realitycore) +"lo" = ( +/turf/simulated/floor/outdoors/shelfice{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 293.15 + }, +/area/awaymission/mol/vr/shattered) "lz" = ( /obj/effect/floor_decal/corner/lightorange, /obj/effect/floor_decal/corner/pink{ @@ -682,6 +764,10 @@ "lJ" = ( /turf/simulated/floor/tiled/red, /area/awaymission/mol/vr/shattered) +"lV" = ( +/obj/structure/railing, +/turf/simulated/floor/wood, +/area/awaymission/mol/realitycore) "ma" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -834,6 +920,12 @@ }, /turf/simulated/floor/tiled/white, /area/awaymission/mol/kitchen/ChamberD) +"oo" = ( +/mob/living/simple_mob/mechanical/mecha/imperion/phase1{ + size_multiplier = 3 + }, +/turf/simulated/floor/weird_things/dark, +/area/awaymission/mol/realitycore) "ov" = ( /obj/machinery/light{ dir = 1 @@ -1021,6 +1113,10 @@ /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/freezer, /area/awaymission/mol/kitchen/chamberC) +"qo" = ( +/obj/structure/railing, +/turf/simulated/floor/wood, +/area/awaymission/mol/vr/shattered) "qq" = ( /obj/effect/floor_decal/corner/yellow/bordercorner{ dir = 8 @@ -1303,11 +1399,7 @@ /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) "tX" = ( -/turf/unsimulated/floor/dark{ - oxygen = 20.7263; - nitrogen = 93.7835; - temperature = 300 - }, +/turf/simulated/wall/r_wall, /area/awaymission/mol/realitycore) "uc" = ( /turf/simulated/wall/r_wall, @@ -1361,6 +1453,12 @@ "vb" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/scraptunnels/room4) +"vr" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "vw" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1382,6 +1480,7 @@ /area/awaymission/mol/kitchen) "vF" = ( /obj/structure/table/standard, +/obj/random/maintenance/research, /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) "vG" = ( @@ -1430,6 +1529,12 @@ /obj/effect/floor_decal/corner/lightorange/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) +"vX" = ( +/obj/structure/table/standard, +/obj/machinery/light, +/obj/random/maintenance/research, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "wa" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/scraptunnels/room1) @@ -1610,6 +1715,12 @@ /obj/item/weapon/reagent_containers/spray/sterilizine, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) +"yj" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/vr/shattered) "yu" = ( /turf/simulated/floor/grass, /area/awaymission/mol/vr/shattered) @@ -1636,6 +1747,14 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels) +"yQ" = ( +/obj/structure/table/standard, +/obj/machinery/light{ + dir = 1 + }, +/obj/random/maintenance/research, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "yS" = ( /obj/structure/table/marble, /obj/random/maintenance/foodstuff, @@ -1678,6 +1797,9 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/awaymission/mol/vr/shattered) +"zm" = ( +/turf/simulated/floor/tiled/neutral, +/area/awaymission/mol/realitycore) "zq" = ( /mob/living/simple_mob/vr/glitch, /turf/simulated/floor/tiled/red, @@ -1985,11 +2107,25 @@ /obj/item/weapon/storage/firstaid/bonemed, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) +"DR" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper{ + name = "Notes"; + info = "I feel I may be drugged after seeing vistor orange." + }, +/obj/machinery/light, +/obj/random/maintenance/research, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "DS" = ( /mob/living/simple_mob/vore/candy/bluecabold, /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/red, /area/awaymission/mol/kitchen) +"DU" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/mol/realitycore) "DZ" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/vistortunnel/purple) @@ -2269,14 +2405,7 @@ /turf/simulated/floor/tiled/freezer, /area/awaymission/mol/kitchen/chamberB) "Hp" = ( -/mob/living/simple_mob/mechanical/mecha/imperion/phase1{ - size_multiplier = 3 - }, -/turf/unsimulated/floor/dark{ - oxygen = 20.7263; - nitrogen = 93.7835; - temperature = 300 - }, +/turf/simulated/floor/weird_things/dark, /area/awaymission/mol/realitycore) "Hr" = ( /obj/effect/floor_decal/corner/yellow/diagonal, @@ -2439,6 +2568,12 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, /area/awaymission/mol/vr/shattered) +"Jh" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/mol/realitycore) "Jn" = ( /obj/effect/floor_decal/corner/red/border{ dir = 8 @@ -2515,6 +2650,10 @@ /obj/item/weapon/material/shard, /turf/unsimulated/ai_visible, /area/awaymission/mol/vr/observation) +"Kk" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass2, +/area/awaymission/mol/vr/shattered) "Kp" = ( /obj/machinery/gateway{ dir = 5 @@ -2617,6 +2756,10 @@ /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/freezer, /area/awaymission/mol/kitchen/chamberA) +"LW" = ( +/obj/machinery/light, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "LY" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/storage/firstaid/clotting, @@ -2898,6 +3041,12 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"Pw" = ( +/obj/effect/floor_decal/stairs/wood_stairs{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/realitycore) "PA" = ( /obj/machinery/light{ dir = 1 @@ -2943,6 +3092,12 @@ /obj/machinery/light, /turf/simulated/floor/bmarble, /area/awaymission/mol/entrancetunnel) +"Qs" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/vr/shattered) "QA" = ( /obj/effect/decal/mecha_wreckage/odysseus, /obj/effect/floor_decal/corner/black/diagonal, @@ -3097,6 +3252,15 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"Sy" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper{ + name = "Notes"; + info = "Vistor from the green specturem is higly toxic, creating spores that create a mess in a large area." + }, +/obj/random/maintenance/research, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "SB" = ( /mob/living/simple_mob/vr/poisonwiz, /turf/simulated/floor/grass, @@ -3241,6 +3405,9 @@ /obj/item/weapon/bedsheet/blue, /turf/simulated/floor/carpet/purple, /area/awaymission/mol/vistortunnel/purple) +"TO" = ( +/turf/simulated/floor/wood, +/area/awaymission/mol/realitycore) "TY" = ( /mob/living/simple_mob/vore/candy/bluecabold, /obj/effect/floor_decal/corner/white/diagonal, @@ -3417,6 +3584,12 @@ /obj/machinery/optable, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) +"Wi" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/mol/realitycore) "Wj" = ( /obj/structure/bed/chair, /turf/simulated/floor/bmarble, @@ -3546,9 +3719,23 @@ "Yj" = ( /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) +"Yl" = ( +/obj/structure/flora/tree/jungle_small, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass2, +/area/awaymission/mol/vr/shattered) "Yp" = ( /turf/simulated/floor/bmarble, /area/awaymission/mol/vr/observation) +"Yr" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper{ + name = "Notes"; + info = "The vistor from the blue region is quite spooked, and highly defensive. All projectile weaponry seems ineffective, however Bob was able to grab it and drag it into containment. Bob is currently undergoing medical treatment." + }, +/obj/random/maintenance/research, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "YA" = ( /obj/machinery/light, /turf/simulated/floor/carpet/green, @@ -13827,9 +14014,9 @@ NL NL NL NL +Qs dH -dH -dH +qo NL NL NL @@ -14085,9 +14272,9 @@ NL NL NL NL +Qs dH -dH -dH +qo NL NL NL @@ -14307,7 +14494,7 @@ Jw Jw Jw Jw -Pf +lo AQ AQ AQ @@ -14343,9 +14530,9 @@ NL NL NL NL +Qs dH -dH -dH +qo NL NL NL @@ -14549,7 +14736,7 @@ Jw Jw Jw Jw -Pf +lo AQ AQ AQ @@ -14564,7 +14751,7 @@ Jw Jw Jw Jw -Pf +lo AQ AQ AQ @@ -14601,9 +14788,9 @@ NL NL NL NL +Qs dH -dH -dH +qo NL NL NL @@ -14806,7 +14993,7 @@ Jw Jw Jw Jw -Pf +lo AQ AQ AQ @@ -14816,12 +15003,12 @@ AQ AQ AQ AQ -Pf +lo Jw Jw Jw Jw -Pf +lo AQ AQ AQ @@ -14831,7 +15018,7 @@ AQ AQ AQ AQ -Jw +lo Jw jd NL @@ -15622,14 +15809,14 @@ ni ni ni ni -dH -dH -dH -dH -dH -dH -dH -dH +gO +gO +gO +gO +gO +gO +gO +gO ni ni ni @@ -16137,15 +16324,15 @@ ni ni ni ni -dH -dH -dH -dH -dH -dH -dH -dH -dH +yj +yj +yj +yj +yj +yj +yj +yj +yj ni ni ni @@ -16379,7 +16566,7 @@ tP AQ AQ AQ -Pf +lo Jw jd NL @@ -16616,12 +16803,12 @@ AQ AQ Jw Jw -Pf +lo AQ AQ AQ -Pf -Pf +lo +lo AQ AQ Jw @@ -16870,17 +17057,17 @@ AQ AQ AQ AQ -Pf +lo Jw Jw Jw Jw AQ AQ -Pf +lo xd xd -Pf +lo Jw Jw Jw @@ -16894,7 +17081,7 @@ AQ AQ AQ AQ -Pf +lo Jw Jw jd @@ -17134,7 +17321,7 @@ Jw Jw Jw Pf -Pf +lo xd xd xd @@ -17164,7 +17351,7 @@ NL NL NL NL -dH +Qs ni ni NL @@ -17180,9 +17367,9 @@ NL NL NL NL +Qs dH -dH -dH +qo NL NL NL @@ -17422,25 +17609,25 @@ NL NL NL NL +Qs dH +qo +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +Qs dH -dH -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -dH -dH -dH +qo NL NL NL @@ -17680,25 +17867,25 @@ NL NL NL NL +Qs dH +qo +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +Qs dH -dH -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -dH -dH -dH +qo NL NL NL @@ -17907,7 +18094,7 @@ Jw Jw Jw Jw -Pf +lo xd JO xd @@ -17932,15 +18119,15 @@ xd xd xd xd +gO +gO +gO +gO +gO +gO dH dH -dH -dH -dH -dH -dH -dH -dH +qo NL NL NL @@ -17954,9 +18141,9 @@ NL NL NL NL -dH +Qs QP -dH +qo NL NL NL @@ -18166,11 +18353,11 @@ Jw Jw Jw AQ -Pf +lo xd xd xd -Pf +lo Jw Jw Jw @@ -18179,7 +18366,7 @@ Jw Jw Jw Jw -Pf +lo AQ AQ Od @@ -18198,23 +18385,23 @@ dH dH QP dH +qo +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +Qs dH -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -dH -dH -dH +qo NL NL NL @@ -18422,14 +18609,14 @@ Jw Jw Jw Jw -Pf +lo AQ AQ -Pf -Pf -Pf +lo +lo +lo AQ -Pf +lo Jw Jw Jw @@ -18448,31 +18635,31 @@ xd xd xd xd +yj +yj +yj +yj +yj +yj dH dH +qo +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +Qs dH -dH -dH -dH -dH -dH -dH -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -dH -dH -dH +qo NL NL NL @@ -18701,7 +18888,7 @@ AQ AQ AQ AQ -Pf +lo Jw xd xd @@ -18712,25 +18899,25 @@ NL NL NL NL +Qs dH +qo +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +Qs dH -dH -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -dH -dH -dH +qo NL NL NL @@ -18934,10 +19121,10 @@ Jw AQ AQ AQ -Pf +lo Jw Jw -Pf +lo AQ AQ AQ @@ -18946,19 +19133,19 @@ AQ AQ AQ AQ -Pf +lo Jw Jw Jw Jw Jw -Pf +lo AQ AQ AQ AQ AQ -Pf +lo Jw Jw jd @@ -18970,25 +19157,25 @@ NL NL NL NL +Qs dH +qo +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +NL +Qs dH -dH -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -NL -dH -dH -dH +qo NL NL NL @@ -19228,7 +19415,7 @@ NL NL NL NL -dH +Qs ni ni NL @@ -19963,7 +20150,7 @@ Nh jd Jw Jw -Pf +lo AQ AQ AQ @@ -19988,7 +20175,7 @@ AQ AQ AQ AQ -Pf +lo Jw Jw Jw @@ -20488,7 +20675,7 @@ AQ AQ AQ AQ -Pf +lo Jw Jw Jw @@ -20752,7 +20939,7 @@ Jw Jw Jw Jw -Pf +lo AQ AQ AQ @@ -21012,7 +21199,7 @@ Jw Jw Jw Jw -Pf +lo AQ AQ AQ @@ -21051,7 +21238,7 @@ NL NL NL NL -dH +Qs ni ni NL @@ -21309,9 +21496,9 @@ NL NL NL NL +Qs dH -dH -dH +qo NL NL NL @@ -21567,9 +21754,9 @@ NL NL NL NL +Qs dH -dH -dH +qo NL NL NL @@ -22323,6 +22510,19 @@ of of of of +Kk +Kk +Kk +Kk +Kk +Kk +of +of +of +of +of +Kk +Kk of of of @@ -22332,20 +22532,7 @@ of of of of -of -of -of -of -of -of -of -of -of -of -of -of -of -of +az of of jd @@ -22578,6 +22765,9 @@ of of of of +Kk +Kk +Kk of of of @@ -22591,6 +22781,8 @@ of of of of +Kk +Kk of of of @@ -22598,12 +22790,7 @@ of of of of -of -of -of -of -of -of +az of of jd @@ -22848,12 +23035,12 @@ of of of of +az of of of of -of -of +Kk of of of @@ -22861,7 +23048,7 @@ of of of dk -of +az of of jd @@ -23118,7 +23305,7 @@ of of of of -of +az of of of @@ -23353,6 +23540,7 @@ of of of of +az of of of @@ -23368,15 +23556,14 @@ of of of of +az +az +az of of of of -of -of -of -of -of +az of of of @@ -23612,6 +23799,14 @@ of of of of +az +az +of +of +of +of +of +az of of of @@ -23623,18 +23818,10 @@ of of of of +az of of -of -of -of -of -of -of -of -of -of -of +az of of of @@ -23866,19 +24053,19 @@ yu jd of of +Kk of of of of of +az of of of of of -of -of -of +az of of of @@ -23890,7 +24077,7 @@ of of of of -of +az of of of @@ -24124,7 +24311,7 @@ yu jd of of -of +Kk of of of @@ -24136,6 +24323,8 @@ of of of of +az +az of of of @@ -24145,10 +24334,8 @@ of of of of -of -of -of -of +az +az of of of @@ -24382,6 +24569,7 @@ yu jd of of +Kk of of of @@ -24395,6 +24583,7 @@ of of of of +az of of of @@ -24403,9 +24592,7 @@ of of of of -of -of -of +az of of of @@ -24640,7 +24827,7 @@ yu jd of of -of +Kk of of dk @@ -24655,7 +24842,7 @@ of of of of -of +az of of of @@ -24898,6 +25085,24 @@ yu jd of of +Kk +of +of +of +of +of +of +of +of +Kk +of +of +of +of +of +of +az +az of of of @@ -24907,25 +25112,7 @@ of of of of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of +Kk of of jd @@ -25156,6 +25343,17 @@ yu jd of of +Kk +of +of +of +of +Kk +Kk +of +of +of +Kk of of of @@ -25163,27 +25361,16 @@ of of of of +az +az of of of of +Kk of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of +Kk +Kk of of jd @@ -25414,30 +25601,30 @@ yu jd of of +Kk +of +of +of +of +of +Kk +Kk +Kk +of +of +Kk +Kk of of of of of of +az of of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of -of +Kk +Kk of of of @@ -25685,7 +25872,7 @@ of of of of -of +Kk dk of of @@ -25694,7 +25881,7 @@ of of of of -of +Kk of of of @@ -25934,8 +26121,8 @@ of of of of -of -of +az +az Lz of of @@ -26194,11 +26381,11 @@ of of of of -of -of -of -of -of +az +az +az +az +az of of of @@ -26456,23 +26643,23 @@ of of of of +az +az +az +of +of +of +of +Kk +Kk +Kk +Kk of of of of of -of -of -of -of -of -of -of -of -of -of -of -of +az of of of @@ -26705,6 +26892,7 @@ jd of of of +Kk of of of @@ -26719,9 +26907,8 @@ of of of of -of -of -of +Kk +Kk of of Lz @@ -26730,7 +26917,7 @@ of of of of -of +az of of of @@ -26963,6 +27150,7 @@ jd of of of +Kk of of of @@ -26977,17 +27165,16 @@ of of of of +Kk of of of of +az of of of -of -of -of -dk +Yl of of of @@ -27222,7 +27409,7 @@ of of of of -of +Kk of of of @@ -27239,8 +27426,8 @@ of of of of -of -of +az +az of of of @@ -27480,6 +27667,8 @@ of of of of +Kk +Kk of of of @@ -27503,9 +27692,7 @@ of of of of -of -of -of +Kk of of jd @@ -27739,6 +27926,18 @@ of of of of +Kk +Kk +of +of +of +of +of +of +of +az +az +az of of of @@ -27750,20 +27949,8 @@ of of of of -of -of -of -of -of -of -of -of -of -of -of -of -of -of +Kk +Kk of of jd @@ -28003,12 +28190,14 @@ of of of of -of -of +Kk +Kk of of Lz of +az +az of of of @@ -28016,11 +28205,9 @@ of of of of -of -of -of -of -of +Kk +Kk +Kk of of of @@ -28260,6 +28447,8 @@ of of of of +Kk +Kk of of of @@ -28273,9 +28462,7 @@ of of of of -of -of -of +Kk of of of @@ -28516,9 +28703,9 @@ of of of of -of -of -of +Kk +Kk +Kk of of of @@ -32096,9 +32283,9 @@ Nh Nh Nh Nh -Os -Os -Os +Nh +Nh +Nh Nh Nh Nh @@ -32350,17 +32537,17 @@ Nh Nh Nh Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -32583,6 +32770,20 @@ Nh Nh Nh Nh +tX +tX +tX +tX +tX +tX +tX +tX +tX +Nh +Nh +Nh +Nh +Nh Nh tX tX @@ -32591,51 +32792,37 @@ tX tX tX tX -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX Nh Nh Nh @@ -32840,60 +33027,60 @@ Nh Nh Nh Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX +Nh +Nh +Nh +Nh +Nh tX +zm +zm +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm tX -tX -tX -tX -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -33097,61 +33284,61 @@ Nh Nh Nh Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX +Nh +Nh +Nh +Nh tX +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -33354,62 +33541,62 @@ Nh Nh Nh Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX +Nh +Nh +Nh tX +zm +zm +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -33611,63 +33798,63 @@ Nh Nh Nh Nh -Nh -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX Nh Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +tX +zm +zm +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +tX Nh Nh Nh @@ -33868,64 +34055,64 @@ Nh Nh Nh Nh -Nh -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh +tX +zm +zm +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +tX Nh Nh Nh @@ -34125,65 +34312,65 @@ Nh Nh Nh Nh -Nh +tX +tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX tX +Pw +Pw +gy +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -34382,66 +34569,66 @@ Nh Nh Nh Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX +TO +TO +lV +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh Nh Nh Nh @@ -34639,67 +34826,67 @@ Nh Nh Nh Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX +TO +TO +lV +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh Nh Nh Nh @@ -34897,67 +35084,67 @@ Nh Nh Nh Nh -Nh tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +TO +TO +lV +zm +zm +zm tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh Nh Nh Nh @@ -35155,67 +35342,67 @@ Nh Nh Nh Nh -Nh tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +TO +TO +lV +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os wB wB wB @@ -35413,66 +35600,66 @@ Nh Nh Nh Nh -Nh -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX tX Hp -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +TO +TO +lV +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm Os NN NN @@ -35671,66 +35858,66 @@ Nh Nh Nh Nh -Nh tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +oo +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +TO +TO +lV +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm Os NN NN @@ -35929,66 +36116,66 @@ Nh Nh Nh Nh -Nh tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +TO +TO +lV +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm Os NN NN @@ -36187,67 +36374,67 @@ Nh Nh Nh Nh -Nh tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +TO +TO +lV +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os wB wB wB @@ -36445,67 +36632,67 @@ Nh Nh Nh Nh -Nh -Nh tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +TO +TO +lV +zm +zm +zm tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX +ll +zm +zm +DU tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh Nh Nh Nh @@ -36703,67 +36890,67 @@ Nh Nh Nh Nh -Nh -Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX +TO +TO +lV +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm +Jh +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh Nh Nh Nh @@ -36962,66 +37149,66 @@ Nh Nh Nh Nh -Nh -Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX +TO +TO +lV +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh Nh Nh Nh @@ -37221,65 +37408,65 @@ Nh Nh Nh Nh -Nh -Nh -Nh +tX +tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX tX +be +be +dB +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -37480,64 +37667,64 @@ Nh Nh Nh Nh -Nh -Nh -Nh tX tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp tX tX +Nh tX +zm +zm +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -37739,63 +37926,63 @@ Nh Nh Nh Nh -Nh +tX +tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +tX +tX Nh Nh tX +zm +zm +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -tX -tX -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -37998,62 +38185,62 @@ Nh Nh Nh Nh +tG +tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +tX +tG Nh Nh Nh tX +zm +zm +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm +eb +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -tX -tX -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -38257,61 +38444,61 @@ Nh Nh Nh Nh +tX +tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +Hp +tX +tX +Nh Nh Nh Nh tX +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm +zm tX -tX -tX -tX -tX -tX -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Os -Os -Os -Os -Os -Os -Os -Os -Os -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh Nh Nh Nh @@ -38516,60 +38703,60 @@ Nh Nh Nh Nh +tX +tX +Hp +Hp +Hp +Hp +Hp +Hp +Hp +tX +tX Nh Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +tX +zm +zm +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +Wi +zm +zm +zm +zm +tX Nh Nh Nh @@ -38775,59 +38962,59 @@ Nh Nh Nh Nh +tX +tX +tX +tX +tX +tX +tX +tX +tX Nh Nh Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX +tX Nh Nh Nh @@ -49231,7 +49418,7 @@ jz vF vF QI -vF +fD vF jz Xk @@ -49486,11 +49673,11 @@ we we we jz -vF +yQ QI QI QI -vF +vX jz Xk Xk @@ -49744,7 +49931,7 @@ we we lF jz -vF +Yr QI QI QI @@ -50522,7 +50709,7 @@ vF QI QI QI -vF +Sy jz Ik Xk @@ -50776,11 +50963,11 @@ we we we jz -vF +yQ QI QI QI -vF +vX jz Xk Xk @@ -51810,7 +51997,7 @@ gR jz QI QI -QI +vr QI QI jz @@ -52067,9 +52254,9 @@ gR XK jz QI -QI -QI -QI +LW +jz +ce QI jz Cm @@ -52326,7 +52513,7 @@ gR jz QI QI -QI +jM QI QI jz @@ -55938,7 +56125,7 @@ gR jz QI QI -QI +vr QI QI jz @@ -56195,9 +56382,9 @@ gR XK jz QI -QI -QI -QI +LW +jz +ce QI jz Cm @@ -56454,7 +56641,7 @@ gR jz QI QI -QI +jM QI QI jz @@ -57484,11 +57671,11 @@ At At At jz -vF +di QI QI QI -vF +vX jz Hr Hr @@ -59032,11 +59219,11 @@ At At At jz -vF +yQ QI QI QI -vF +DR jz Hr Hr diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm index 1b62574af7..bdab983443 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm @@ -241,7 +241,6 @@ "rad" = 100 ) - //This is a place holder loot list loot_list = list(/obj/item/clothing/suit/armor/alien = 30, /obj/item/clothing/suit/armor/alien/tank = 30, /obj/item/prop/alien/junk = 50, diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm index dc82e21c89..c0746d10e5 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm @@ -258,8 +258,8 @@ /obj/item/shield_projector/rectangle/automatic/orange shield_health = 10 - max_shield_health = 100 - shield_regen_delay = 1 SECONDS + max_shield_health = 10 + shield_regen_delay = 3 SECONDS shield_regen_amount = 10 size_x = 2 size_y = 2 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm index 08ee3bd908..8600a3f7d8 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm @@ -104,23 +104,23 @@ //Spells /obj/item/projectile/energy/homing_bolt/wizard - damage = 10 + damage = 12 /obj/item/projectile/energy/homing_bolt/wizard/fire modifier_type_to_apply = /datum/modifier/wizfire - modifier_duration = 6 SECONDS + modifier_duration = 8 SECONDS /obj/item/projectile/energy/homing_bolt/wizard/lighting modifier_type_to_apply = /datum/modifier/wizfire/lighting - modifier_duration = 6 SECONDS + modifier_duration = 8 SECONDS /obj/item/projectile/energy/homing_bolt/wizard/poison modifier_type_to_apply = /datum/modifier/wizpoison - modifier_duration = 6 SECONDS + modifier_duration = 8 SECONDS /obj/item/projectile/energy/homing_bolt/wizard/frost modifier_type_to_apply = /datum/modifier/wizpoison/frost - modifier_duration = 6 SECONDS + modifier_duration = 8 SECONDS /datum/modifier/wizfire name = "wizfire"