diff --git a/ModularTegustation/Teguicons/32x32.dmi b/ModularTegustation/Teguicons/32x32.dmi index e2473440c847..41dcfe7704b4 100644 Binary files a/ModularTegustation/Teguicons/32x32.dmi and b/ModularTegustation/Teguicons/32x32.dmi differ diff --git a/ModularTegustation/Teguicons/48x64.dmi b/ModularTegustation/Teguicons/48x64.dmi index eea62f4169ea..fab4dbc09044 100644 Binary files a/ModularTegustation/Teguicons/48x64.dmi and b/ModularTegustation/Teguicons/48x64.dmi differ diff --git a/ModularTegustation/tegu_items/associations/cityspawners.dm b/ModularTegustation/tegu_items/associations/cityspawners.dm index 9ee24e96f299..be195bc3bd00 100644 --- a/ModularTegustation/tegu_items/associations/cityspawners.dm +++ b/ModularTegustation/tegu_items/associations/cityspawners.dm @@ -29,3 +29,7 @@ /obj/effect/landmark/syndicatebase name = "syndicate base landmark" icon_state = "x" + +/obj/effect/landmark/distortion + name = "distortion landmark" + icon_state = "x" diff --git a/ModularTegustation/tegu_items/associations/machines.dm b/ModularTegustation/tegu_items/associations/machines.dm index 344a30a0e699..e061112ce72b 100644 --- a/ModularTegustation/tegu_items/associations/machines.dm +++ b/ModularTegustation/tegu_items/associations/machines.dm @@ -144,8 +144,6 @@ if(spawntype) new spawntype (get_turf(src)) qdel(I) - if(prob(5)) - new /obj/structure/lootcrate/tres (get_turf(src)) return TRUE /obj/structure/potential diff --git a/_maps/map_files/Event/city.dmm b/_maps/map_files/Event/city.dmm index cd5c8a01c340..7748d1896f10 100644 --- a/_maps/map_files/Event/city.dmm +++ b/_maps/map_files/Event/city.dmm @@ -3,9 +3,6 @@ /obj/effect/spawner/room/backstreets/large_north, /turf/closed/indestructible/reinforced, /area/city/backstreets_room) -"af" = ( -/turf/open/floor/plating/dirt/jungle/dark, -/area/city/backstreets_room) "ag" = ( /obj/effect/spawner/room/backstreets/small_north, /turf/closed/indestructible/reinforced, @@ -315,12 +312,6 @@ }, /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) -"cr" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_checkpoint) "cw" = ( /obj/machinery/vending/hana, /turf/open/floor/facility/white, @@ -372,6 +363,10 @@ /obj/machinery/vending/cola, /turf/open/floor/plating/ashplanet/rocky, /area/city) +"cV" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating/airless, +/area/city/shop) "cX" = ( /obj/structure/statue/sandstone/venus{ anchored = 1; @@ -408,6 +403,10 @@ /mob/living/simple_animal/bot/cleanbot, /turf/open/floor/plating/ashplanet/rocky, /area/city) +"dl" = ( +/obj/effect/landmark/distortion, +/turf/open/floor/plating/asteroid/basalt, +/area/city/backstreets_alley) "dp" = ( /obj/effect/landmark/latejoin, /turf/open/floor/plating/ashplanet/rocky, @@ -549,12 +548,6 @@ /obj/item/kitchen/rollingpin, /turf/open/floor/mineral/silver, /area/city/shop) -"es" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 1 - }, -/turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_checkpoint) "ev" = ( /obj/effect/turf_decal/weather/dirt{ dir = 3 @@ -594,6 +587,10 @@ /obj/machinery/vending/donksofttoyvendor, /turf/open/floor/plating/ashplanet/rocky, /area/city/house) +"fd" = ( +/obj/structure/itemselling, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_checkpoint) "fe" = ( /obj/structure/rack, /obj/machinery/light{ @@ -660,15 +657,6 @@ }, /turf/open/floor/plating/asteroid/basalt, /area/city/backstreets_checkpoint) -"fH" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 9 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_checkpoint) "fI" = ( /obj/effect/spawner/room/backstreets/medium_west, /turf/closed/indestructible/reinforced, @@ -863,25 +851,6 @@ }, /turf/open/floor/wood, /area/city/backstreets_checkpoint) -"hB" = ( -/obj/effect/turf_decal/tile/blue{ - color = "#3234B9"; - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - color = "#3234B9"; - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - color = "#3234B9" - }, -/obj/effect/turf_decal/tile/blue{ - color = "#3234B9"; - dir = 8 - }, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/mineral/silver, -/area/city/shop) "hC" = ( /turf/open/floor/plating/dirt/jungle/dark, /area/city/backstreets_alley) @@ -1150,6 +1119,11 @@ /obj/machinery/light, /turf/open/floor/facility/white, /area/city/fixers) +"jG" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/plasteel/checker, +/area/city/house) "jI" = ( /obj/structure/table/reinforced, /turf/open/floor/mineral/titanium, @@ -1364,11 +1338,6 @@ /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"mh" = ( -/obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/plasteel/checker, -/area/city/house) "mi" = ( /obj/machinery/light{ dir = 1 @@ -1423,6 +1392,9 @@ /obj/item/toy/plush/beeplushie, /turf/open/floor/facility/dark, /area/city) +"nk" = ( +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "nl" = ( /obj/effect/turf_decal/tile/blue{ color = "#3234B9"; @@ -1479,6 +1451,11 @@ /obj/structure/table, /turf/open/floor/wood, /area/city/house) +"nB" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/wood, +/area/city/house) "nI" = ( /obj/structure/bed/maint, /obj/effect/decal/cleanable/dirt, @@ -1663,15 +1640,6 @@ }, /turf/open/indestructible/white, /area/city/shop) -"qf" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 5 - }, -/turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_checkpoint) "qh" = ( /obj/effect/turf_decal/tile/blue{ color = "#3234B9"; @@ -1718,6 +1686,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/city/shop) +"qJ" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "qM" = ( /obj/structure/table/wood, /obj/item/food/breadslice/moldy, @@ -1780,10 +1757,24 @@ }, /turf/open/indestructible/hoteltile, /area/city/house) +"rq" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/vault, +/area/city/house) "ru" = ( /obj/effect/spawner/randomsnackvend, /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_checkpoint) +"rE" = ( +/obj/structure/table/wood, +/obj/item/candle{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/carpet/black, +/area/city/house) "rG" = ( /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/facility/white, @@ -1869,20 +1860,6 @@ /obj/machinery/telecomms/receiver/preset_left, /turf/open/floor/circuit/telecomms/mainframe, /area/facility_hallway/north) -"so" = ( -/obj/structure/table/reinforced, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/indestructible/hoteltile, -/area/city/house) -"sp" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 10 - }, -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_checkpoint) "sy" = ( /obj/structure/fence, /turf/open/floor/plating/ashplanet/rocky, @@ -1926,14 +1903,15 @@ /obj/machinery/griddle, /turf/open/indestructible/hoteltile, /area/city/house) +"sZ" = ( +/obj/structure/filingcabinet, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "td" = ( /obj/effect/mine/shrapnel, /obj/effect/decal/cleanable/dirt, /turf/open/floor/facility/dark, /area/city) -"ti" = ( -/turf/open/floor/plating/dirt/jungle/dark, -/area/city/backstreets_checkpoint) "tk" = ( /obj/machinery/pdapainter, /obj/machinery/light{ @@ -1961,7 +1939,7 @@ /area/city/house) "tx" = ( /obj/machinery/door/airlock/grunge{ - name = "fixer office" + name = "hana auxiliary office" }, /turf/open/floor/wood, /area/city/shop) @@ -2481,6 +2459,9 @@ }, /turf/open/floor/mineral/titanium, /area/city/house) +"xl" = ( +/turf/open/water/deep/saltwater, +/area/city) "xq" = ( /obj/structure/mineral_door/wood, /turf/open/floor/carpet/donk, @@ -2967,6 +2948,10 @@ /obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/mineral/titanium, /area/city/house) +"AI" = ( +/obj/machinery/light, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "AJ" = ( /obj/structure/mineral_door/wood, /turf/open/floor/mineral/titanium, @@ -3031,11 +3016,6 @@ /obj/item/fish_feed, /turf/open/floor/wood, /area/city/house) -"Bh" = ( -/obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/plasteel/grimy, -/area/city/house) "Bl" = ( /mob/living/simple_animal/hostile/ordeal/green_bot_big{ name = "gun bot" @@ -3332,6 +3312,10 @@ }, /turf/open/floor/facility/dark, /area/city) +"CY" = ( +/obj/structure/potential, +/turf/open/floor/plating/ashplanet/rocky, +/area/city/backstreets_checkpoint) "Da" = ( /obj/structure/sign/poster/contraband/red_rum, /turf/closed/indestructible/reinforced, @@ -3499,6 +3483,10 @@ }, /turf/open/floor/plasteel, /area/city/shop) +"Ex" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "Ez" = ( /turf/open/floor/plasteel/checker, /area/city/house) @@ -3554,6 +3542,29 @@ /obj/structure/chair/wood, /turf/open/floor/wood, /area/city/house) +"EN" = ( +/obj/effect/turf_decal/tile/blue{ + color = "#3234B9"; + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + color = "#3234B9"; + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + color = "#3234B9" + }, +/obj/effect/turf_decal/tile/blue{ + color = "#3234B9"; + dir = 8 + }, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/mineral/silver, +/area/city/shop) +"EP" = ( +/obj/effect/landmark/distortion, +/turf/open/floor/plating/ashplanet/rocky, +/area/city) "ES" = ( /obj/machinery/door/airlock/grunge{ name = "hydroponics"; @@ -3612,15 +3623,6 @@ }, /turf/open/floor/plasteel, /area/city/shop) -"Fv" = ( -/obj/structure/table/wood, -/obj/item/candle{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/carpet/black, -/area/city/house) "FC" = ( /obj/structure/bed, /obj/item/bedsheet/rd{ @@ -3678,12 +3680,6 @@ }, /turf/open/floor/wood, /area/city/shop) -"Gl" = ( -/obj/effect/turf_decal/weather/dirt{ - dir = 6 - }, -/turf/open/floor/plating/ashplanet/rocky, -/area/city/backstreets_checkpoint) "Gm" = ( /obj/effect/turf_decal/weather/dirt{ dir = 8 @@ -3760,10 +3756,6 @@ }, /turf/open/floor/plating/ashplanet/rocky, /area/city/backstreets_checkpoint) -"GH" = ( -/obj/effect/spawner/lootdrop/garbage_spawner, -/turf/open/floor/plating/dirt/jungle/dark, -/area/city/backstreets_checkpoint) "GI" = ( /obj/effect/decal/cleanable/dirt, /obj/item/reagent_containers/hypospray/medipen/salacid, @@ -3905,12 +3897,6 @@ /obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/city/house) -"Ht" = ( -/obj/structure/rack, -/obj/item/ego_weapon/city/ncorp_nail/big, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood, -/area/city) "HA" = ( /turf/closed/indestructible/reinforced, /area/city/fixers) @@ -4274,17 +4260,18 @@ }, /turf/open/floor/wood, /area/city/shop) +"Lh" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "Li" = ( /obj/structure/rack, /obj/item/ego_weapon/city/rats, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/city) -"Lk" = ( -/obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/vault, -/area/city/house) "Ln" = ( /obj/structure/chair/wood{ dir = 1 @@ -4380,15 +4367,6 @@ }, /turf/open/floor/carpet/black, /area/city/fixers) -"Me" = ( -/obj/effect/light_emitter{ - light_power = 4; - light_range = 25; - set_cap = 3; - set_luminosity = 24 - }, -/turf/open/water/deep/freshwater, -/area/city) "Mj" = ( /obj/machinery/light{ dir = 4 @@ -4499,6 +4477,19 @@ /obj/effect/spawner/lootdrop/garbage_spawner, /turf/open/floor/wood, /area/city) +"Nq" = ( +/obj/machinery/door/airlock/wood{ + name = "Hana backstreet access"; + req_access_txt = "20" + }, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) +"Ns" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "Nt" = ( /obj/item/toy/plush/bongbong, /obj/structure/rack, @@ -4620,6 +4611,11 @@ }, /turf/open/floor/facility/white, /area/city/fixers) +"Pk" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/plasteel/grimy, +/area/city/house) "Pt" = ( /obj/effect/turf_decal/box, /obj/effect/landmark/fixerbase, @@ -4737,11 +4733,6 @@ /obj/effect/landmark/cityloot, /turf/open/floor/wood, /area/city) -"QY" = ( -/obj/structure/table/reinforced, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/oldshuttle, -/area/city/house) "QZ" = ( /obj/machinery/telecomms/server/presets/science, /obj/effect/turf_decal/bot, @@ -4754,6 +4745,11 @@ "Rh" = ( /turf/closed/wall/bathhouse, /area/city) +"Rm" = ( +/obj/structure/table/reinforced, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/indestructible/hoteltile, +/area/city/house) "Rp" = ( /obj/structure/closet/crate, /obj/item/storage/firstaid/revival, @@ -4875,11 +4871,6 @@ /mob/living/simple_animal/mouse, /turf/open/floor/plating/ashplanet/rocky, /area/city) -"SZ" = ( -/obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/fixer, -/turf/open/floor/wood, -/area/city/house) "Ta" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -4901,9 +4892,10 @@ /area/city/fixers) "Tm" = ( /obj/machinery/door/airlock/wood{ - name = "Backstreets access" + name = "Hana backstreet access"; + req_access_txt = "20" }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/facility/white, /area/city/shop) "Tr" = ( /turf/open/floor/plasteel/showroomfloor, @@ -5284,6 +5276,15 @@ }, /turf/open/floor/wood, /area/city/fixers) +"Xy" = ( +/obj/effect/light_emitter{ + light_power = 4; + light_range = 25; + set_cap = 3; + set_luminosity = 24 + }, +/turf/open/water/deep/saltwater, +/area/city) "Xz" = ( /obj/structure/fluff/bus/dense{ icon_state = "hoodtop" @@ -5318,6 +5319,11 @@ }, /turf/open/floor/plating/grass, /area/city) +"XU" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/bin, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) "XZ" = ( /mob/living/simple_animal/mouse, /turf/open/floor/plating/ashplanet/rocky, @@ -5408,6 +5414,11 @@ "YC" = ( /turf/open/water/deep/freshwater, /area/city) +"YI" = ( +/obj/structure/table/reinforced, +/obj/item/modular_computer/laptop/preset/fixer, +/turf/open/floor/oldshuttle, +/area/city/house) "YJ" = ( /obj/structure/rack, /obj/item/weldingtool/mini, @@ -5481,6 +5492,10 @@ }, /turf/open/floor/carpet/black, /area/city/fixers) +"ZP" = ( +/obj/machinery/vending/fixer, +/turf/closed/indestructible/reinforced, +/area/city/backstreets_checkpoint) "ZQ" = ( /obj/machinery/vending/coffee, /obj/machinery/light, @@ -5490,6 +5505,22 @@ /obj/structure/fluff/bus/dense, /turf/open/floor/wood, /area/city/shop) +"ZY" = ( +/obj/structure/table, +/obj/machinery/button/door/indestructible{ + id = "outskirtslockdown"; + name = "Outskirts Lockdown Button"; + pixel_y = 7; + req_access_txt = "20" + }, +/obj/machinery/button/door/indestructible{ + id = "citycheckpoint"; + name = "Outskirts - Facility Checkpoint Button"; + pixel_y = -3; + req_access_txt = "20" + }, +/turf/open/floor/facility/white, +/area/city/backstreets_checkpoint) (1,1,1) = {" XK @@ -15827,13 +15858,13 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk +kk +kk +kk Oq Oq Oq @@ -16084,13 +16115,13 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -16339,15 +16370,15 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -16596,15 +16627,15 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +dl +pO +pO +kk Oq Oq Oq @@ -16852,16 +16883,16 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +pO +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -17109,16 +17140,16 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -17366,10 +17397,10 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq +kk +pO +kk +kk kk kk kk @@ -17623,9 +17654,9 @@ Oq Oq Oq Oq -Oq -Oq -Oq +kk +pO +kk Oq kk pO @@ -17880,9 +17911,9 @@ Oq Oq Oq Oq -Oq -Oq -Oq +kk +pO +kk Oq kk pO @@ -18137,9 +18168,9 @@ Oq Oq Oq Oq -Oq -Oq -Oq +kk +pO +kk Oq kk pO @@ -18394,9 +18425,9 @@ Oq Oq Oq Oq -Oq -Oq -Oq +kk +pO +kk Oq kk pO @@ -18651,10 +18682,10 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq +kk +pO +kk +kk kk pO pO @@ -18908,14 +18939,14 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq kk pO pO pO +pO +pO +pO +pO kk Oq Oq @@ -19165,10 +19196,10 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk kk pO pO @@ -22787,7 +22818,7 @@ kk kk kk kk -kk +pO kk kk kk @@ -23043,11 +23074,11 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +kk Oq Oq Oq @@ -23300,11 +23331,11 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +pO +kk Oq Oq Oq @@ -23553,15 +23584,15 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk +kk +kk +kk +pO +kk Oq Oq Oq @@ -23810,15 +23841,15 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk +pO +kk Oq Oq Oq @@ -24057,64 +24088,64 @@ pO pO pO kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -hC -hC -hC -kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +kk +pO +pO +pO +pO +pO +kk +pO +kk +Oq +Oq +Oq +Oq +Oq +Oq +XQ +XQ +XQ +XQ +XQ +XQ +XQ +XQ +hC +hC +hC +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq @@ -24324,15 +24355,15 @@ kk kk kk kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +dl +pO +pO +pO +pO +kk Oq Oq Oq @@ -24581,15 +24612,15 @@ TP TP ZD kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk +kk +kk Oq Oq Oq @@ -24838,13 +24869,13 @@ pO pO ZD kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -25095,13 +25126,13 @@ pO pO ZD kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk +kk +kk +kk Oq Oq Oq @@ -29027,18 +29058,18 @@ Oq Oq zr zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl zr zr zr @@ -29283,26 +29314,26 @@ zr zr zr zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl zr Oq Oq @@ -29528,38 +29559,38 @@ WX Rf WX zr -YC -YC -YC -YC -YC -Me -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +Xy +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl zr zr zr @@ -29785,45 +29816,45 @@ WX ha zr zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl zr Oq Oq @@ -30041,46 +30072,46 @@ zr zr zr zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl zr zr zr @@ -30295,52 +30326,52 @@ zr zr Hm zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl zr Oq Oq @@ -30552,52 +30583,52 @@ CX zr Hm zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl zr zr zr @@ -30809,52 +30840,52 @@ uK zr Hm zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl Sg Yy Yy @@ -31066,52 +31097,52 @@ WX zr Hm zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -zr -zr -zr -zr -zr -zr -zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +zr +zr +zr +zr +zr +zr +zr +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl Sg Yy Yy @@ -31323,15 +31354,15 @@ WX zr SP zr -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl zr CF Hm @@ -31339,36 +31370,36 @@ Hm Hm Hm zr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl Sg Yy Yy @@ -31596,36 +31627,36 @@ Hm zr Hm zr -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl Xr Xr Xr Xr Xr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl Sg Yy Yy @@ -31873,16 +31904,16 @@ Xr Xr Xr Xr -YC -YC -YC -YC -YC -YC -YC -YC -YC -YC +xl +xl +xl +xl +xl +xl +xl +xl +xl +xl Sg Yy Yy @@ -35967,7 +35998,7 @@ dh Hm Hm Hm -Hm +EP Hm Hm Hm @@ -36758,7 +36789,7 @@ Dq TX Dq Ks -Lk +rq zV AC AC @@ -38534,7 +38565,7 @@ Wv wP yq Al -Bh +Pk EK Hm Hm @@ -38658,7 +38689,7 @@ hC hC hC hC -af +hC XQ XQ XQ @@ -38915,7 +38946,7 @@ kk kk kk kk -XQ +kk XQ XQ XQ @@ -41344,7 +41375,7 @@ Hm Hm Hm Dq -mh +jG lR Eg Dq @@ -42356,11 +42387,11 @@ kk kk Ot Ot -Ot -Ot -Ot -Ot -Ot +fd +us +us +us +us HA HA HA @@ -42612,12 +42643,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +Ot +CY +us +us +us +us HA CB Xf @@ -42834,263 +42865,235 @@ Oq Oq Oq Oq -ee -uI -pO -ZD -kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -HA -Xf -Xf -Xf -Xf -Xf -HA -Hm -JG -Hm -Rt -Hm -Hm -Hm -Hm -Hm -Hm -Hm -Hm -Hm -Hm -Dq -Dq -Dq -Dq -Dq -YN -YN -qS -Dq -Hm -zS -Hm -zr -Hm -Dq -Dq -HA -HA -HA -HA -HA -HA -HA -Hm -Hm -Hm -Dq -Dq -HA -HA -HA -HA -HA -HA -HA -Hm -Hm -Hm -zr -zr -zr -zr -Wk -Wk -Wk -Wk -Wk -Wk -Wk -Wk -zr -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -"} -(147,1,1) = {" -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -Ji -pO -ZD -kk -kk -kk -kk -kk -kk -kk -kk -XQ -XQ -XQ -XQ -XQ -XQ -XQ -hC -hC -kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -kk -Ji -pO -ZD -kk -Oq -Oq -kk -hC -hC -kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +ee +uI +pO +ZD +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Ot +yE +kQ +Dy +ZP +Nq +HA +Xf +Xf +Xf +Xf +Xf +HA +Hm +JG +Hm +Rt +Hm +Hm +Hm +Hm +Hm +Hm +Hm +Hm +Hm +Hm +Dq +Dq +Dq +Dq +Dq +YN +YN +qS +Dq +Hm +zS +Hm +zr +Hm +Dq +Dq +HA +HA +HA +HA +HA +HA +HA +Hm +Hm +Hm +Dq +Dq +HA +HA +HA +HA +HA +HA +HA +Hm +Hm +Hm +zr +zr +zr +zr +Wk +Wk +Wk +Wk +Wk +Wk +Wk +Wk +zr +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +"} +(147,1,1) = {" +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +XQ +XQ +XQ +XQ +XQ +XQ +XQ +XQ +Ji +pO +ZD +kk +kk +kk +kk +kk +kk +kk +kk +XQ +XQ +XQ +XQ +XQ +XQ +XQ +hC +hC +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq kk Ji pO @@ -43098,12 +43101,33 @@ ZD kk Oq Oq +kk +hC +hC +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq Oq Oq Oq Oq +kk +Ji +pO +ZD +kk +Oq Oq Oq Oq @@ -43132,6 +43156,13 @@ Oq Oq Oq Oq +Oq +Ot +ZY +Ns +nk +nk +nk HA Xf Xf @@ -43171,7 +43202,7 @@ Dq TX Dq Fn -Fv +rE Ej WL WL @@ -43383,12 +43414,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +Ot +qJ +nk +nk +nk +AI HA Xf Xf @@ -43640,12 +43671,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +Ot +Ex +sZ +XU +nk +nk HA CB Xf @@ -43866,13 +43897,7 @@ kk Ji pO ZD -Cx -Oq -Oq -Oq -Oq -Oq -Oq +kk Oq Oq Oq @@ -43903,6 +43928,12 @@ Oq Oq Oq Oq +Ot +Ot +Ot +Ot +Lh +nk HA HA HA @@ -44124,42 +44155,42 @@ pO pO pO kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot +nk +AI OT gF Gb @@ -44208,7 +44239,7 @@ Hm Hm Hm Dq -so +Rm Ff Vb Vb @@ -44380,44 +44411,44 @@ pO pO pO pO -pO -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -fH -cr -Gl -ti -fH -ti -fH -ti -fH -cr -Gl -ti -fH -ti -ti -ti -OT +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Ot +nk +nk +cV lk lk lk @@ -44554,126 +44585,126 @@ Oq Oq Oq Oq -"} -(153,1,1) = {" -Oq -Oq -Oq -Oq -Oq -Oq -Oq +"} +(153,1,1) = {" +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +XQ +XQ +XQ +XQ +XQ +XQ +XQ +XQ +Ji +pO +ZD +kk +Oq +Oq +Oq +Oq +kk +hC +hC +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +kk +Ji +pO +pO +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +fq +VR +VR +VR +VR +VR +pO +pO +pO +pO +pO +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq Oq Oq -Oq -Oq -Oq -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -Ji -pO -ZD -kk -Oq -Oq -Oq -Oq -kk -hC -hC -kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -kk -Ji -pO -pO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -fq -VR -VR -VR -VR -VR -pO -pO -pO -pO -pO -pO -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -es -ti -ti -ti -es -sp -es -sp -es -ti -ti -ti -es -sp -ti -ti +Ot +Lh +nk Tm lk lk @@ -44894,43 +44925,43 @@ pO pO pO ZD -pO -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -po -qf -ti -ti -ti -qf -GH -qf -GH -qf -ti -ti -ti -qf -GH -ti -ti +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Ot +Ot +Ot OT lk lk @@ -45152,42 +45183,42 @@ VR VR gc kk -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot -Ot +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq OT aL lk @@ -46009,7 +46040,7 @@ Hm Hm cS Dq -QY +YI dC Dq Zl @@ -46738,7 +46769,7 @@ Gb Ln Zt Hm -Hm +EP Hm Hm gZ @@ -47044,7 +47075,7 @@ Hm Hm Hm Hm -Hm +EP Hm zr Oq @@ -47811,7 +47842,7 @@ Dq TX Dq EM -SZ +nB mc YN YN @@ -49087,7 +49118,7 @@ HA HA kJ OQ -hB +EN PL Gz OT @@ -50512,10 +50543,10 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk kk Ji pO @@ -50769,11 +50800,11 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq kk +pO +pO +pO +pO Ji pO ZD @@ -51022,14 +51053,14 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk +kk +pO +kk +kk kk uI pO @@ -51279,13 +51310,13 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk Oq kk Ji @@ -51536,13 +51567,13 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +kk +kk +kk +kk +kk Oq kk Ji @@ -51793,9 +51824,9 @@ Oq Oq Oq Oq -Oq -Oq -Oq +kk +pO +kk Oq Oq Oq @@ -52050,14 +52081,14 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +kk +kk +kk +kk +kk +kk kk Ji pO @@ -52307,14 +52338,14 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +kk +pO +pO +pO +pO +pO kk Ji pO @@ -52564,14 +52595,14 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +kk +pO +pO +pO +pO +pO kk uI pO @@ -52821,14 +52852,14 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +dl +pO +pO kk Ji pO @@ -52917,7 +52948,7 @@ Oq zr ri XF -Ht +RA vf bi Yw @@ -53078,14 +53109,14 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +pO +pO +pO +pO +pO kk Ji pO @@ -53337,12 +53368,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO kk uI pO @@ -53594,12 +53625,12 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk +kk +kk kk Ji pO @@ -61723,116 +61754,116 @@ Oq Oq Oq Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -"} -(220,1,1) = {" -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -XQ -XQ -XQ -XQ -XQ -XQ -XQ -XQ -hC -hC -kk -kk -kk -kk -kk -kk -kk -kk -kk -kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +"} +(220,1,1) = {" +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +XQ +XQ +XQ +XQ +XQ +XQ +XQ +XQ +hC +hC +kk +kk +kk +kk +kk +kk +kk +kk +kk +kk +Oq +Oq +kk +kk +kk +kk +kk +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq +Oq XQ XQ XQ @@ -62070,11 +62101,11 @@ hC kk kk Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +kk Oq Oq Oq @@ -62327,11 +62358,11 @@ hC hC kk Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +kk +pO +kk Oq Oq Oq @@ -62583,12 +62614,12 @@ hC hC hC kk -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +pO +kk +pO +kk Oq Oq Oq @@ -62839,13 +62870,13 @@ kk kk hC hC +pO +pO +pO +pO +kk +pO kk -Oq -Oq -Oq -Oq -Oq -Oq Oq Oq Oq @@ -63096,15 +63127,15 @@ Oq kk hC Yj -tV -Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk +kk +pO +kk +kk +kk Oq Oq Oq @@ -63355,13 +63386,13 @@ hC hC kk Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -63612,13 +63643,13 @@ hC hC kk Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -63867,15 +63898,15 @@ Oq kk hC hC -kk -Oq -Oq -Oq -Oq -Oq -Oq -Oq +tV Oq +kk +pO +pO +dl +pO +pO +kk Oq Oq Oq @@ -64126,13 +64157,13 @@ hC hC kk Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -64383,13 +64414,13 @@ hC hC kk Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +pO +pO +pO +pO +pO +kk Oq Oq Oq @@ -64640,13 +64671,13 @@ hC hC kk Oq -Oq -Oq -Oq -Oq -Oq -Oq -Oq +kk +kk +kk +kk +kk +kk +kk Oq Oq Oq diff --git a/code/controllers/subsystem/city_events.dm b/code/controllers/subsystem/city_events.dm index b949a1468e27..432c6943c93d 100644 --- a/code/controllers/subsystem/city_events.dm +++ b/code/controllers/subsystem/city_events.dm @@ -5,6 +5,7 @@ SUBSYSTEM_DEF(cityevents) flags = SS_NO_TICK_CHECK | SS_NO_FIRE var/list/spawners = list() var/list/itemdrops = list() + var/list/distortion = list() var/list/lights = list() var/daystatus = TRUE //True to darken lights, false to lighten them var/globalillumination = 1 @@ -14,7 +15,6 @@ SUBSYSTEM_DEF(cityevents) var/ordeal_events = list("sweepers", "scouts", "bots") var/neutral_events = list("swag") var/list/generated = list() //Which ckeys have generated stats - var/failrate = 70 //On hybrid maps, fail 70% of the time, Fires roughtly every 15 minutes, This just adds some RNG. var/wavetime //How many waves have spawned? each wave increases the # of enemies by about 5%. One wave is every 5 minutes /datum/controller/subsystem/cityevents/Initialize(timeofday) @@ -25,6 +25,7 @@ SUBSYSTEM_DEF(cityevents) if(!can_fire) return addtimer(CALLBACK(src, .proc/Event), 15 MINUTES) //Start doing events in 15 minutes + addtimer(CALLBACK(src, .proc/Distort), 20 MINUTES) //Distortions start in 20 addtimer(CALLBACK(src, .proc/Daynight), 10 SECONDS) ///Ran on initialize, slap these puppies in a new list. @@ -37,6 +38,9 @@ SUBSYSTEM_DEF(cityevents) for(var/obj/effect/landmark/cityloot/landmark in GLOB.landmarks_list) itemdrops+= landmark + for(var/obj/effect/landmark/distortion/landmark in GLOB.landmarks_list) + distortion+= landmark + ///Ran on initialize, Initialize the cuustom event systems. //Pretty Much we want a small amount of Good, bad and neutral events. @@ -53,14 +57,10 @@ SUBSYSTEM_DEF(cityevents) total_events += pick(neutral_events) total_events += pick(neutral_events) total_events += pick("money") //Always get money - if(SSmaptype.maptype == "city") - failrate = 30 //Events /datum/controller/subsystem/cityevents/proc/Event() addtimer(CALLBACK(src, .proc/Event), 5 MINUTES) - if(prob(failrate)) - return var/chosen_event = pick(total_events) if(wavetime == 10 && wavetime !=0) //after 50 minutes Boss() @@ -126,6 +126,16 @@ SUBSYSTEM_DEF(cityevents) sleep(10) new /mob/living/simple_animal/hostile/ordeal/indigo_dusk/red (get_turf(T)) +//Distortions +/datum/controller/subsystem/cityevents/proc/Distort() + minor_announce("DANGER: Distortion located in the backstreets. Hana has issued a suppression order.", "Local Activity Alert:", TRUE) + var/T = pick(distortion) + new /obj/effect/bloodpool(get_turf(T)) + sleep(10) + var/spawning = pick(subtypesof(/mob/living/simple_animal/hostile/distortion)) + new spawning (get_turf(T)) + addtimer(CALLBACK(src, .proc/Distort), 20 MINUTES) + //Daynight stuff /datum/controller/subsystem/cityevents/proc/Daynight() for(var/obj/effect/light_emitter/L in lights) diff --git a/code/modules/mob/living/simple_animal/distortion/nightmare/black_hole_sun.dm b/code/modules/mob/living/simple_animal/distortion/nightmare/black_hole_sun.dm new file mode 100644 index 000000000000..14e579b52eed --- /dev/null +++ b/code/modules/mob/living/simple_animal/distortion/nightmare/black_hole_sun.dm @@ -0,0 +1,73 @@ +//Coded by Kirie! +//Loosely based off LOR13's Lantern Office, and sprited by the same. +/mob/living/simple_animal/hostile/distortion/lantern + name = "Misguiding Light" + desc = "A figure holding a lantern, his light is blinding." + icon = 'ModularTegustation/Teguicons/32x32.dmi' + icon_state = "lantern" + maxHealth = 2000 //low health, has AOE blindness + health = 2000 + fear_level = ALEPH_LEVEL + move_to_delay = 3 + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 0.5, BLACK_DAMAGE = 0.5, PALE_DAMAGE = 0.5) + melee_damage_lower = 25 + melee_damage_upper = 30 + melee_damage_type = BLACK_DAMAGE + armortype = BLACK_DAMAGE + stat_attack = HARD_CRIT + attack_sound = 'sound/weapons/ego/axe2.ogg' + attack_verb_continuous = "bashes" + attack_verb_simple = "bash" + +//Variables important for distortions + //The EGO worn by the egoist + ego_list = list( + /obj/item/ego_weapon/lamp, + /obj/item/clothing/suit/armor/ego_gear/waw/lamp + ) + egoist_outfit = /datum/outfit/job/civilian + egoist_attributes = 80 + loot = list(/obj/item/documents/ncorporation, /obj/item/documents/ncorporation) //Placeholder, we need more loot items + unmanifest_effect = /obj/effect/gibspawner/human + light_color = COLOR_YELLOW + light_range = 5 + light_power = 7 + + +//Proc that can be used for additional effects on unmanifest +/mob/living/simple_animal/hostile/distortion/lantern/PostUnmanifest(mob/living/carbon/human/egoist) + playsound(src, 'sound/effects/blobattack.ogg', 150, FALSE, 4) + for(var/turf/TF in orange(2, get_turf(src))) //spawns blood effects + if(TF.density) + continue + var/obj/effect/decal/cleanable/blood/B = new(TF) + B.bloodiness = 100 + return + +//Unmanifesting is not linked to any proc by default, if you want it to happen during gameplay, it must be called manually. +/mob/living/simple_animal/hostile/distortion/lantern/attacked_by(obj/item/I, mob/living/user) + . = ..() + if(istype(I, /obj/item/food/grown/carrot)) + qdel(I) + say("That's all I ever wanted!") + can_act = FALSE + addtimer(CALLBACK(src,.proc/Unmanifest),3 SECONDS) + + +/mob/living/simple_animal/hostile/distortion/lantern/AttackingTarget() + ..() + if(prob(70)) + return + for(var/mob/living/carbon/C in view(8, src)) + if(faction_check_mob(C, FALSE)) + continue + if(!CanAttack(C)) + continue + C.blur_eyes(5) + addtimer(CALLBACK (C, .mob/proc/blind_eyes, 2), 2 SECONDS) + var/new_overlay = mutable_appearance('ModularTegustation/Teguicons/tegu_effects.dmi', "enchanted", -HALO_LAYER) + C.add_overlay(new_overlay) + addtimer(CALLBACK (C, .atom/proc/cut_overlay, new_overlay), 4 SECONDS) + + + diff --git a/code/modules/mob/living/simple_animal/distortion/plague/lantern.dm b/code/modules/mob/living/simple_animal/distortion/plague/lantern.dm new file mode 100644 index 000000000000..01be44119e5c --- /dev/null +++ b/code/modules/mob/living/simple_animal/distortion/plague/lantern.dm @@ -0,0 +1,73 @@ +//Coded by Kirie!, sprited by stcopycat "Roman" +//Loosely based off LOR13's Lantern Office, and sprited by the same. +/mob/living/simple_animal/hostile/distortion/lantern + name = "Misguiding Light" + desc = "A figure holding a lantern, his light is blinding." + icon = 'ModularTegustation/Teguicons/32x32.dmi' + icon_state = "lantern" + maxHealth = 2000 //low health, has AOE blindness + health = 2000 + fear_level = WAW_LEVEL + move_to_delay = 3 + damage_coeff = list(BRUTE = 1, RED_DAMAGE = 1, WHITE_DAMAGE = 0.5, BLACK_DAMAGE = 0.5, PALE_DAMAGE = 1.5) + melee_damage_lower = 25 + melee_damage_upper = 30 + melee_damage_type = BLACK_DAMAGE + armortype = BLACK_DAMAGE + stat_attack = HARD_CRIT + attack_sound = 'sound/weapons/ego/axe2.ogg' + attack_verb_continuous = "bashes" + attack_verb_simple = "bash" + +//Variables important for distortions + //The EGO worn by the egoist + ego_list = list( + /obj/item/ego_weapon/lamp, + /obj/item/clothing/suit/armor/ego_gear/waw/lamp + ) + egoist_outfit = /datum/outfit/job/civilian + egoist_attributes = 80 + loot = list(/obj/item/documents/ncorporation, /obj/item/documents/ncorporation) //Placeholder, we need more loot items + unmanifest_effect = /obj/effect/gibspawner/human + light_color = COLOR_YELLOW + light_range = 5 + light_power = 7 + + +//Proc that can be used for additional effects on unmanifest +/mob/living/simple_animal/hostile/distortion/lantern/PostUnmanifest(mob/living/carbon/human/egoist) + playsound(src, 'sound/effects/blobattack.ogg', 150, FALSE, 4) + for(var/turf/TF in orange(2, get_turf(src))) //spawns blood effects + if(TF.density) + continue + var/obj/effect/decal/cleanable/blood/B = new(TF) + B.bloodiness = 100 + return + +//Unmanifesting is not linked to any proc by default, if you want it to happen during gameplay, it must be called manually. +/mob/living/simple_animal/hostile/distortion/lantern/attacked_by(obj/item/I, mob/living/user) + . = ..() + if(istype(I, /obj/item/food/grown/carrot)) + qdel(I) + say("That's all I ever wanted!") + can_act = FALSE + addtimer(CALLBACK(src,.proc/Unmanifest),3 SECONDS) + + +/mob/living/simple_animal/hostile/distortion/lantern/AttackingTarget() + ..() + if(prob(70)) + return + for(var/mob/living/carbon/C in view(8, src)) + if(faction_check_mob(C, FALSE)) + continue + if(!CanAttack(C)) + continue + C.blur_eyes(5) + addtimer(CALLBACK (C, .mob/proc/blind_eyes, 2), 2 SECONDS) + var/new_overlay = mutable_appearance('ModularTegustation/Teguicons/tegu_effects.dmi', "enchanted", -HALO_LAYER) + C.add_overlay(new_overlay) + addtimer(CALLBACK (C, .atom/proc/cut_overlay, new_overlay), 4 SECONDS) + + +