diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index e95fcc82c3f7..844d28415fbe 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -5,6 +5,10 @@ "b" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"c" = ( +/obj/structure/table/wood, +/turf/open/floor/plasteel/freezer, +/area/ruin/lavaland/powered/seedvault) "d" = ( /obj/structure/table/wood, /obj/item/lighter, @@ -21,11 +25,11 @@ /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "f" = ( -/obj/machinery/plantgenes/seedvault{ - pixel_y = 6 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/structure/table/wood, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/grass, /area/ruin/lavaland/powered/seedvault) "g" = ( /obj/structure/table/wood, @@ -61,7 +65,7 @@ /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "l" = ( -/obj/machinery/door/airlock, +/obj/machinery/door/airlock/titanium/glass, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "m" = ( @@ -73,7 +77,8 @@ /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "n" = ( -/obj/machinery/smartfridge, +/obj/structure/table/wood, +/obj/item/gps, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "o" = ( @@ -93,8 +98,9 @@ /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "p" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/plasteel/freezer, +/obj/structure/grille, +/obj/machinery/smartfridge, +/turf/open/floor/circuit/green, /area/ruin/lavaland/powered/seedvault) "q" = ( /obj/item/hatchet, @@ -113,24 +119,15 @@ /area/ruin/lavaland/powered/seedvault) "s" = ( /obj/structure/table/wood, -/obj/item/gun/energy/floragun, -/obj/item/gun/energy/floragun, -/obj/item/gun/energy/floragun, -/obj/item/gun/energy/floragun, -/obj/item/storage/box/disks_plantgene, +/obj/item/seeds/bee_balm/honey_balm, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "t" = ( /obj/effect/mob_spawn/human/seed_vault, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/grass, /area/ruin/lavaland/powered/seedvault) "u" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/grass, /area/ruin/lavaland/powered/seedvault) "v" = ( /obj/machinery/vending/hydronutrients, @@ -152,10 +149,8 @@ /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "y" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, +/obj/structure/table/wood, +/obj/item/pickaxe, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "z" = ( @@ -165,6 +160,10 @@ }, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) +"A" = ( +/obj/structure/table/glass, +/turf/open/floor/plasteel/freezer, +/area/ruin/lavaland/powered/seedvault) "B" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/bin, @@ -183,27 +182,25 @@ /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "F" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/freezer, +/obj/structure/grille, +/obj/structure/window/shuttle, +/turf/open/floor/circuit/green, /area/ruin/lavaland/powered/seedvault) "G" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/obj/item/clothing/under/rank/civilian/hydroponics, -/turf/open/floor/plasteel/freezer, +/obj/structure/disposalpipe/segment, +/turf/closed/wall/mineral/titanium/interior, /area/ruin/lavaland/powered/seedvault) "H" = ( -/obj/machinery/chem_master/condimaster, +/obj/structure/table/glass, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "I" = ( /obj/structure/table/wood, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, -/obj/item/reagent_containers/glass/bucket, +/obj/item/watertank, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "J" = ( @@ -211,6 +208,13 @@ /obj/structure/table/wood, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) +"K" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass, +/area/ruin/lavaland/powered/seedvault) "L" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -224,8 +228,10 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "N" = ( +/obj/machinery/plantgenes/seedvault{ + pixel_y = 6 + }, /obj/structure/table/wood, -/obj/item/storage/box/disks_plantgene, /obj/machinery/light{ dir = 1 }, @@ -238,38 +244,59 @@ /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "P" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light{ - dir = 1 - }, +/obj/structure/table/wood, +/obj/item/storage/box/disks_plantgene, +/obj/machinery/light, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "Q" = ( -/turf/closed/wall/r_wall, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, /area/ruin/lavaland/powered/seedvault) "R" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/turf/open/floor/plasteel/freezer, +/turf/open/floor/grass, /area/ruin/lavaland/powered/seedvault) "S" = ( -/obj/machinery/light{ - dir = 4 - }, +/turf/closed/wall/mineral/titanium/interior, +/area/ruin/lavaland/powered/seedvault) +"T" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/item/clothing/under/rank/civilian/hydroponics, +/obj/machinery/light, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "U" = ( /obj/machinery/light, -/turf/open/floor/plasteel/freezer, +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, /area/ruin/lavaland/powered/seedvault) "V" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall, +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/machinery/light, +/turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "X" = ( -/obj/machinery/hydroponics/constructable, -/obj/machinery/light, +/obj/structure/table/glass, +/obj/item/construction/plumbing, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/lavaland/powered/seedvault) +"Y" = ( +/obj/machinery/chem_master, /turf/open/floor/plasteel/freezer, /area/ruin/lavaland/powered/seedvault) "Z" = ( @@ -288,12 +315,12 @@ a a a a -Q -Q -Q -Q -Q -Q +S +S +S +S +S +S a a a @@ -309,14 +336,14 @@ a a a a -a -Q +S +S t t t t -Q -a +S +S a a a @@ -329,20 +356,20 @@ b a a a -a -a -Q -Q -O -h -h +S +S +S +S +K +u +u U -Q -Q -a +S +S +S +S a a -b a b "} @@ -350,20 +377,20 @@ b b a a -Q -Q -Q -Q -Q -Q +S +S +w +v +S +F l l -Q -Q -Q -Q -a -a +F +S +w +v +S +S a a a @@ -371,241 +398,241 @@ a (5,1,1) = {" a a -Q -Q -k -Q -n +S +S +u +u +u R u h h u R -Z -Q -a -a -a +u +u +u +S +S a a "} (6,1,1) = {" a a +S +C +u Q -d -h +u Q -o -h -h -h -h +u h h -G +u Q -a -a -a +u +Q +u +Z +S a a "} (7,1,1) = {" a a -Q +S N -h +u Q -P -h -p -h +u +Q +u h -p h -X +u Q -a -a -a +u +Q +u +V +S a a "} (8,1,1) = {" b a +S +g +u Q -e -h -l -h -h -v +u +Q +u h h +u +Q +u +Q +u B -F -F -V +G L a -a -a -a "} (9,1,1) = {" b a -Q +S +e +u +u +u f -h -Q -p -h -n +u h h -C -h -k -Q +u +f +u +u +u +r +S M a -a -a -a "} (10,1,1) = {" a a -Q -g -h -Q +S +S +F +l p -h -w -h -h +S D h +h +o +S p -Q +l +F +S +S b a -a -a -a "} (11,1,1) = {" a a -Q +S +k h h -Q -q +e +S +O h -x h +T +S +H h -E h -H -Q -a -a -a +E +S a a "} (12,1,1) = {" b a -Q -O -h -Q -P +S +k h h +P +S +I h h +J +S +X h h -X -Q -a -a -a +A +S a a "} (13,1,1) = {" a a -Q -i +S +k h -Q -r h +d +S +c h -p -p +h +n +S +x h h -I -Q -a -a -a +Y +S a a "} (14,1,1) = {" a a -Q -Q +S +S +i i -Q s S -y +q h h y S -J -Q -a -a -a +A +h +h +S +S a a "} (15,1,1) = {" a a -b -Q -Q -Q -Q -Q -Q +a +S +S +S +S +S +S z z -Q -Q -Q -Q -a -a +S +S +S +S +S +S a a a @@ -613,21 +640,21 @@ a (16,1,1) = {" b a -b +a j -Q +S j -Q +S j -Q +S h h -Q +S j -Q +S +j +S j -a -a a a a @@ -641,10 +668,10 @@ a a a a -Q +S m m -Q +S b b b @@ -683,7 +710,7 @@ a a b b -a +b b b b diff --git a/_maps/map_files/SpookyStation/SpookyStation.dmm b/_maps/map_files/SpookyStation/SpookyStation.dmm index 406c42a2499b..fd5775372105 100644 --- a/_maps/map_files/SpookyStation/SpookyStation.dmm +++ b/_maps/map_files/SpookyStation/SpookyStation.dmm @@ -9135,11 +9135,6 @@ /obj/machinery/light/small, /turf/open/floor/plasteel/cafeteria, /area/eventmap/inside) -"aAr" = ( -/obj/item/disk/tech_disk/debug, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aAs" = ( /obj/structure/noticeboard{ dir = 1; @@ -9431,11 +9426,6 @@ icon_state = "bus" }, /area/shuttle/arrival) -"aBg" = ( -/obj/machinery/light/floor, -/obj/machinery/telecomms/broadcaster, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aBh" = ( /obj/structure/window/reinforced/spawner/north, /turf/open/floor/plasteel/dark, @@ -9588,13 +9578,6 @@ /obj/item/bedsheet/pirate, /turf/open/floor/wood, /area/eventmap/inside) -"aBF" = ( -/obj/machinery/telecomms/allinone/indestructable{ - freq_listening = list(1347,1349,1351,1353,1355,1357,1359,1447) - }, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aBG" = ( /obj/machinery/nanite_chamber, /turf/open/floor/circuit/off, @@ -9844,16 +9827,6 @@ }, /turf/open/floor/carpet/blue, /area/eventmap/inside) -"aCq" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/item/clothing/neck/devilwings, -/obj/item/clothing/gloves/bracer, -/obj/item/clothing/accessory/skullcodpiece, -/turf/open/floor/wood, -/area/eventmap/inside) "aCr" = ( /obj/structure/closet/secure_closet/bar, /obj/machinery/light/small{ @@ -10005,11 +9978,6 @@ icon_state = "sepia" }, /area/eventmap/inside) -"aCQ" = ( -/obj/item/aiModule/reset/purge, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aCR" = ( /obj/effect/landmark/start/head_of_security, /turf/open/floor/plasteel{ @@ -10682,10 +10650,6 @@ icon_state = "wood-broken5" }, /area/eventmap/inside) -"aEO" = ( -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aEP" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -11240,11 +11204,6 @@ /obj/item/bedsheet/hop, /turf/open/floor/wood, /area/eventmap/mountaininside) -"aGC" = ( -/obj/item/aiModule/supplied/freeform, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aGD" = ( /obj/structure/flora/tree/spookytime, /turf/open/floor/spooktime/nonspooktimegrass, @@ -12411,6 +12370,13 @@ }, /turf/open/floor/plasteel, /area/eventmap/mountaininside) +"aJT" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/eventmap/inside) "aJU" = ( /turf/open/floor/spooktime/beach/coasts/innerE, /area/eventmap/outside) @@ -12439,11 +12405,6 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/wood, /area/eventmap/inside) -"aJY" = ( -/obj/machinery/ore_silo, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aJZ" = ( /obj/item/reagent_containers/food/condiment/saltshaker, /obj/item/reagent_containers/food/condiment/peppermill, @@ -12513,11 +12474,6 @@ }, /turf/open/floor/carpet, /area/eventmap/inside) -"aKl" = ( -/obj/effect/landmark/start/ai, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aKm" = ( /obj/structure/chair/sofa/left, /obj/effect/landmark/start/assistant, @@ -12534,46 +12490,6 @@ }, /turf/open/floor/carpet, /area/eventmap/inside) -"aKp" = ( -/obj/machinery/light/floor, -/obj/item/stack/sheet/glass/fifty{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/bluespace_crystal{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/metal{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/mineral/diamond{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/mineral/gold{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/mineral/plasma{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/mineral/silver{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/mineral/titanium{ - amount = 10000; - max_amount = 10000 - }, -/obj/item/stack/sheet/mineral/uranium{ - amount = 10000; - max_amount = 10000 - }, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aKq" = ( /turf/open/floor/spooktime/cobble/roadsideS, /area/eventmap/outside) @@ -12589,19 +12505,6 @@ /obj/item/reagent_containers/pill/stimulant, /turf/open/floor/spooktime/dirtpatch, /area/eventmap/mountain) -"aKu" = ( -/obj/structure/closet/crate, -/obj/item/clothing/head/pirate, -/obj/item/clothing/head/santa, -/obj/item/clothing/head/magus, -/obj/item/clothing/head/mailman, -/obj/item/clothing/head/griffin, -/obj/item/clothing/head/bearpelt, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/bowler, -/obj/item/clothing/head/fedora, -/turf/open/floor/wood, -/area/eventmap/inside) "aKv" = ( /obj/item/storage/box/stunslug, /obj/item/storage/box/stunslug, @@ -13767,14 +13670,6 @@ }, /turf/open/floor/plasteel, /area/eventmap/inside) -"aNO" = ( -/obj/machinery/light/floor, -/obj/machinery/telecomms/bus{ - appearance_flags = "bus mainframe (NULL)"; - freq_listening = list(1347,1349,1351,1353,1355,1357,1359,1447) - }, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aNP" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -14041,15 +13936,6 @@ "aOy" = ( /turf/open/floor/spooktime/beach/coasts/watercoastNW, /area/eventmap/outside) -"aOz" = ( -/obj/machinery/light/floor, -/obj/machinery/telecomms/processor{ - appearance_flags = "processor unit"; - freq_listening = list(1347,1349,1351,1353,1355,1357,1359,1447); - name = "processor unit (NULL)" - }, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aOA" = ( /obj/structure/cable/white{ icon_state = "2-8" @@ -14364,15 +14250,6 @@ /obj/machinery/microwave, /turf/open/floor/wood, /area/eventmap/mountaininside) -"aPD" = ( -/obj/machinery/rnd/production/protolathe/department/science{ - acted_explosions = "Dumbasses"; - allowed_department_flags = 126; - name = "department protolathe (Dumb powergamers)" - }, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aPE" = ( /obj/structure/table/wood/fancy/green, /obj/item/reagent_containers/food/snacks/pizza/vegetable, @@ -14997,11 +14874,6 @@ "aRP" = ( /turf/open/floor/wood/damturf/broken2, /area/eventmap/inside) -"aRQ" = ( -/obj/machinery/computer/rdconsole/core, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aRS" = ( /turf/open/floor/plasteel/damturf/damage4, /area/eventmap/mountaininside) @@ -15353,11 +15225,6 @@ }, /turf/open/floor/spooktime/spooktimegrass, /area/eventmap/outside) -"aTR" = ( -/obj/machinery/light/floor, -/obj/machinery/telecomms/message_server, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aTS" = ( /obj/structure/sign/departments/restroom{ pixel_y = 32 @@ -15426,13 +15293,6 @@ }, /turf/open/floor/plating, /area/eventmap/mountain) -"aUo" = ( -/obj/machinery/light/floor, -/obj/machinery/telecomms/processor{ - freq_listening = list(1359,1441) - }, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aUr" = ( /turf/open/floor/plasteel/damturf/platdmg1, /area/eventmap/mountaininside) @@ -15707,13 +15567,6 @@ /obj/item/bedsheet/hos, /turf/open/floor/wood, /area/eventmap/mountaininside) -"aWK" = ( -/obj/machinery/light/floor, -/obj/machinery/telecomms/bus{ - freq_listening = list(1459,1441) - }, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aWL" = ( /obj/structure/closet/gimmick/russian, /turf/open/floor/spooktime/dirtpatch, @@ -15750,18 +15603,6 @@ /obj/item/flashlight/glowstick/pink, /turf/open/floor/spooktime/dirtpatch, /area/eventmap/mountain) -"aWX" = ( -/obj/structure/closet/crate, -/obj/item/clothing/head/pirate, -/obj/item/clothing/head/santa, -/obj/item/clothing/head/magus, -/obj/item/clothing/head/mailman, -/obj/item/clothing/head/griffin, -/obj/item/clothing/head/bearpelt, -/obj/item/clothing/head/beret, -/obj/item/clothing/head/fedora, -/turf/open/floor/wood, -/area/eventmap/inside) "aWY" = ( /obj/item/stack/sheet/mineral/bananium, /obj/item/stack/sheet/mineral/bananium, @@ -15772,16 +15613,6 @@ "aWZ" = ( /turf/open/floor/spooktime/beach/coasts/innerS, /area/eventmap/outside) -"aXa" = ( -/obj/machinery/light/floor, -/obj/machinery/telecomms/receiver, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) -"aXh" = ( -/obj/machinery/computer/upload/ai, -/obj/machinery/light/floor, -/turf/open/floor/plasteel/dark, -/area/eventmap/mountaininside) "aXj" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16715,41 +16546,1211 @@ }, /turf/open/floor/plasteel, /area/eventmap/outside) -"mMd" = ( +"bjx" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/tcommsat/computer) +"bkL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/tcommsat/computer) +"bBB" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"bDG" = ( +/obj/machinery/ntnet_relay, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"bVe" = ( +/obj/machinery/computer/telecomms/monitor{ + dir = 4; + network = "tcommsat" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"bXI" = ( +/obj/machinery/telecomms/processor/preset_three, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"bXT" = ( +/obj/machinery/telecomms/processor/preset_one, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"bZW" = ( +/obj/effect/landmark/start/stowaway, +/turf/open/floor/spooktime/cobble/roadmid, +/area/eventmap/outside) +"cgG" = ( +/obj/machinery/telecomms/processor/preset_four, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"czv" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/eventmap/mountaininside) +"cSZ" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"cXp" = ( +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"cYr" = ( +/turf/closed/wall/r_wall, +/area/tcommsat/server) +"deu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/closed/wall/r_wall, +/area/tcommsat/computer) +"dkH" = ( +/obj/machinery/telecomms/server/presets/security, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"dlJ" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"dyr" = ( +/obj/machinery/telecomms/bus/preset_three, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"dMQ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"dVA" = ( +/obj/machinery/blackbox_recorder, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"dZy" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Telecomms Admin"; + departmentType = 5; + name = "Telecomms RC"; + pixel_x = 30 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"efa" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"egp" = ( +/obj/machinery/gear_painter, +/turf/open/floor/circuit/off, +/area/eventmap/mountaininside) +"enw" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"etl" = ( +/obj/machinery/telecomms/processor/preset_two, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"ewi" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/tcommsat/computer) +"eAb" = ( +/obj/machinery/telecomms/processor/preset_four, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"eKf" = ( +/obj/machinery/camera{ + c_tag = "Telecomms Server Room"; + dir = 4; + network = list("tcomms") + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"eTN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"feZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"fsr" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"fEI" = ( +/obj/machinery/door/airlock/engineering{ + name = "Telecommunications"; + req_access_txt = "61" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"fGC" = ( +/obj/machinery/telecomms/bus/preset_three, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"fXx" = ( +/obj/machinery/telecomms/message_server, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"ggd" = ( +/turf/closed/wall/r_wall, +/area/tcommsat/computer) +"ggT" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/tcommsat/computer) +"glZ" = ( +/obj/machinery/telecomms/server/presets/command, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"gyc" = ( +/obj/machinery/telecomms/message_server, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"gzo" = ( +/obj/machinery/telecomms/server/presets/service, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"gPl" = ( +/obj/machinery/telecomms/processor/preset_two, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"gWu" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Telecomms Admin"; + departmentType = 5; + name = "Telecomms RC"; + pixel_x = 30 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"hbS" = ( +/obj/machinery/ntnet_relay, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"hsV" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/eventmap/mountaininside) +"hKn" = ( +/obj/machinery/telecomms/server/presets/service, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"hMC" = ( +/obj/effect/landmark/start/ai, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"hZx" = ( +/obj/machinery/light, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"ibe" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/power/apc/highcap/five_k{ + areastring = "/area/tcommsat/server"; + dir = 1; + name = "Telecomms Server APC"; + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"ibo" = ( +/obj/structure/table, +/obj/item/radio/off, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"icN" = ( +/obj/machinery/telecomms/server/presets/security, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"ios" = ( +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"isQ" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -35 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"iFV" = ( +/obj/machinery/telecomms/server/presets/common, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"iPe" = ( +/obj/machinery/telecomms/server/presets/science, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"iRn" = ( +/obj/item/aiModule/reset/purge, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"iSF" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/eventmap/mountaininside) +"iUi" = ( +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/light, +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"jcR" = ( +/obj/machinery/telecomms/bus/preset_two, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"jyu" = ( +/obj/item/disk/tech_disk/debug, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"jAm" = ( +/obj/machinery/telecomms/bus/preset_one, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"jPX" = ( +/obj/item/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -35 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"jUU" = ( +/obj/machinery/telecomms/server/presets/medical, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"jVL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"jWR" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"jXz" = ( +/obj/machinery/telecomms/hub/preset, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/eventmap/mountaininside) +"jYe" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/tcommsat/computer) +"kif" = ( +/obj/machinery/telecomms/receiver/preset_right, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"knD" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"kqN" = ( +/obj/machinery/telecomms/bus/preset_two, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"kwI" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/announcement_system, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"kKr" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"lbR" = ( +/obj/structure/closet/crate, +/obj/item/clothing/head/pirate, +/obj/item/clothing/head/santa, +/obj/item/clothing/head/magus, +/obj/item/clothing/head/mailman, +/obj/item/clothing/head/griffin, +/obj/item/clothing/head/bearpelt, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/fedora, +/obj/item/clothing/accessory/skullcodpiece, +/obj/item/clothing/gloves/bracer, +/obj/item/clothing/neck/devilwings, +/turf/open/floor/wood, +/area/eventmap/inside) +"lkM" = ( +/obj/machinery/telecomms/bus/preset_one, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"lkR" = ( +/obj/machinery/telecomms/broadcaster/preset_left, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"llJ" = ( +/obj/machinery/telecomms/server/presets/engineering, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"lQq" = ( +/obj/structure/table, +/obj/item/multitool, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"lXN" = ( +/obj/machinery/gear_painter, +/turf/open/floor/carpet/blue, +/area/eventmap/inside) +"msS" = ( +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"myw" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/eventmap/mountaininside) +"mEk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"mFz" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/gear_painter, +/turf/open/floor/wood, +/area/eventmap/inside) +"mOT" = ( +/obj/item/aiModule/supplied/freeform, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"mWU" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"nmP" = ( +/obj/machinery/telecomms/server/presets/engineering, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"nqj" = ( +/obj/machinery/telecomms/processor/preset_three, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"nxK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/tcommsat/computer) +"nCk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"nMC" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"nQa" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"nUa" = ( +/obj/machinery/computer/telecomms/monitor{ + dir = 4; + network = "tcommsat" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"nYQ" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"oxb" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"oDI" = ( +/obj/machinery/status_display/evac, +/turf/closed/wall, +/area/tcommsat/computer) +"oDN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/tcommsat/computer) +"oIr" = ( +/obj/machinery/telecomms/receiver/preset_left, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"oQI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/holopad/secure, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"oSC" = ( +/obj/structure/sign/poster/contraband/yes_erp, +/turf/closed/wall/rust, +/area/eventmap/mountaininside) +"paC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"pcD" = ( +/obj/machinery/computer/telecomms/server{ + dir = 4; + network = "tcommsat" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"pvQ" = ( +/obj/machinery/computer/telecomms/server{ + dir = 4; + network = "tcommsat" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"pxF" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/announcement_system, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"pCk" = ( +/obj/machinery/telecomms/server/presets/supply, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"pMk" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"pOR" = ( +/obj/machinery/telecomms/server/presets/command, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"pXG" = ( +/obj/machinery/computer/message_monitor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"pZR" = ( +/obj/machinery/telecomms/server/presets/supply, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"qcA" = ( +/obj/structure/table, +/obj/item/multitool, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"qiW" = ( +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'SERVER ROOM'."; + name = "SERVER ROOM" + }, +/turf/closed/wall, +/area/eventmap/mountaininside) +"qjM" = ( +/obj/machinery/light_switch{ + pixel_x = 27 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"qKM" = ( +/obj/machinery/camera{ + c_tag = "Telecomms Server Room"; + dir = 4; + network = list("tcomms") + }, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"rob" = ( +/obj/machinery/telecomms/processor/preset_one, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"rvs" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/tcommsat/computer) +"rHo" = ( +/obj/machinery/door/airlock/command/glass{ + name = "Control Room"; + req_access_txt = "19; 61" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"rKg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"rLq" = ( +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"rWZ" = ( +/obj/machinery/telecomms/server/presets/science, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"shk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"sme" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/eventmap/mountaininside) +"sya" = ( +/obj/machinery/telecomms/server/presets/medical, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"sHU" = ( +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'SERVER ROOM'."; + name = "SERVER ROOM" + }, +/turf/closed/wall, +/area/tcommsat/computer) +"tdd" = ( +/obj/machinery/telecomms/broadcaster/preset_left, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"tgb" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"tjG" = ( +/obj/structure/sign/warning/nosmoking{ + pixel_y = -32 + }, +/obj/machinery/light, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"toA" = ( +/obj/machinery/status_display/evac, +/turf/closed/wall, +/area/eventmap/mountaininside) +"tvR" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"two" = ( +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"ufl" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"unY" = ( +/obj/structure/closet/emcloset, +/obj/machinery/camera{ + c_tag = "Telecomms Monitoring"; + dir = 8; + network = list("tcomms") + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"uoj" = ( +/obj/structure/sign/poster/contraband/yes_erp, +/turf/closed/wall/mineral/wood, +/area/eventmap/inside) +"uqt" = ( +/obj/machinery/camera{ + c_tag = "Telecomms Monitoring"; + dir = 8; + network = list("tcomms") + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"urp" = ( +/obj/structure/table, +/obj/item/folder/blue, +/obj/item/pen/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"utk" = ( /obj/structure/dresser, /turf/open/floor/spooktime/dirtpatch, /area/eventmap/inside) -"nOg" = ( -/obj/structure/cable/white{ - icon_state = "1-2" +"uNw" = ( +/obj/machinery/telecomms/bus/preset_four, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"uOt" = ( +/obj/item/radio/intercom{ + dir = 8; + freerange = 1; + name = "Station Intercom (Telecomms)"; + pixel_y = 26 }, -/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"veR" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/tcommsat/computer) +"viN" = ( +/obj/structure/closet/crate, +/obj/item/clothing/head/pirate, +/obj/item/clothing/head/santa, +/obj/item/clothing/head/magus, +/obj/item/clothing/head/mailman, +/obj/item/clothing/head/griffin, +/obj/item/clothing/head/bearpelt, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/bowler, +/obj/item/clothing/head/fedora, +/obj/item/clothing/accessory/skullcodpiece, +/obj/item/clothing/neck/devilwings, +/obj/item/clothing/gloves/bracer, +/turf/open/floor/wood, /area/eventmap/inside) -"oWI" = ( -/obj/effect/landmark/start/stowaway, -/turf/open/floor/spooktime/cobble/roadmid, -/area/eventmap/outside) -"phL" = ( +"vnA" = ( +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"vog" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"vpQ" = ( /obj/effect/landmark/start/stowaway, /turf/open/floor/spooktime/cobble/roadsideS, /area/eventmap/outside) -"sDL" = ( -/obj/structure/sign/poster/contraband/yes_erp, -/turf/closed/wall/mineral/wood, +"vsm" = ( +/obj/machinery/telecomms/receiver/preset_left, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"vys" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"vBX" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, /area/eventmap/mountaininside) -"tFJ" = ( +"vEI" = ( +/obj/item/radio/intercom{ + dir = 8; + freerange = 1; + name = "Station Intercom (Telecomms)"; + pixel_y = 26 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"vGp" = ( /obj/structure/sign/poster/contraband/yes_erp, /turf/closed/wall/mineral/wood, -/area/eventmap/inside) -"vAI" = ( -/obj/structure/sign/poster/contraband/yes_erp, -/turf/closed/wall/rust, /area/eventmap/mountaininside) -"yfc" = ( +"vHD" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/tcommsat/computer) +"vRj" = ( +/obj/machinery/telecomms/receiver/preset_right, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"vSE" = ( +/obj/machinery/rnd/production/protolathe/department/science{ + acted_explosions = "Dumbasses"; + allowed_department_flags = 126; + name = "department protolathe (Dumb powergamers)" + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"vUM" = ( +/obj/machinery/telecomms/hub/preset, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"wcU" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/item/pen/fountain, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"wer" = ( +/obj/machinery/telecomms/broadcaster/preset_right, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"wgm" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/ore_silo, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"woT" = ( +/obj/machinery/computer/message_monitor{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"wuq" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"wDR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/eventmap/mountaininside) +"wLI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/eventmap/mountaininside) +"wRK" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/engineering/glass{ + name = "Server Room"; + req_access_txt = "61" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/tcommsat/computer) +"wVj" = ( /obj/structure/sign/poster/contraband/yes_erp, /turf/closed/wall/r_wall, /area/eventmap/inside) +"xgY" = ( +/obj/machinery/light_switch{ + pixel_x = 27 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"xhz" = ( +/obj/machinery/computer/rdconsole/core{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"xmg" = ( +/obj/machinery/power/smes{ + charge = 5e+006 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"xwH" = ( +/obj/machinery/telecomms/bus/preset_four, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"xAS" = ( +/obj/machinery/light, +/obj/machinery/computer/upload/ai{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"xEa" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/tcommsat/computer) +"xGB" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/eventmap/mountaininside) +"xJI" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"xLm" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/eventmap/mountaininside) +"xVv" = ( +/obj/item/stack/sheet/glass/fifty{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/bluespace_crystal{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/metal{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/mineral/diamond{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/mineral/gold{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/mineral/plasma{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/mineral/silver{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/mineral/titanium{ + amount = 10000; + max_amount = 10000 + }, +/obj/item/stack/sheet/mineral/uranium{ + amount = 10000; + max_amount = 10000 + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"xYI" = ( +/obj/item/paper/crumpled/bloody{ + name = "ominous note"; + info = "You're not supposed to be here." + }, +/turf/open/floor/plasteel, +/area/eventmap/mountaininside) +"xZN" = ( +/obj/machinery/blackbox_recorder, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) +"ydm" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/tcommsat/computer) +"ygZ" = ( +/obj/machinery/telecomms/server/presets/common, +/turf/open/floor/plasteel/dark/telecomms, +/area/tcommsat/server) (1,1,1) = {" aJx @@ -18927,7 +19928,7 @@ aqr aqr aqr aqr -tFJ +uoj aqr aOV aqr @@ -22512,7 +23513,7 @@ adx aRn asE aDm -nOg +aJT aMm aMx aMJ @@ -23122,7 +24123,7 @@ aMz aED aED aED -sDL +vGp aKA ags ags @@ -25240,7 +26241,7 @@ aac aac ags ags -sDL +vGp aKG aHj aAj @@ -30790,7 +31791,7 @@ adN acy aLv aLv -mMd +utk aMf aLv aLn @@ -33676,7 +34677,7 @@ aJe aZt aCG aGh -aZt +egp aZt aZt aZt @@ -33933,7 +34934,7 @@ aZt aZt aCG aGh -aZt +egp aZt aUW aZt @@ -35879,7 +36880,7 @@ aqr aDI aDI aBm -yfc +wVj aDI alU aDI @@ -36171,13 +37172,13 @@ auU auU aqr aOE -aWX +lbR aye aOE aOE aqr aqv -aKu +viN aQM aOE aOE @@ -36686,13 +37687,13 @@ aBV aqr afU aSe -aCq +mFz aOE acP aqr acS afU -aCq +mFz aOE acP aqr @@ -36915,11 +37916,11 @@ aDI aDI arK aDI -yfc +wVj aDI aDI aDI -yfc +wVj aqI arF aqI @@ -38251,8 +39252,8 @@ aRd aGM aRo aRD -oWI -phL +bZW +vpQ aaN aaN aaN @@ -38508,8 +39509,8 @@ apR ayO aWA aRt -oWI -phL +bZW +vpQ aaN aaN aaN @@ -38765,8 +39766,8 @@ apR ayO aWA aRt -oWI -phL +bZW +vpQ aaN aaN aaN @@ -39022,8 +40023,8 @@ awm ayO aWA aRt -oWI -phL +bZW +vpQ aaN aaN aYI @@ -39279,8 +40280,8 @@ apR ayO aWA aRt -oWI -phL +bZW +vpQ aaN aaN aaN @@ -39536,8 +40537,8 @@ apR ayO aWA aRt -oWI -phL +bZW +vpQ aaN aaN aaN @@ -41027,11 +42028,11 @@ aDI aDI asJ aDI -yfc +wVj alR aDU aDI -yfc +wVj aqI arF aqI @@ -41548,7 +42549,7 @@ aqE aqE aqE aIK -aqI +lXN aqr agN aOE @@ -42047,7 +43048,7 @@ aqr aDI aDI aBm -yfc +wVj aDI anT aDI @@ -42059,7 +43060,7 @@ aqr aqr aDY aqr -tFJ +uoj aqr aIX aqr @@ -47932,7 +48933,7 @@ abN acd aOE aOE -tFJ +uoj adh adA aOE @@ -48180,7 +49181,7 @@ aOE aOE aaH aaV -tFJ +uoj aOE aOE abz @@ -49387,7 +50388,7 @@ aac aac aac aac -aJx +aac aJx "} (128,1,1) = {" @@ -49468,10 +50469,10 @@ aOE aOE aFN abv -tFJ +uoj aOE aOE -tFJ +uoj ack acq aOE @@ -49643,8 +50644,8 @@ aac aac aac aac -aJx -aJx +aac +aac aJx "} (129,1,1) = {" @@ -49858,7 +50859,7 @@ aQx aNg aMp aMp -sDL +vGp aXF aac aac @@ -49900,8 +50901,8 @@ aac aac aac aac -aJx -aJx +aac +aac aJx "} (130,1,1) = {" @@ -50155,10 +51156,10 @@ aac aac aac aac -aJx -aJx -aJx -aJx +aac +aac +aac +aac aJx "} (131,1,1) = {" @@ -50411,12 +51412,12 @@ aac aac aac aac +aac +aac +aac +aac +aac aJx -azQ -azQ -azQ -azQ -azQ "} (132,1,1) = {" aJx @@ -50667,13 +51668,13 @@ aRW aac aac aac +aac +aac +aac +aac +aac +aac aJx -azQ -aOz -aEO -aEO -aUo -azQ "} (133,1,1) = {" aJx @@ -50698,7 +51699,7 @@ aac aac ags alv -sDL +vGp aED aED aED @@ -50923,14 +51924,14 @@ aRW aRW aac aac +aac +aac +aac +aac +aac +aac +aac aJx -aJx -azQ -aNO -aEO -aEO -aXa -azQ "} (134,1,1) = {" aJx @@ -51180,14 +52181,14 @@ aRW aRW aac aac +aac +aac +aac +aac +aac +aac +aac aJx -azQ -azQ -aTR -aEO -aEO -aBg -azQ "} (135,1,1) = {" aJx @@ -51437,14 +52438,14 @@ aRW aRW aRW aac +aac +aac +aac +aac +aac +aac +aac aJx -azQ -aEO -aEO -aGC -aCQ -aWK -azQ "} (136,1,1) = {" aJx @@ -51694,14 +52695,14 @@ aRW aRW aRU aac +aac +aac +aac +aac +aac +aac +aac aJx -azQ -aBF -aEO -aEO -aXh -azQ -azQ "} (137,1,1) = {" aJx @@ -51951,13 +52952,13 @@ aRW aRW aRW aac -aJx -azQ -aEO -aEO -aEO -aKl -azQ +aac +aac +aac +aac +aac +aac +aac aJx "} (138,1,1) = {" @@ -52208,13 +53209,13 @@ aRW aRW aac aac -aJx -azQ -aRQ -aAr -aEO -aKp -azQ +aac +aac +aac +aac +aac +aac +aac aJx "} (139,1,1) = {" @@ -52465,13 +53466,13 @@ aRW aRW aac aac -aJx -azQ -aPD -aEO -aEO -aJY -azQ +aac +aac +aac +aac +aac +aac +aac aJx "} (140,1,1) = {" @@ -52722,13 +53723,13 @@ aRW aRW aac aac -aJx -azQ -azQ -azQ -azQ -azQ -azQ +aac +aac +aac +aac +aac +aac +aac aJx "} (141,1,1) = {" @@ -52979,13 +53980,13 @@ aRW aRW aac aac -aJx -aJx -aJx -aJx -aJx -aJx -aJx +aac +aac +aac +aac +aac +aac +aac aJx "} (142,1,1) = {" @@ -53237,12 +54238,12 @@ aRW aac aac aac -aJx -aJx -aJx -aJx -aJx -aJx +aac +aac +aac +aac +aac +aac aJx "} (143,1,1) = {" @@ -53495,11 +54496,11 @@ aRU aac aac aac -aJx -aJx -aJx -aJx -aJx +aac +aac +aac +aac +aac aJx "} (144,1,1) = {" @@ -53754,9 +54755,9 @@ aac aac aac aac -aJx -aJx -aJx +aac +aac +aac aJx "} (145,1,1) = {" @@ -54012,8 +55013,8 @@ aac aac aac aac -aJx -aJx +aac +aac aJx "} (146,1,1) = {" @@ -54269,8 +55270,8 @@ aRU aac aac aac -aJx -aJx +aac +aac aJx "} (147,1,1) = {" @@ -54523,11 +55524,11 @@ aRW aRW aRW aRW -aRW aac aac aac -aJx +aac +aac aJx "} (148,1,1) = {" @@ -64002,7 +65003,7 @@ aaN aaN aaN aaN -tFJ +uoj aqr aqr aqr @@ -65030,7 +66031,7 @@ aaN aaN aaN aaN -tFJ +uoj aay aOE aOE @@ -66107,7 +67108,7 @@ aED aED aED aDy -sDL +vGp aac aac aZS @@ -66315,13 +67316,13 @@ aaN aaN aaN aaN -tFJ +uoj aqr aqr aOL aOL aqr -tFJ +uoj aaN aac aac @@ -70011,7 +71012,7 @@ aHf aHf aHf aqr -tFJ +uoj aaN aaN aaN @@ -78176,18 +79177,18 @@ aJx "} (240,1,1) = {" aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx aac aac aac @@ -78433,18 +79434,18 @@ aJx "} (241,1,1) = {" aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx +aJx aac aac aac @@ -78689,19 +79690,19 @@ aac aJx "} (242,1,1) = {" +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -78882,7 +79883,7 @@ aYr aME aRe aZA -vAI +oSC aEF ags ags @@ -78930,35 +79931,35 @@ aac aac aac aac -aac -aac -aac -aac -ags -ags -aac -aac -aac -aac -aac +cYr +cYr +cYr +cYr +cYr +cYr +cYr +cYr +cYr +cYr +cYr aac aac aJx "} (243,1,1) = {" +azQ +two +two +ios +ios +hbS +qKM +ios +two +two +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -79171,7 +80172,7 @@ ags ags ags aac -vAI +oSC aGP aFw aFw @@ -79187,35 +80188,35 @@ aac aac aac aac -aac -aac -aac -ags -aZS -aZS -aac -aac -aac -aac -aac +cYr +rLq +rLq +cXp +cXp +bDG +eKf +cXp +rLq +rLq +cYr aac aac aJx "} (244,1,1) = {" +azQ +nmP +iFV +dVA +ios +vog +xLm +fXx +pZR +hKn +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -79444,35 +80445,35 @@ aac aac aac aac -aac -aac -ags -ags -aZS -aac -aac -aac -aac -aac -aac +cYr +llJ +ygZ +xZN +cXp +xmg +nYQ +gyc +pCk +gzo +cYr aac aac aJx "} (245,1,1) = {" +azQ +xwH +eAb +wer +efa +oxb +two +lkR +kqN +etl +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -79701,35 +80702,35 @@ aac aac aac aac -aac -ags -ags -ags -aZS -aac -aac -aac -aac -aac -aac +cYr +uNw +cgG +msS +jWR +ufl +rLq +tdd +jcR +gPl +cYr aac aac aJx "} (246,1,1) = {" +azQ +enw +knD +knD +vBX +jXz +two +two +two +hZx +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -79958,35 +80959,35 @@ aac aac ags ags -ags -ags -ags -ags -aac -aac -aac -aac -aac -aac -aac +cYr +ibe +paC +paC +nQa +vUM +rLq +rLq +rLq +tjG +cYr aac aac aJx "} (247,1,1) = {" +azQ +bXI +fGC +kif +wLI +two +two +vsm +bXT +jAm +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -80215,35 +81216,35 @@ ags ags ags aac -aac -ags -ags -aac -aac -aac -aac -aac -aac -aac -aac +cYr +nqj +dyr +vRj +shk +rLq +rLq +oIr +rob +lkM +cYr aac aac aJx "} (248,1,1) = {" +azQ +icN +pOR +ios +mEk +two +ios +ios +jUU +rWZ +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -80472,22 +81473,34 @@ ags aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +cYr +dkH +glZ +cXp +bBB +rLq +cXp +cXp +sya +iPe +cYr aac aac aJx "} (249,1,1) = {" +azQ +two +two +ios +czv +wuq +sme +ios +two +two +azQ +aJx aJx aac aac @@ -80580,122 +81593,39 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -ags -ags -ags -ags -aac -ags -ags -ags -aZS -aZS -aac -aac -ags -ags -ags -ags -ags -ags -ags -ags -ags -ags -ags -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -ags -aZS -aZS -ags -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -ags -ags -aac -aac -aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +aac +ags ags ags ags aac ags ags -aZS +ags aZS aZS aac +aac +ags ags ags ags @@ -80712,17 +81642,18 @@ aac aac aac aac -ags -ags -ags aac aac aac -aNF -ags -ags -ags +aac +aac +aac +aac +aac +aac ags +aZS +aZS ags aac aac @@ -80742,10 +81673,6 @@ aac aac aac aac -aJx -"} -(250,1,1) = {" -aJx aac aac aac @@ -80755,9 +81682,83 @@ aac aac aac aac +ags +ags aac aac aac +ags +ags +ags +aac +ags +ags +aZS +aZS +aZS +aac +ags +ags +ags +ags +ags +ags +ags +ags +ags +ags +aac +aac +aac +aac +aac +aac +ags +ags +ags +aac +aac +aac +aNF +ags +ags +ags +ags +ags +aac +aac +aac +aac +aac +cYr +rLq +rLq +cXp +bkL +wRK +xEa +cXp +rLq +rLq +cYr +aac +aac +aJx +"} +(250,1,1) = {" +azQ +xGB +myw +myw +wDR +dMQ +hsV +myw +myw +iSF +azQ +aJx +aJx aac aac aac @@ -80986,35 +81987,35 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +ggd +ewi +oDN +oDN +vHD +jYe +rvs +oDN +oDN +nxK +ggd aac aac aJx "} (251,1,1) = {" +azQ +wgm +pXG +pvQ +toA +dlJ +qiW +lQq +bVe +kKr +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -81243,35 +82244,35 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +ggd +cSZ +woT +pcD +oDI +ggT +sHU +qcA +nUa +ibo +ggd aac aac aJx "} (252,1,1) = {" +azQ +uOt +fsr +aZA +aZA +eTN +aZA +aZA +fsr +isQ +azQ +aJx aJx -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac aac aac aac @@ -81500,22 +82501,34 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +ggd +vEI +pMk +jVL +veR +nCk +vnA +vys +nMC +jPX +ggd aac aac aJx "} (253,1,1) = {" +azQ +pxF +aZA +jyu +aZA +aZA +xYI +aZA +mOT +xAS +azQ +aJx aJx aac aac @@ -81745,34 +82758,34 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +ggd +kwI +vys +rKg +rHo +ydm +oQI +feZ +tgb +iUi +ggd aac aac aJx "} (254,1,1) = {" +azQ +vSE +xVv +xhz +aZA +uqt +gWu +xgY +iRn +hMC +azQ +aJx aJx aac aac @@ -82002,34 +83015,33 @@ aac aac aac aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac -aac +ggd +ggd +wcU +urp +bjx +unY +dZy +qjM +xJI +mWU +ggd aac aac aJx "} (255,1,1) = {" +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ +azQ aJx aJx aJx @@ -82260,28 +83272,17 @@ aJx aJx aJx aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx -aJx +tvR +ggd +ggd +ggd +ggd +ggd +ggd +deu +fEI +ggd +ggd aJx aJx aJx diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 569dc9736da9..ccbeabc4b7cb 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -41,22 +41,25 @@ /area/engineering/gravity_generator) "am" = ( /obj/machinery/atmospherics/components/unary/tank/air, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/engineering/atmos) "an" = ( -/obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/space, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/rtg/advanced, +/turf/open/floor/plating/airless, /area/space/nearstation) "ao" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-8" }, /turf/open/space, /area/space/nearstation) @@ -100,32 +103,24 @@ /obj/machinery/airalarm/unlocked{ pixel_y = 23 }, -/obj/structure/cable{ - icon_state = "0-4" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "at" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Gravity Generator APC"; - pixel_y = 23 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/structure/cable{ icon_state = "0-2" }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/structure/cable, -/obj/machinery/power/port_gen/pacman/super, -/obj/item/stack/sheet/mineral/uranium, +/obj/machinery/power/terminal{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "au" = ( @@ -159,7 +154,6 @@ /turf/open/floor/plating, /area/engineering/atmos) "aA" = ( -/obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "4-8" }, @@ -169,7 +163,11 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/space, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/rtg/advanced, +/turf/open/floor/plating/airless, /area/space/nearstation) "aB" = ( /obj/structure/lattice/catwalk, @@ -192,15 +190,15 @@ /turf/open/floor/plasteel, /area/security/brig) "aE" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engineering/main) "aF" = ( @@ -210,9 +208,6 @@ /turf/open/floor/plasteel, /area/engineering/main) "aG" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, /obj/machinery/light{ dir = 8 }, @@ -220,15 +215,21 @@ dir = 8 }, /obj/structure/closet/radiation, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aI" = ( @@ -273,11 +274,14 @@ /turf/open/floor/plating, /area/engineering/atmos) "aQ" = ( -/obj/structure/lattice/catwalk, /obj/structure/cable{ icon_state = "2-4" }, -/turf/open/space, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/rtg/advanced, +/turf/open/floor/plating/airless, /area/space/nearstation) "aR" = ( /obj/structure/lattice/catwalk, @@ -285,7 +289,7 @@ icon_state = "1-8" }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, /turf/open/space, /area/space/nearstation) @@ -299,15 +303,15 @@ /turf/open/floor/plasteel, /area/engineering/main) "aT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/engineering/main) "aU" = ( @@ -326,15 +330,18 @@ /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "aW" = ( @@ -405,6 +412,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable, /turf/open/floor/plasteel, /area/engineering/gravity_generator) "bh" = ( @@ -427,6 +436,12 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/gravity_generator) +"bj" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "bk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ @@ -486,10 +501,10 @@ "bt" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-4" }, /turf/open/floor/plasteel, /area/science) @@ -636,6 +651,13 @@ "bR" = ( /obj/machinery/camera/autoname, /obj/machinery/chem_heater, +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel/dark, /area/medical/chemistry) "bS" = ( @@ -735,9 +757,6 @@ /turf/open/floor/plasteel, /area/command/bridge) "ce" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -747,6 +766,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/command/bridge) "cf" = ( @@ -782,28 +804,21 @@ /turf/open/floor/plasteel, /area/security/brig) "cj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/medical/chemistry) +/obj/structure/table, +/obj/item/integrated_circuit_printer/debug, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "ck" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/medbay) "cl" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -859,7 +874,7 @@ "cs" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-4" }, /turf/open/floor/plasteel, /area/medical/chemistry) @@ -897,7 +912,7 @@ /area/medical/medbay) "cz" = ( /obj/structure/fans/tiny, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/medical/medbay) "cA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -966,6 +981,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/table, +/obj/item/gun/magic/wand/resurrection/debug, +/obj/item/gun/magic/staff/healing, +/obj/item/gun/magic/wand/death/debug, +/obj/item/debug/human_spawner, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -1009,11 +1029,11 @@ /turf/closed/wall/r_wall, /area/construction) "cO" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/closed/wall/r_wall, -/area/construction) +/turf/open/floor/plasteel, +/area/cargo/miningoffice) "cP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -1032,18 +1052,12 @@ "cT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/medical/chemistry) "cU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) +/obj/machinery/nanite_programmer, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "cV" = ( /obj/machinery/door/airlock/public/glass, /turf/open/floor/plasteel, @@ -1052,12 +1066,14 @@ /obj/machinery/airalarm/unlocked{ pixel_y = 23 }, -/obj/structure/cable, /obj/machinery/power/apc{ dir = 8; pixel_x = -25 }, /obj/effect/turf_decal/stripes/corner, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel, /area/construction) "cX" = ( @@ -1065,6 +1081,9 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/construction) "cY" = ( @@ -1079,9 +1098,6 @@ /area/construction) "da" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/closed/wall/r_wall, /area/commons/storage/primary) "db" = ( @@ -1262,7 +1278,7 @@ /area/commons/storage/primary) "dD" = ( /obj/effect/landmark/observer_start, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/goonplaque, /area/commons/storage/primary) "dE" = ( /obj/effect/turf_decal/stripes/line{ @@ -1330,6 +1346,7 @@ "dQ" = ( /obj/structure/table, /obj/machinery/light, +/obj/item/debug/human_spawner, /turf/open/floor/plasteel, /area/commons/storage/primary) "dR" = ( @@ -1341,7 +1358,7 @@ "dS" = ( /obj/machinery/atmospherics/components/unary/tank/air, /obj/machinery/camera/autoname, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/engineering/atmos) "dT" = ( /obj/machinery/camera/autoname, @@ -1422,17 +1439,16 @@ roundstart_template = /datum/map_template/shuttle/arrival/box; width = 7 }, -/turf/open/space/basic, -/area/space) +/turf/open/floor/engine, +/area/hallway/secondary/entry) "ed" = ( /obj/structure/sign/warning/pods, /turf/closed/wall/r_wall, /area/hallway/secondary/entry) "ee" = ( -/obj/machinery/door/airlock/external{ - name = "Mining Dock Airlock" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/cargo/miningoffice) "ef" = ( @@ -1470,12 +1486,9 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "el" = ( -/obj/docking_port/stationary/random{ - id = "pod_lavaland1"; - name = "lavaland" - }, -/turf/open/space, -/area/space) +/obj/structure/fans/tiny/invisible, +/turf/open/floor/engine, +/area/hallway/secondary/entry) "em" = ( /turf/closed/wall/r_wall, /area/cargo/miningoffice) @@ -1484,12 +1497,10 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "eo" = ( -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock" - }, -/obj/structure/fans/tiny, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) +/obj/structure/table, +/obj/item/storage/belt/military/abductor/full, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "ep" = ( /obj/structure/cable{ icon_state = "2-4" @@ -1512,10 +1523,8 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "er" = ( -/obj/item/gun/magic/staff/healing, -/obj/item/gun/magic/wand/resurrection/debug, -/turf/open/floor/plasteel, -/area/medical/medbay) +/turf/closed/wall/r_wall, +/area/science/circuit) "es" = ( /obj/machinery/light, /obj/machinery/clonepod, @@ -1581,7 +1590,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -1652,9 +1661,6 @@ /turf/open/space/basic, /area/space) "eK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -1662,6 +1668,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel, /area/commons/storage/primary) "eL" = ( @@ -1684,6 +1693,17 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"eO" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/medical/medbay) "eP" = ( /obj/structure/cable{ icon_state = "0-2"; @@ -1758,8 +1778,13 @@ /turf/open/floor/plasteel, /area/commons/storage/primary) "eX" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/camera/autoname{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/cargo/miningoffice) "eY" = ( /obj/machinery/conveyor{ @@ -1864,9 +1889,8 @@ roundstart_template = /datum/map_template/shuttle/escape_pod/default; width = 3 }, -/obj/structure/fans/tiny/invisible, -/turf/open/space/basic, -/area/space) +/turf/open/floor/plating, +/area/hallway/secondary/entry) "fj" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/r_wall, @@ -1943,21 +1967,24 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "fu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "fv" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "fw" = ( @@ -1999,12 +2026,15 @@ /obj/effect/turf_decal/plaque{ icon_state = "L5" }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/commons/storage/primary) "fA" = ( @@ -2105,15 +2135,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/open/floor/plasteel, /area/commons/storage/primary) "fL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -2153,21 +2177,18 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "fP" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/keycard_auth{ - pixel_y = 28 +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) +/area/medical/chemistry) "fQ" = ( -/obj/machinery/computer/communications, -/obj/machinery/status_display/evac{ - pixel_y = 32 +/obj/machinery/door/airlock/public/glass, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/hallway/secondary/exit/departure_lounge) +/area/commons/storage/primary) "fR" = ( /obj/machinery/door/airlock, /obj/structure/cable{ @@ -2194,23 +2215,17 @@ /turf/open/floor/plasteel, /area/science) "fU" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/airalarm/unlocked{ - pixel_y = 23 +/obj/machinery/keycard_auth{ + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "fV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -2218,9 +2233,7 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "fX" = ( @@ -2293,12 +2306,9 @@ /turf/open/floor/plating, /area/commons/storage/primary) "gh" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/computer/shuttle/mining{ - dir = 2 - }, /turf/open/floor/plasteel, /area/cargo/miningoffice) "gi" = ( @@ -2313,20 +2323,14 @@ /obj/machinery/airalarm/unlocked{ pixel_x = 32 }, +/obj/machinery/computer/shuttle/mining{ + dir = 2 + }, /turf/open/floor/plasteel, /area/cargo/miningoffice) "gj" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining_home"; - name = "mining shuttle bay"; - roundstart_template = /datum/map_template/shuttle/mining/box; - width = 7 - }, -/turf/open/space/basic, -/area/space) +/turf/open/floor/engine, +/area/cargo/miningoffice) "gk" = ( /obj/structure/sign/departments/evac, /turf/closed/wall/r_wall, @@ -2335,6 +2339,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/cargo/miningoffice) "gm" = ( @@ -2351,31 +2358,27 @@ /turf/open/floor/plasteel, /area/security/brig) "go" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/cargo/miningoffice) "gp" = ( -/obj/machinery/door/airlock, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, +/turf/closed/wall/r_wall, /area/cargo/miningoffice) "gq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "gr" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "gs" = ( @@ -2395,15 +2398,15 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "gu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "gv" = ( @@ -2434,23 +2437,15 @@ /turf/open/floor/plasteel, /area/construction) "gz" = ( -/obj/structure/table, -/obj/item/card/id/captains_spare, -/obj/machinery/keycard_auth{ - pixel_y = 28 - }, +/obj/machinery/camera/autoname, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "gA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/keycard_auth{ + pixel_y = 28 }, +/obj/structure/table, +/obj/item/card/id/captains_spare, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "gB" = ( @@ -2472,8 +2467,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "gD" = ( -/obj/machinery/camera/autoname{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" }, /turf/open/floor/plasteel, /area/cargo/miningoffice) @@ -2497,13 +2495,10 @@ /turf/open/floor/plasteel, /area/construction) "gH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/status_display/evac{ + pixel_y = 32 }, -/obj/machinery/camera/autoname, +/obj/machinery/computer/communications, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "gI" = ( @@ -2547,16 +2542,39 @@ }, /turf/open/floor/plasteel, /area/science) -"hD" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 23 +"hb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, +/obj/machinery/power/apc/auto_name/north, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "0-8" }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"hD" = ( +/obj/structure/closet/secure_closet/chemical, /turf/open/floor/plasteel, /area/medical/chemistry) +"ip" = ( +/obj/machinery/nanite_program_hub/admin, +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"iS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"iW" = ( +/obj/structure/rack, +/obj/item/storage/box/disks_nanite, +/obj/item/nanite_scanner, +/obj/item/nanite_remote, +/obj/item/nanite_remote/comm, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "jb" = ( /obj/machinery/door/airlock, /obj/structure/cable{ @@ -2588,19 +2606,25 @@ /obj/machinery/vending/hydroseeds, /turf/open/floor/grass, /area/service/hydroponics) +"kj" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/cargo/miningoffice) "kk" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-4" }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "2-4" }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-8" }, /turf/open/space, /area/space/nearstation) @@ -2608,9 +2632,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/cable{ - icon_state = "2-4" - }, /turf/open/floor/plasteel, /area/hallway/primary/central) "kG" = ( @@ -2625,9 +2646,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/structure/cable{ - icon_state = "0-8" - }, /obj/machinery/power/apc{ dir = 1; pixel_y = 23 @@ -2635,6 +2653,9 @@ /obj/structure/cable{ icon_state = "0-4" }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "kT" = ( @@ -2650,6 +2671,14 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"lN" = ( +/obj/effect/landmark/blobstart, +/turf/open/floor/plasteel, +/area/commons/storage/primary) +"lV" = ( +/obj/machinery/public_nanite_chamber, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "lX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -2664,6 +2693,12 @@ /obj/structure/filingcabinet/chestdrawer/wheeled, /turf/open/floor/plasteel, /area/cargo/storage) +"nc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "ny" = ( /obj/structure/table, /obj/item/storage/toolbox/syndicate, @@ -2671,8 +2706,15 @@ /area/commons/storage/primary) "ou" = ( /obj/machinery/airalarm/directional/west, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/engineering/atmos) +"oy" = ( +/obj/machinery/door/airlock/public/glass, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/medical/medbay) "oV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -2697,7 +2739,7 @@ dir = 8 }, /obj/machinery/door/airlock/external/glass, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/medical/medbay) "pQ" = ( /obj/structure/cable{ @@ -2710,11 +2752,22 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "qn" = ( +/turf/open/floor/engine, +/area/hallway/secondary/entry) +"qs" = ( +/obj/structure/table, +/obj/item/screwdriver{ + pixel_y = 10 + }, +/turf/open/floor/plasteel, +/area/medical/chemistry) +"qy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-4" }, -/turf/open/floor/plating, -/area/maintenance/department/bridge) +/turf/open/floor/plasteel, +/area/hallway/primary/central) "qZ" = ( /obj/structure/lattice, /obj/structure/lattice/catwalk, @@ -2723,12 +2776,19 @@ }, /turf/open/space, /area/space/nearstation) +"ry" = ( +/obj/docking_port/stationary/random, +/turf/open/space/basic, +/area/space) "rN" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/open/floor/plasteel/freezer, /area/service/cafeteria) +"rW" = ( +/turf/open/floor/plasteel/dark, +/area/science/circuit) "sD" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -2758,6 +2818,34 @@ }, /turf/open/floor/plasteel, /area/service/bar) +"sZ" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/cargo/miningoffice) +"tl" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/construction) +"tA" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"tE" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "up" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -2771,7 +2859,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/engineering/atmos) "vm" = ( /turf/closed/wall/r_wall, @@ -2809,6 +2897,9 @@ dir = 4 }, /obj/machinery/door/airlock/public/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/medical/chemistry) "wb" = ( @@ -2857,6 +2948,12 @@ "xj" = ( /turf/open/floor/plasteel, /area/service/hydroponics) +"xW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "yl" = ( /obj/structure/chair/stool/bar, /obj/structure/cable{ @@ -2868,6 +2965,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/service/bar) +"yx" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "yM" = ( /obj/machinery/vending/wallmed, /turf/closed/wall/r_wall, @@ -2892,11 +2995,23 @@ /turf/open/floor/plasteel, /area/science) "Bl" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/closed/wall/r_wall, -/area/engineering/gravity_generator) +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"Bq" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "mining_home"; + name = "mining shuttle bay"; + roundstart_template = /datum/map_template/shuttle/mining/box; + width = 7 + }, +/turf/open/floor/engine, +/area/cargo/miningoffice) "BB" = ( /obj/machinery/computer/cloning{ dir = 1 @@ -2922,6 +3037,12 @@ /obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/plasteel, /area/command/bridge) +"BP" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "Ce" = ( /turf/open/floor/plasteel, /area/medical/chemistry) @@ -2929,6 +3050,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/service/cafeteria) +"Cs" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/medical/chemistry) "Ct" = ( /obj/structure/closet/syndicate/resources/everything, /turf/open/floor/plasteel, @@ -2987,13 +3117,27 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "Fg" = ( -/turf/open/floor/plasteel, -/area/engineering/atmos) +/obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/engine, +/area/hallway/secondary/entry) "Fy" = ( /obj/machinery/seed_extractor, /turf/open/floor/grass, /area/service/hydroponics) -"Ga" = ( +"FO" = ( +/obj/machinery/door/airlock/research, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/circuit) +"Ga" = ( /obj/machinery/vending/boozeomat, /obj/machinery/airalarm{ dir = 8; @@ -3001,6 +3145,18 @@ }, /turf/open/floor/plasteel, /area/service/bar) +"Gb" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "Gc" = ( /obj/structure/closet/secure_closet/miner/unlocked, /turf/open/floor/plasteel, @@ -3017,6 +3173,12 @@ /obj/item/queen_bee/bought, /turf/open/floor/grass, /area/service/hydroponics) +"HR" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "If" = ( /obj/machinery/rnd/production/techfab/department, /turf/open/floor/plasteel, @@ -3035,6 +3197,13 @@ /obj/structure/chair/stool/bar, /turf/open/floor/carpet/blackred, /area/service/bar) +"Je" = ( +/obj/structure/fans/tiny/invisible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/hallway/secondary/entry) "JF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -3048,15 +3217,18 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "JV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "1-4" }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/service/bar) "Kx" = ( @@ -3066,6 +3238,13 @@ /obj/machinery/light, /turf/open/floor/plating, /area/engineering/atmos) +"KN" = ( +/obj/machinery/light, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/cargo/miningoffice) "Lg" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock" @@ -3079,10 +3258,26 @@ }, /turf/open/floor/carpet/blackred, /area/service/bar) +"Ls" = ( +/obj/machinery/door/airlock, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/cargo/miningoffice) "Ly" = ( /obj/machinery/chem_dispenser/chem_synthesizer, /turf/open/floor/plasteel/dark, /area/medical/chemistry) +"LR" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/cargo/miningoffice) "Mk" = ( /obj/structure/table, /obj/item/book_of_babel, @@ -3145,10 +3340,21 @@ /obj/machinery/rnd/production/protolathe/department, /turf/open/floor/plasteel, /area/science) +"OT" = ( +/obj/machinery/door/airlock/public/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/construction) "OU" = ( /obj/item/disk/tech_disk/debug, /turf/open/floor/plasteel, /area/science) +"Pt" = ( +/obj/machinery/door/airlock/research, +/turf/open/floor/plasteel/dark, +/area/construction) "PD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3156,9 +3362,11 @@ /turf/open/floor/plasteel/freezer, /area/service/cafeteria) "PI" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/space/basic, -/area/space) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "PV" = ( /obj/machinery/vending/dinnerware, /turf/open/floor/plasteel/freezer, @@ -3168,7 +3376,7 @@ dir = 4 }, /obj/machinery/door/airlock/external/glass, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/medical/medbay) "Rb" = ( /obj/effect/spawner/structure/window/reinforced, @@ -3209,6 +3417,19 @@ /obj/item/reagent_containers/glass/beaker/bluespace, /turf/open/floor/grass, /area/service/hydroponics) +"Ti" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/circuit) +"To" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel, +/area/medical/chemistry) "Tp" = ( /obj/structure/cable{ icon_state = "0-2" @@ -3219,6 +3440,10 @@ "Tt" = ( /turf/open/floor/plating, /area/maintenance/aft) +"Ty" = ( +/obj/machinery/computer/nanite_cloud_controller, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "TZ" = ( /turf/closed/wall/r_wall, /area/service/bar) @@ -3229,10 +3454,23 @@ /obj/item/healthanalyzer/advanced, /turf/open/floor/plasteel, /area/medical/medbay) +"UJ" = ( +/obj/machinery/door/airlock, +/turf/open/floor/plasteel/dark, +/area/construction) "Vg" = ( /obj/machinery/light, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"Vq" = ( +/obj/machinery/airalarm/unlocked{ + pixel_y = 23 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "Vy" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3246,10 +3484,18 @@ /obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/engineering/main) +"Wb" = ( +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plasteel/dark, +/area/science/circuit) "Wh" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) +"Wi" = ( +/obj/machinery/door/poddoor, +/turf/open/floor/engine, +/area/hallway/secondary/entry) "WT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3264,6 +3510,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/vending/syndichem, /turf/open/floor/plasteel, /area/medical/chemistry) "Xp" = ( @@ -3275,10 +3522,10 @@ /area/engineering/atmos) "XC" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "2-4" }, /turf/open/floor/plasteel, /area/science) @@ -3293,8 +3540,14 @@ /obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/engineering/atmos) +"Yp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/exit/departure_lounge) "Yy" = ( /obj/machinery/light{ dir = 1 @@ -3309,6 +3562,10 @@ "YB" = ( /turf/open/floor/plasteel/freezer, /area/service/cafeteria) +"Zr" = ( +/obj/machinery/door/poddoor, +/turf/open/floor/engine, +/area/cargo/miningoffice) "ZD" = ( /obj/machinery/suit_storage_unit/ce, /turf/open/floor/plasteel, @@ -3322,195 +3579,11 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 - }, -/turf/open/floor/carpet/blackred, -/area/service/bar) - -(1,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(2,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(3,1,1) = {" + }, +/turf/open/floor/carpet/blackred, +/area/service/bar) + +(1,1,1) = {" aa aa aa @@ -3602,7 +3675,7 @@ aa aa aa "} -(4,1,1) = {" +(2,1,1) = {" aa aa aa @@ -3694,7 +3767,7 @@ aa aa aa "} -(5,1,1) = {" +(3,1,1) = {" aa aa aa @@ -3786,7 +3859,7 @@ aa aa aa "} -(6,1,1) = {" +(4,1,1) = {" aa aa aa @@ -3878,7 +3951,7 @@ aa aa aa "} -(7,1,1) = {" +(5,1,1) = {" aa aa aa @@ -3970,7 +4043,7 @@ aa aa aa "} -(8,1,1) = {" +(6,1,1) = {" aa aa aa @@ -4062,7 +4135,7 @@ aa aa aa "} -(9,1,1) = {" +(7,1,1) = {" aa aa aa @@ -4154,7 +4227,7 @@ aa aa aa "} -(10,1,1) = {" +(8,1,1) = {" aa aa aa @@ -4246,7 +4319,7 @@ aa aa aa "} -(11,1,1) = {" +(9,1,1) = {" aa aa aa @@ -4338,7 +4411,7 @@ aa aa aa "} -(12,1,1) = {" +(10,1,1) = {" aa aa aa @@ -4430,10 +4503,7 @@ aa aa aa "} -(13,1,1) = {" -aa -aa -aa +(11,1,1) = {" aa aa aa @@ -4445,6 +4515,32 @@ aa aa aa aa +em +em +em +em +em +em +em +em +em +em +em +em +en +en +dY +Wi +Wi +Wi +Wi +Wi +Wi +Wi +dY +en +dY +dY aa aa aa @@ -4498,6 +4594,8 @@ aa aa aa aa +"} +(12,1,1) = {" aa aa aa @@ -4509,6 +4607,32 @@ aa aa aa aa +em +ee +ee +ee +ee +ee +LR +ee +ee +ee +kj +em +eh +eh +eh +qn +qn +qn +qn +qn +qn +qn +eh +eh +eh +dY aa aa aa @@ -4521,8 +4645,6 @@ aa aa aa aa -"} -(14,1,1) = {" aa aa aa @@ -4564,6 +4686,8 @@ aa aa aa aa +"} +(13,1,1) = {" aa aa aa @@ -4575,6 +4699,32 @@ aa aa aa aa +Zr +gj +gj +gj +gj +gj +gj +gj +gj +gj +cO +em +eh +eh +eh +qn +qn +qn +qn +qn +qn +qn +eh +eh +eh +en aa aa aa @@ -4613,8 +4763,6 @@ aa aa aa aa -"} -(15,1,1) = {" aa aa aa @@ -4630,6 +4778,8 @@ aa aa aa aa +"} +(14,1,1) = {" aa aa aa @@ -4641,6 +4791,32 @@ aa aa aa aa +Zr +gj +gj +gj +gj +gj +gj +gj +gj +gj +cO +em +eh +eh +eh +qn +qn +qn +qn +qn +qn +qn +eh +eh +eh +en aa aa aa @@ -4694,6 +4870,8 @@ aa aa aa aa +"} +(15,1,1) = {" aa aa aa @@ -4705,8 +4883,32 @@ aa aa aa aa -"} -(16,1,1) = {" +Zr +gj +gj +gj +gj +gj +gj +gj +gj +gj +KN +em +ej +eh +eh +qn +qn +qn +qn +qn +qn +qn +eh +eh +eh +dY aa aa aa @@ -4727,7 +4929,6 @@ aa aa aa aa -gj aa aa aa @@ -4761,6 +4962,8 @@ aa aa aa aa +"} +(16,1,1) = {" aa aa aa @@ -4772,6 +4975,32 @@ aa aa aa aa +Zr +gj +gj +gj +gj +gj +gj +gj +gj +gj +cO +em +eh +eh +eh +qn +qn +qn +qn +qn +qn +qn +eh +eh +eh +en aa aa aa @@ -4797,8 +5026,6 @@ aa aa aa aa -"} -(17,1,1) = {" aa aa aa @@ -4817,11 +5044,6 @@ aa aa aa aa -em -eX -ee -eX -em aa aa aa @@ -4832,6 +5054,8 @@ aa aa aa aa +"} +(17,1,1) = {" aa aa aa @@ -4843,6 +5067,32 @@ aa aa aa aa +Zr +gj +gj +gj +gj +gj +Bq +gj +gj +gj +eX +em +eh +eh +eh +qn +qn +qn +qn +qn +qn +qn +eh +eh +eh +en aa aa aa @@ -4889,8 +5139,6 @@ aa aa aa aa -"} -(18,1,1) = {" aa aa aa @@ -4898,6 +5146,8 @@ aa aa aa aa +"} +(18,1,1) = {" aa aa aa @@ -4911,23 +5161,30 @@ aa aa em gh +gh +gh +gh +gh +sZ +gh +gh gl gD -em -dY -dY -dY -aa -aa -aa -aa -aa -aa -aa -dY -dY -dY -dY +Ls +yx +bj +eh +qn +qn +qn +qn +qn +qn +qn +eh +eh +eh +en aa aa aa @@ -4994,29 +5251,29 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +em +em +em +em +em +em +em em gi gm go gp -ei +iS gr -dY -aa -aa -aa -aa -aa -aa -aa -dY +eh +qn +qn +qn +qn +qn +qn +qn +eh eh eh dY @@ -5091,24 +5348,24 @@ aa aa aa aa -aa -aa db dY dY dY dY +dY +dY eh eq -en -aa -aa -aa -aa -aa -aa -aa -en +eh +qn +qn +qn +qn +qn +qn +qn +eh eh eh en @@ -5183,24 +5440,24 @@ aa aa aa aa -aa -aa -aa -aa -PI +Fg +Bl +Bl +Bl +Bl dj ed eh eq -en -aa -aa -aa -aa -aa -aa -aa -en +eh +qn +qn +qn +qn +qn +qn +qn +eh eh eh en @@ -5273,26 +5530,26 @@ aa aa aa aa -aa +ry aa el -aa -aa -aa +dV +dV +dV fi dP ex eh eq -eo -aa -aa -aa -aa -aa -aa -aa -eo +eh +qn +qn +qn +qn +qn +qn +qn +eh eh gv dY @@ -5367,24 +5624,24 @@ aa aa aa aa -aa -aa -aa -aa +Je +PI +PI +PI PI dV dY ej eq -en -aa -aa -aa -aa -aa -aa -aa -en +eh +qn +qn +qn +qn +qn +qn +qn +eh eh eh en @@ -5459,24 +5716,24 @@ aa aa aa aa -fg -aa db dY dY dY dY +dY +dY eh eq -en -aa -aa -aa -aa -aa -aa -aa -en +eh +qn +qn +qn +qn +qn +qn +qn +eh eh gF fj @@ -5560,15 +5817,15 @@ aa dY gE eq -dY -aa -aa -aa -aa -aa -aa -aa -dY +eh +qn +qn +qn +qn +qn +qn +qn +eh eh eh en @@ -5652,15 +5909,15 @@ aa dY gq gs -dY -aa -aa -aa -aa -aa -aa -aa -dY +eh +qn +qn +qn +qn +qn +qn +qn +eh eh gw dY @@ -5744,15 +6001,15 @@ aa dY eh eq -en -aa -aa -aa -aa -aa -aa -aa -en +eh +qn +qn +qn +qn +qn +qn +qn +eh eh ek en @@ -5836,15 +6093,15 @@ aa dY eh gt -en -aa -aa -aa -aa -aa -aa -aa -en +eh +qn +qn +qn +qn +qn +qn +qn +eh eh ek en @@ -5928,15 +6185,15 @@ aa dY ej gt -eo -aa -aa -aa -aa -aa -aa -aa -eo +eh +qn +qn +qn +qn +qn +qn +qn +eh eh ek en @@ -6019,16 +6276,16 @@ aa aa dY eh -gt -en -aa -aa -aa -aa -aa -aa -aa -en +gt +eh +qn +qn +qn +qn +qn +qn +qn +eh eh gx dY @@ -6112,15 +6369,15 @@ aa dY eh gt -dh -aa -aa -aa +eh +qn +qn +qn ec -aa -aa -aa -dY +qn +qn +qn +eh eh ek en @@ -6204,7 +6461,7 @@ ag ag eh gt -dh +eh dh en en @@ -6212,7 +6469,7 @@ en en en dY -dY +eh eh ek dY @@ -6405,7 +6662,7 @@ eL eL eL eL -eL +Gb fd eL vs @@ -6497,7 +6754,7 @@ eh eh eh eh -eh +gt eh eh ge @@ -6589,7 +6846,7 @@ cN cN cN cN -fI +FO dY dY ge @@ -6653,10 +6910,10 @@ aa aa ah ut -Fg +aw ou -Fg -Fg +aw +aw Kx ah bs @@ -6666,8 +6923,8 @@ If bA kn fu -bO -cO +bE +cN cW dm dy @@ -6681,9 +6938,9 @@ dy dm dK cN -Tt -vm -fg +hb +tE +cj NC NC YB @@ -6758,7 +7015,7 @@ AP pA kQ fv -bN +qy cP cX dn @@ -6772,11 +7029,11 @@ dn dn dn dL -cN -Tt -vm -fg -aa +UJ +xW +rW +rW +BP NC Nw rN @@ -6850,9 +7107,9 @@ gY jb ES bE -bE -cQ -cY +HR +OT +tl dn dn dn @@ -6865,10 +7122,10 @@ dn dn dL cN -Tt -vm -fg -aa +Wb +lV +Ty +eo NC PV NL @@ -6956,11 +7213,11 @@ dn dn dn dL -cN -Tt -vm -fg -aa +Pt +rW +rW +tA +rW NC NC Cr @@ -7049,11 +7306,11 @@ dn dn dL cN -Tt -vm -fg -aa -aa +rW +iW +cU +ip +Ti aa aa aa @@ -7141,11 +7398,11 @@ dn dn dL cN -Tt -vm -fg -aa -aa +fI +er +Ti +Ti +Ti aa aa aa @@ -7234,7 +7491,7 @@ dn dZ cN Tt -Rb +vm fg aa aa @@ -7326,7 +7583,7 @@ dn dL cN Tt -Rb +vm fg aa aa @@ -7418,7 +7675,7 @@ dn dL cN Tt -Rb +vm fg aa aa @@ -7785,10 +8042,10 @@ cS cS cS cS -fI -ga -ga -ga +Tt +Rb +aa +aa aa aa aa @@ -7877,10 +8134,10 @@ dl dp dE cS -fO -fO -fO -gf +Tt +vm +aa +aa aa aa aa @@ -7949,7 +8206,7 @@ bd bo aj hD -cj +pQ ct Ce cF @@ -7969,10 +8226,10 @@ dC dC eI vv -fO -fO -fO -fb +Tt +vm +aa +aa aa aa aa @@ -8045,8 +8302,8 @@ fL ch cs cT -cU -cU +bN +bN da fK dJ @@ -8061,10 +8318,10 @@ dJ dJ eD cS -fO -fO -fO -gf +Tt +vm +aa +aa aa aa aa @@ -8133,9 +8390,9 @@ bf bp aj bP -pQ -JF Ce +JF +pQ oV bE bE @@ -8153,11 +8410,11 @@ dJ dJ ny cS -fP -fO -fO -fb -aa +fI +ga +ga +ga +ga aa aa aa @@ -8225,11 +8482,11 @@ ak ak ak bQ -pQ Ce Ce +Cs vP -bE +bO Vg cS fy @@ -8245,7 +8502,8 @@ dJ dJ dO cS -gz +fO +fO fO fO gf @@ -8292,7 +8550,6 @@ aa aa aa aa -aa "} (55,1,1) = {" aa @@ -8317,13 +8574,13 @@ bg bq ak bR -pQ -Ce -Ce +fP +fP +To oV bE -bE -cV +HR +fQ fz ds dJ @@ -8337,11 +8594,11 @@ dJ dJ jU cS -fQ fO fO -ga -aa +fO +fO +fb aa aa aa @@ -8400,8 +8657,8 @@ aa aa aa ad -qn -Bl +af +ak at aH aW @@ -8409,9 +8666,9 @@ bh br ak bS -pQ Ce Ce +pQ oV bE bE @@ -8423,17 +8680,17 @@ dD dJ dI dJ -dJ +lN dJ dJ dJ ea cS -fS fO fO -gk -aa +fO +fO +gf aa aa aa @@ -8501,9 +8758,9 @@ aI aI ak Ly -pQ +qs Xg -Ce +pQ oV bE bE @@ -8522,10 +8779,10 @@ dJ dN cS fU -gb fO -ga -aa +fO +fO +fb aa aa aa @@ -8595,7 +8852,7 @@ by by ck by -cx +oy cG cx by @@ -8616,6 +8873,7 @@ cS gA fO fO +fO gf aa aa @@ -8660,7 +8918,6 @@ aa aa aa aa -aa "} (59,1,1) = {" aa @@ -8686,8 +8943,8 @@ av by bU cl -cu -cu +cl +eO cH cu cJ @@ -8708,8 +8965,8 @@ cS gH fO fO -fb -fp +fO +ga aa aa aa @@ -8797,11 +9054,11 @@ dJ dJ eD cS -fV -fO +fS +nc +gb fO -gf -aa +gk aa aa aa @@ -8890,10 +9147,10 @@ fG fH fR fW +Yp fO fO -fb -aa +ga aa aa aa @@ -8981,6 +9238,7 @@ dl dx dE cS +fV fO fO fO @@ -9028,7 +9286,6 @@ aa aa aa aa -aa "} (63,1,1) = {" aa @@ -9073,12 +9330,12 @@ cS cS cS cS -ga -ga -ga -ga -aa -aa +gz +fO +fO +fO +fb +fp aa aa aa @@ -9149,7 +9406,7 @@ af by cz by -er +cm es by eu @@ -9165,11 +9422,11 @@ nb Go Gc et -aa -aa -aa -aa -aa +Vq +fO +fO +fO +gf aa aa aa @@ -9257,11 +9514,11 @@ fo eu eu et -aa -aa -aa -aa -aa +fO +fO +fO +fO +fb aa aa aa @@ -9349,11 +9606,11 @@ fm fm ev et -aa -aa -aa -aa -aa +fO +fO +fO +fO +gf aa aa aa @@ -9441,11 +9698,11 @@ fh fh fh et -aa -aa -aa -aa -aa +ga +ga +ga +ga +ga aa aa aa diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 3ed503557963..8965cbf5bb2b 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -90,15 +90,9 @@ icon_state = "wood" }, /area/holodeck/rec_center/lounge) -"ap" = ( -/turf/open/floor/holofloor/basalt, -/area/holodeck/rec_center/wildlife) "aq" = ( /turf/open/floor/holofloor/plating, /area/holodeck/rec_center/offline) -"ar" = ( -/turf/open/indestructible/binary, -/area/holodeck/rec_center/burn) "as" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -177,14 +171,6 @@ icon_state = "wood" }, /area/holodeck/rec_center/lounge) -"aB" = ( -/obj/effect/holodeck_effect/mobspawner/funclaw, -/turf/open/floor/holofloor/basalt, -/area/holodeck/rec_center/wildlife) -"aC" = ( -/obj/effect/holodeck_effect/sparks, -/turf/open/indestructible/binary, -/area/holodeck/rec_center/burn) "aD" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -412,10 +398,6 @@ /obj/structure/window/reinforced, /turf/closed/indestructible/riveted, /area/space) -"bk" = ( -/obj/effect/holodeck_effect/mobspawner/bumbles, -/turf/open/floor/holofloor/asteroid, -/area/holodeck/rec_center/anthophila) "bl" = ( /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/pet_lounge) @@ -751,11 +733,6 @@ icon_state = "white" }, /area/holodeck/rec_center/medical) -"ce" = ( -/obj/effect/holodeck_effect/mobspawner/bumbles, -/obj/item/clothing/head/beekeeper_head, -/turf/open/floor/holofloor/asteroid, -/area/holodeck/rec_center/anthophila) "cf" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder, @@ -855,17 +832,6 @@ }, /turf/open/floor/holofloor, /area/holodeck/rec_center/dodgeball) -"cq" = ( -/obj/effect/holodeck_effect/mobspawner/bumbles, -/obj/effect/decal/remains/human, -/obj/item/clothing/suit/beekeeper_suit, -/turf/open/floor/holofloor/asteroid, -/area/holodeck/rec_center/anthophila) -"cr" = ( -/obj/effect/holodeck_effect/mobspawner/bumbles, -/obj/item/melee/flyswatter, -/turf/open/floor/holofloor/asteroid, -/area/holodeck/rec_center/anthophila) "cs" = ( /obj/machinery/chem_master, /turf/open/floor/holofloor{ @@ -2100,6 +2066,14 @@ }, /turf/closed/indestructible/riveted, /area/space) +"fy" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "rock4" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "fz" = ( /turf/open/floor/plasteel, /area/tdome/arena_source) @@ -2231,9 +2205,9 @@ /turf/open/floor/plasteel, /area/tdome/arena_source) "fR" = ( -/obj/machinery/vending/boozeomat/syndicate_access, -/turf/open/floor/wood, -/area/slavers) +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/centcom/evac) "fS" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -2275,6 +2249,9 @@ }, /turf/open/floor/plasteel, /area/tdome/arena_source) +"fX" = ( +/turf/closed/indestructible/start_area, +/area/start) "fY" = ( /obj/effect/landmark/start/new_player, /turf/open/floor/plating, @@ -2918,6 +2895,14 @@ /obj/machinery/capture_the_flag/red, /turf/open/floor/circuit/green/anim, /area/ctf) +"hH" = ( +/obj/structure/dresser, +/obj/item/clothing/neck/petcollar/casino{ + pixel_x = -1; + pixel_y = 11 + }, +/turf/open/floor/wood, +/area/slavers) "hI" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -3245,19 +3230,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/control) -"iA" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/centcom/prison) "iB" = ( /turf/closed/indestructible/fakedoor{ name = "CentCom Cell" @@ -3524,14 +3496,6 @@ }, /turf/open/floor/plasteel, /area/centcom/control) -"ji" = ( -/obj/machinery/vending/security, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/centcom/control) "jj" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -3685,14 +3649,8 @@ /turf/open/floor/plasteel, /area/centcom/control) "jA" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/slavers) +/turf/open/indestructible/hotelwood, +/area/ruin/powered) "jB" = ( /obj/structure/noticeboard{ dir = 8; @@ -3846,14 +3804,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/control) -"jT" = ( -/obj/machinery/computer/security, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/centcom/control) "jU" = ( /obj/machinery/computer/secure_data, /obj/effect/turf_decal/stripes/line, @@ -4328,21 +4278,6 @@ icon_state = "alien19" }, /area/abductor_ship) -"kR" = ( -/obj/structure/bed{ - dir = 8 - }, -/obj/item/bedsheet/hos{ - desc = "A fancy red bedsheet."; - dir = 1; - name = "red bedsheet" - }, -/obj/effect/landmark/start/slaver, -/obj/structure/sign/poster/contraband/syndicate_recruitment{ - pixel_y = 32 - }, -/turf/open/floor/wood, -/area/slavers) "kS" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -4505,14 +4440,6 @@ /obj/machinery/vending/autodrobe, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"lm" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock5" - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" - }, -/area/slavers) "ln" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/brown, @@ -4849,20 +4776,6 @@ /obj/item/reagent_containers/rag/towel, /turf/open/floor/carpet/royalblue, /area/centcom/holding) -"mb" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/centcom/supply) "mc" = ( /obj/machinery/computer/auxillary_base{ pixel_y = 32 @@ -5101,14 +5014,6 @@ /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/indestructible/rock/snow, /area/syndicate_mothership) -"mC" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "mD" = ( /turf/closed/indestructible/riveted, /area/centcom/ferry) @@ -5385,28 +5290,19 @@ }, /area/abductor_ship) "ng" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 }, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/brute{ - pixel_x = -3; - pixel_y = -3 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/obj/effect/turf_decal/arrows/red{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/turf/open/floor/plasteel/dark/side{ + dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"nh" = ( -/turf/open/indestructible/hotelwood, -/area/ruin/powered) +/area/slavers/export) "ni" = ( /obj/machinery/newscaster/security_unit, /turf/closed/indestructible/riveted, @@ -5578,6 +5474,17 @@ /obj/structure/flora/bush, /turf/open/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) +"ny" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/flora/rock/jungle{ + icon_state = "rock4" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "nz" = ( /obj/machinery/light/small{ brightness = 3; @@ -6815,18 +6722,14 @@ /turf/open/floor/plasteel/dark, /area/centcom/control) "px" = ( -/obj/structure/rack{ - icon = 'icons/obj/stationobjs.dmi'; - icon_state = "minibar_left"; - name = "skeletal minibar" - }, -/obj/machinery/chem_dispenser/drinks{ - pixel_x = 1 +/obj/machinery/computer/shuttle/slaver/recall, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel/dark, /area/slavers) "py" = ( /obj/machinery/smartfridge, @@ -6865,15 +6768,37 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "pD" = ( -/obj/structure/rack{ - icon = 'icons/obj/stationobjs.dmi'; - icon_state = "minibar_right"; - name = "skeletal minibar" +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/obj/machinery/chem_dispenser/drinks/beer{ - pixel_x = -2 +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/turf/open/floor/wood, +/obj/structure/closet/slaver, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/slavers) +"pE" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses{ + pixel_y = 14; + pixel_x = -4 + }, +/obj/item/reagent_containers/borghypo/borgshaker{ + pixel_x = -10; + pixel_y = -8 + }, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) +"pF" = ( +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "pG" = ( /obj/machinery/biogenerator, @@ -7021,6 +6946,18 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"pS" = ( +/obj/effect/turf_decal/arrows/red, +/obj/effect/turf_decal/trimline/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/slavers/export) "pU" = ( /obj/structure/sign/map/right{ pixel_y = -32 @@ -7043,10 +6980,6 @@ /obj/effect/landmark/ai_multicam_room, /turf/open/ai_visible, /area/ai_multicam_room) -"pY" = ( -/obj/item/chair, -/turf/open/floor/plasteel, -/area/slavers) "pZ" = ( /obj/machinery/washing_machine, /turf/open/floor/plasteel/freezer, @@ -7113,11 +7046,18 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "qh" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock2" +/obj/structure/closet/crate/bin, +/obj/effect/spawner/lootdrop/prison_contraband, +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/spawner/lootdrop/prison_contraband, +/obj/effect/spawner/lootdrop/prison_contraband, +/turf/open/floor/plasteel/dark/side{ + dir = 8 }, /area/slavers) "qi" = ( @@ -7386,6 +7326,13 @@ /obj/machinery/washing_machine, /turf/open/floor/plasteel/white, /area/centcom/holding) +"qH" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "slavers_cell3" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/slavers) "qI" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ @@ -7393,25 +7340,41 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) -"qK" = ( -/obj/structure/punching_bag, +"qL" = ( /obj/effect/turf_decal/tile/bar{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ +/obj/machinery/computer/mech_bay_power_console{ dir = 4 }, -/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/slavers) "qN" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/centcom{ + name = "Auxiliary Storage"; + req_access_txt = "152" + }, +/turf/open/floor/plating, /area/slavers) +"qO" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/centcom/evac) "qQ" = ( /obj/machinery/door/airlock/centcom{ name = "Administrative Office"; @@ -7498,6 +7461,16 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) +"re" = ( +/obj/structure/table, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/kitchen/rollingpin, +/turf/open/floor/plasteel/cafeteria, +/area/slavers) "rf" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -7522,6 +7495,11 @@ /obj/item/pen/fountain, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"ri" = ( +/obj/effect/decal/cleanable/oil, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/slavers) "rl" = ( /obj/machinery/computer/auxillary_base{ pixel_y = 32 @@ -7998,6 +7976,37 @@ }, /turf/open/floor/engine/cult, /area/wizard_station) +"rY" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel/dark, +/area/slavers) +"rZ" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/brute, +/turf/open/indestructible/hotelwood, +/area/ruin/powered) +"sa" = ( +/obj/machinery/door/airlock/centcom{ + name = "Cell 1" + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, +/area/slavers) +"sb" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/structure/chair, +/turf/open/floor/plasteel/dark, +/area/slavers) "sc" = ( /obj/docking_port/stationary{ area_type = /area/syndicate_mothership/control; @@ -8016,6 +8025,12 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"sh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "si" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/beer{ @@ -8032,6 +8047,24 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) +"sj" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/structure/weightmachine/weightlifter, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "sk" = ( /obj/machinery/door/airlock/wood{ name = "Bathroom" @@ -8039,23 +8072,17 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/holding) "sm" = ( -/obj/structure/sign/poster/contraband/tools, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 +/obj/machinery/computer/slavery{ + dir = 4 }, -/area/ruin/powered) -"sp" = ( /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/bar{ - dir = 4 + dir = 8 }, -/obj/structure/chair, /turf/open/floor/plasteel/dark, -/area/slavers) +/area/slavers/export) "sq" = ( /obj/machinery/computer/shuttle/white_ship{ dir = 4 @@ -8383,15 +8410,6 @@ }, /turf/open/floor/plasteel, /area/centcom/evac) -"sP" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/centcom/evac) "sQ" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -8508,6 +8526,15 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) +"tf" = ( +/obj/structure/table/wood, +/obj/machinery/microwave{ + pixel_x = -3; + pixel_y = 5; + desc = "Cooks and boils stuff, somehow." + }, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "tg" = ( /obj/machinery/shower{ dir = 4 @@ -8515,40 +8542,20 @@ /obj/item/soap/syndie, /turf/open/floor/plasteel/freezer, /area/syndicate_mothership) -"ti" = ( -/obj/structure/dresser, -/obj/item/clothing/neck/petcollar/casino{ - pixel_x = -1; - pixel_y = 11 - }, -/turf/open/floor/wood, -/area/slavers) -"tj" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "grassb5" - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, -/area/slavers) -"tk" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/rglass{ - amount = 50; - pixel_x = 2; - pixel_y = -1 +"th" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -3; - pixel_y = -2 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/structure/rack, -/obj/effect/turf_decal/tile/bar{ +/turf/open/floor/plasteel/dark/side{ dir = 8 }, -/turf/open/floor/plasteel/dark, +/area/slavers) +"tj" = ( +/obj/machinery/deepfryer, +/turf/open/floor/plasteel/cafeteria, /area/slavers) "tl" = ( /obj/effect/turf_decal/stripes/corner, @@ -8560,6 +8567,13 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) +"tn" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Showers" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/slavers) "to" = ( /obj/machinery/computer/shuttle/ferry{ dir = 4 @@ -8619,6 +8633,18 @@ "tv" = ( /turf/open/floor/holofloor/wood, /area/holodeck/rec_center/wrestlingarena) +"tw" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/closet/slaver, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/slavers) "tx" = ( /obj/structure/table/wood, /obj/item/storage/dice, @@ -8854,11 +8880,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/indestructible/riveted, /area/centcom/control) -"tQ" = ( -/turf/closed/indestructible/fakedoor{ - name = "External Access" - }, -/area/slavers) "tR" = ( /obj/machinery/status_display/ai, /turf/closed/indestructible/riveted, @@ -8909,34 +8930,34 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel, /area/centcom/supplypod) -"tZ" = ( -/obj/structure/bed{ - dir = 8 +"ub" = ( +/obj/structure/rack, +/obj/item/electropack/shockcollar/slave{ + pixel_x = -2; + pixel_y = -2 }, -/obj/item/bedsheet/syndie{ - dir = 8 +/obj/item/electropack/shockcollar/slave{ + pixel_x = 2; + pixel_y = 4 }, -/obj/effect/landmark/start/slaver_leader, -/turf/open/floor/wood, -/area/slavers) -"ua" = ( -/obj/structure/fans/tiny/invisible, -/obj/structure/railing/corner{ - dir = 8 +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/area/slavers) -"ub" = ( -/mob/living/simple_animal/bot/medbot{ - desc = "A little medical robot, with the NT logo hidden by stickers. You can make out the word \"Stolen!\" written with a pen on its chassis."; - name = "Candybox"; - radio_key = null; - skin = null; - stationary_mode = 1 +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/turf/open/floor/plasteel, +/obj/item/electropack/shockcollar/slave, +/obj/machinery/power/apc{ + cell_type = /obj/item/stock_parts/cell/infinite; + name = "Slaver Hideout APC"; + pixel_x = 28; + start_charge = 100 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "uc" = ( /obj/effect/turf_decal/tile/green{ @@ -8976,9 +8997,16 @@ /turf/open/floor/carpet/royalblue, /area/centcom/holding) "ui" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/machinery/vending/coffee, +/obj/machinery/newscaster{ + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/slavers) "uj" = ( @@ -9274,16 +9302,27 @@ /obj/item/storage/box/lights/mixed, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"uI" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) "uJ" = ( /obj/effect/baseturf_helper/asteroid/snow, /turf/closed/indestructible/riveted, /area/syndicate_mothership) -"uK" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/splurt_space_law, -/obj/item/taperecorder, -/turf/open/floor/plasteel/grimy, -/area/centcom/ferry) +"uL" = ( +/obj/machinery/vending/sustenance, +/turf/open/floor/plasteel, +/area/slavers) "uM" = ( /obj/structure/mirror{ pixel_x = -28 @@ -9296,9 +9335,11 @@ /turf/open/floor/plasteel/freezer, /area/syndicate_mothership) "uN" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/carpet/red, -/area/slavers) +/obj/machinery/light{ + dir = 4 + }, +/turf/open/indestructible/hotelwood, +/area/ruin/powered) "uO" = ( /obj/machinery/door/airlock/centcom{ name = "Shuttle Control Office"; @@ -9521,9 +9562,6 @@ }, /turf/open/floor/plasteel, /area/centcom/evac) -"vh" = ( -/turf/open/floor/plasteel, -/area/centcom/evac) "vi" = ( /obj/docking_port/stationary{ dir = 4; @@ -9577,6 +9615,24 @@ }, /turf/open/floor/carpet/red, /area/centcom/holding) +"vq" = ( +/turf/open/floor/padded, +/area/slavers) +"vr" = ( +/obj/structure/sign/poster/contraband/yes_erp{ + pixel_y = 32 + }, +/obj/structure/table, +/obj/structure/bedsheetbin, +/turf/open/floor/plasteel/white, +/area/slavers) +"vs" = ( +/obj/structure/fans/tiny/invisible, +/obj/effect/decal/remains/xeno, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "vt" = ( /obj/structure/rack, /obj/item/nullrod/claymore/katana{ @@ -9593,6 +9649,13 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) +"vv" = ( +/obj/structure/railing/corner, +/obj/structure/flora/junglebush, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "vw" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -9615,9 +9678,16 @@ /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) "vz" = ( -/obj/effect/turf_decal/tile/red, -/obj/machinery/recharge_station, -/turf/open/floor/plasteel/dark, +/obj/structure/table/wood, +/obj/item/toy/prize/mauler{ + pixel_x = -3; + pixel_y = 14 + }, +/obj/item/toy/figure/syndie{ + pixel_x = 5; + pixel_y = 1 + }, +/turf/open/floor/wood, /area/slavers) "vA" = ( /obj/effect/spawner/structure/window/reinforced, @@ -9974,19 +10044,27 @@ }, /turf/open/floor/carpet, /area/wizard_station) +"we" = ( +/obj/structure/sign/poster/contraband/bulldog, +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 + }, +/area/ruin/powered) "wf" = ( -/turf/open/floor/plasteel, -/area/slavers) +/obj/structure/table/reinforced, +/obj/item/book/manual/splurt_space_law, +/obj/item/taperecorder, +/turf/open/floor/plasteel/grimy, +/area/centcom/ferry) "wg" = ( -/obj/structure/bed{ +/obj/effect/turf_decal/tile/bar{ dir = 4 }, -/obj/item/bedsheet/hos{ - desc = "A fancy red bedsheet."; - name = "red bedsheet" - }, -/obj/effect/landmark/start/slaver, -/turf/open/floor/wood, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/box/white, +/turf/open/floor/plasteel/dark, /area/slavers) "wh" = ( /obj/effect/turf_decal/delivery, @@ -10001,6 +10079,12 @@ /obj/item/bedsheet/random, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"wk" = ( +/obj/machinery/door/airlock/centcom{ + name = "Broadcasting Cell" + }, +/turf/open/floor/padded, +/area/slavers) "wl" = ( /obj/structure/table/wood, /obj/item/paicard, @@ -10020,9 +10104,19 @@ /turf/open/floor/plasteel, /area/syndicate_mothership) "wo" = ( -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table/optable, +/obj/effect/turf_decal/bot_white, +/obj/item/surgical_drapes, +/turf/open/floor/plasteel/dark, /area/slavers) "wp" = ( /turf/open/floor/plasteel/dark, @@ -10270,27 +10364,21 @@ /obj/item/toy/cards/deck, /turf/open/floor/carpet, /area/wizard_station) -"wR" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/splurt_space_law, -/obj/item/taperecorder, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/centcom/ferry) "wT" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/plasteel, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/item/storage/bag/tray/cafeteria, +/obj/structure/table, +/turf/open/floor/plasteel/cafeteria, /area/slavers) "wU" = ( /obj/machinery/door/airlock/wood{ @@ -10299,13 +10387,6 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"wV" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "slavers_cell3" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/slavers) "wX" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -10322,19 +10403,6 @@ /obj/item/canvas/twentythreeXtwentythree, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"wZ" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/machinery/vending/coffee, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "xa" = ( /obj/machinery/door/window/northright{ dir = 4; @@ -10553,17 +10621,13 @@ /turf/open/floor/carpet, /area/wizard_station) "xA" = ( -/obj/structure/table/wood, -/obj/item/toy/prize/mauler{ - pixel_x = -3; - pixel_y = 14 - }, -/obj/item/toy/figure/syndie{ - pixel_x = 5; - pixel_y = 1 +/obj/structure/sign/poster/official/wtf_is_co2, +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 }, -/turf/open/floor/wood, -/area/slavers) +/area/ruin/powered) "xB" = ( /obj/machinery/button/door{ id = "Ninja3"; @@ -10574,9 +10638,48 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"xC" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "xD" = ( -/obj/structure/lattice/catwalk, -/turf/open/water/decorative, +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/three) +"xE" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 28 + }, +/obj/machinery/computer/operating, +/turf/open/floor/plasteel/dark, +/area/slavers) +"xF" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/slavers) "xG" = ( /obj/structure/closet/syndicate/personal, @@ -10595,9 +10698,9 @@ /turf/open/floor/plasteel/dark, /area/syndicate_mothership) "xK" = ( -/obj/effect/decal/remains/xeno/larva, +/obj/structure/flora/junglebush, /turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" + icon_state = "layenia1" }, /area/slavers) "xL" = ( @@ -10613,24 +10716,24 @@ /obj/item/storage/bag/trash, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"xN" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +"xM" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" }, -/obj/machinery/vending/snack/green, -/turf/open/floor/plasteel/dark, /area/slavers) "xO" = ( -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia1" +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "slavers_cell2" }, +/turf/open/floor/plating, /area/slavers) "xP" = ( -/turf/open/floor/plating/rust, +/turf/open/floor/plasteel, /area/slavers) "xQ" = ( /obj/effect/turf_decal/delivery, @@ -10756,12 +10859,11 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "ye" = ( -/obj/structure/railing/corner{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/structure/fans/tiny/invisible, -/turf/open/water/decorative, -/area/slavers) +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) "yf" = ( /obj/structure/closet/crate/freezer/blood, /turf/open/floor/plasteel/white, @@ -10770,13 +10872,29 @@ /obj/structure/chair, /turf/open/floor/mineral/titanium, /area/centcom/evac) +"yh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/table, +/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask, +/turf/open/floor/plasteel/dark, +/area/slavers) "yi" = ( -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 +/obj/structure/punching_bag, +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/area/ruin/powered) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/slavers) "yj" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security"; @@ -10790,12 +10908,39 @@ }, /turf/open/floor/plasteel, /area/centcom/control) -"ym" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/line{ +"yk" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark/side{ + dir = 5 + }, +/area/slavers) +"yl" = ( +/obj/effect/turf_decal/vg_decals/numbers/two, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/slavers) +"ym" = ( +/obj/docking_port/stationary{ + area_type = /area/slavers; + dheight = 1; + dir = 8; + dwidth = 10; + height = 15; + id = "slaver_away"; + name = "slave trader hideout"; + roundstart_template = /datum/map_template/shuttle/slaveship/basic; + width = 22 + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia1" + }, /area/slavers) "yn" = ( /obj/effect/spawner/structure/window/reinforced, @@ -11022,6 +11167,11 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/grass, /area/wizard_station) +"yM" = ( +/obj/effect/turf_decal/tile/red, +/obj/machinery/recharge_station, +/turf/open/floor/plasteel/dark, +/area/slavers) "yN" = ( /obj/structure/table/reinforced, /obj/item/paper/pamphlet/centcom/visitor_info, @@ -11033,28 +11183,19 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) -"yR" = ( -/obj/machinery/door/airlock/centcom{ - name = "Dormitories"; - req_access_txt = "152" +"yQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/plasteel, /area/slavers) "yS" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock2" - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, -/area/slavers) -"yT" = ( -/obj/structure/sign/poster/contraband/yes_erp{ - pixel_y = 32 +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/obj/structure/table, -/obj/structure/bedsheetbin, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel/dark/side, /area/slavers) "yU" = ( /obj/machinery/door/firedoor, @@ -11172,16 +11313,10 @@ /turf/open/floor/plasteel/dark, /area/centcom/ferry) "zc" = ( -/obj/effect/turf_decal/tile/bar{ +/obj/structure/toilet{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/caution/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/showroomfloor, /area/slavers) "zd" = ( /obj/item/kirbyplants{ @@ -11322,12 +11457,13 @@ /turf/open/floor/mineral/plastitanium/red, /area/syndicate_mothership) "zt" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock3" +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" +/obj/effect/turf_decal/tile/red{ + dir = 1 }, +/turf/open/floor/plasteel/dark, /area/slavers) "zu" = ( /obj/item/storage/box/drinkingglasses, @@ -11335,20 +11471,9 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/syndicate_mothership) -"zv" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 1 - }, -/area/slavers) "zw" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock5" +/obj/structure/railing/corner{ + dir = 8 }, /turf/open/floor/plating/asteroid/layenia/garden{ icon_state = "layenia2" @@ -11560,17 +11685,6 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) -"zT" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/structure/table, -/obj/machinery/recharger, -/turf/open/floor/plasteel/dark, -/area/slavers) "zU" = ( /obj/structure/closet/crate/freezer, /turf/open/floor/plasteel/cafeteria, @@ -11605,16 +11719,8 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "zZ" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark/side{ - dir = 8 - }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/slavers) "Aa" = ( /turf/open/floor/mech_bay_recharge_floor, @@ -11854,6 +11960,23 @@ /obj/effect/decal/remains/xeno, /turf/open/floor/grass, /area/wizard_station) +"AC" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/slavers) "AD" = ( /obj/machinery/door/airlock/centcom{ name = "Leader's Room"; @@ -11861,14 +11984,21 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) -"AF" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/plasteel/dark, -/area/slavers) "AG" = ( /obj/structure/ladder/unbreakable/binary/space, /turf/open/indestructible/airblock, /area/fabric_of_reality) +"AI" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 10 + }, +/area/slavers/export) "AJ" = ( /obj/structure/chair/comfy/brown{ color = "#596479"; @@ -12080,8 +12210,20 @@ /turf/open/floor/grass, /area/wizard_station) "Bj" = ( -/obj/machinery/light/floor, -/turf/open/floor/pod/light, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_y = 19; + pixel_x = 7 + }, +/obj/item/clothing/mask/cigarette/cigar/havana{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod) +"Bk" = ( +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/dark/corner, /area/slavers) "Bl" = ( /obj/machinery/mech_bay_recharge_port, @@ -12097,45 +12239,58 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Bo" = ( -/obj/item/plant_analyzer{ - pixel_y = 7 - }, -/obj/item/reagent_containers/glass/bucket{ - pixel_x = 6 - }, -/obj/item/cultivator{ - pixel_x = -4; - pixel_y = -3 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/structure/rack, -/turf/open/floor/plasteel/dark, -/area/slavers) +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/tdome/tdomeobserve) "Bp" = ( -/turf/open/floor/wood, -/area/slavers) -"Bq" = ( -/obj/machinery/vending/clothing, -/turf/open/floor/wood, -/area/slavers) -"Bs" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/bar{ +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/slavers) +"Br" = ( +/obj/machinery/door/airlock/external, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/bar{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/vending/tool, -/turf/open/floor/plasteel/dark, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, /area/slavers) -"Bt" = ( -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" +"Bs" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "slavers_cell1" }, +/turf/open/floor/plating, /area/slavers) +"Bt" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/centcom/evac) "Bu" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -12441,13 +12596,6 @@ }, /turf/open/floor/engine/cult, /area/wizard_station) -"BT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/slavers) "BV" = ( /obj/machinery/chem_dispenser/drinks/beer, /turf/closed/indestructible{ @@ -12457,14 +12605,11 @@ }, /area/centcom/holding) "BX" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/obj/structure/fans/tiny/invisible, +/obj/structure/flora/junglebush, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" }, -/obj/machinery/vending/cigarette/syndicate, -/turf/open/floor/plasteel/dark, /area/slavers) "BY" = ( /obj/item/toy/figure/syndie, @@ -12601,19 +12746,29 @@ }, /turf/open/floor/engine/cult, /area/wizard_station) +"Cj" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/slavers) "Ck" = ( -/obj/effect/holodeck_effect/mobspawner/bigmommyclaw, -/turf/open/floor/holofloor/basalt, -/area/holodeck/rec_center/wildlife) -"Cl" = ( -/turf/closed/indestructible/start_area, -/area/start) -"Cn" = ( -/obj/structure/bed/pod{ +/obj/machinery/vr_sleeper, +/turf/open/indestructible/hotelwood, +/area/ruin/powered) +"Cm" = ( +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/plasteel/dark, /area/slavers) +"Co" = ( +/turf/open/floor/holofloor/basalt, +/area/holodeck/rec_center/wildlife) "Cp" = ( /obj/structure/statue/uranium/nuke, /turf/open/floor/plating/asteroid/snow/airless, @@ -12973,12 +13128,16 @@ /turf/open/floor/plasteel/dark, /area/centcom/evac) "CQ" = ( -/obj/machinery/light/floor, -/obj/effect/light_emitter{ - set_cap = 1; - set_luminosity = 4 +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/turf/open/floor/pod/light, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "CR" = ( /obj/machinery/computer/security{ @@ -13032,6 +13191,10 @@ /obj/item/stack/tile/carpet/royalblue/fifty, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"CV" = ( +/obj/structure/railing, +/turf/open/water/decorative, +/area/slavers) "CX" = ( /obj/structure/closet/secure_closet/security, /obj/item/storage/belt/security/full, @@ -13220,19 +13383,16 @@ "Di" = ( /turf/closed/indestructible/riveted, /area/ai_multicam_room) +"Dj" = ( +/obj/effect/decal/remains/xeno/larva, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "Dk" = ( /obj/structure/table, /turf/open/floor/plasteel/cafeteria, /area/syndicate_mothership) -"Dl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark/side{ - dir = 4 - }, -/area/slavers) "Dm" = ( /obj/machinery/door/airlock/wood{ id_tag = "Ninja2"; @@ -13260,7 +13420,15 @@ /turf/open/floor/plasteel, /area/syndicate_mothership) "Dp" = ( -/turf/open/floor/carpet/red, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/centcom{ + name = "Medical Bay"; + req_access_txt = "152" + }, +/turf/open/floor/plating, /area/slavers) "Dq" = ( /obj/machinery/door/airlock/external, @@ -13319,12 +13487,6 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/control) -"Dw" = ( -/obj/structure/table, -/obj/item/instrument/piano_synth, -/obj/item/instrument/harmonica, -/turf/open/floor/plasteel, -/area/slavers) "Dx" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/neutral{ @@ -13356,9 +13518,6 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/evac) -"DA" = ( -/turf/open/floor/plating, -/area/slavers) "DB" = ( /obj/item/storage/box/ids{ pixel_x = 3; @@ -13837,15 +13996,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/engine/cult, /area/wizard_station) -"ED" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "EE" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/tile/neutral{ @@ -14047,6 +14197,21 @@ }, /turf/open/floor/engine/cult, /area/wizard_station) +"EZ" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/roller, +/obj/item/roller{ + pixel_x = 3; + pixel_y = 5 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "Fa" = ( /obj/structure/table/wood, /obj/item/instrument/piano_synth, @@ -14060,6 +14225,21 @@ /obj/structure/chair/stool, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Fc" = ( +/obj/effect/turf_decal/tile/green, +/turf/open/floor/plasteel/dark, +/area/slavers) +"Fd" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_y = 5 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "Fe" = ( /turf/closed/indestructible/wood, /area/centcom/holding) @@ -14078,21 +14258,34 @@ /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "Fi" = ( -/obj/machinery/computer/slavery{ - dir = 4 +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/obj/structure/table, +/obj/item/paper{ + info = "Hey, you, new to kidnapping crew? The name’s Zydras, professional Slaver and here to help you. So! First step is to actually kidnap crewmembers. Take your things from the lockers - especially the **collection tool** - and hop onto the shuttle. I personally recommend docking somewhere close to arrivals that’s still outside of view from an engineer space-walking. It’s a good spot to enter the station as it typically has multiple airlocks. Don’t forget: **Never try to harm people.** You can use your telebaton, flash, the likes, but harming our kidnappees is not going to please the boss. As for intimidation, giving your kidnappees the easy way in can often save a lot of trouble. Don’t bother going against a target that fights back too well - there’s always easier fish. If you really want to slow someone down, you can craft Bolas out of metal and cable cuffs. Helps catch the quick ones! Once they’re stunned down, grab them and put cuffs onto their asses and use your capture tool to send them right back to the shuttle’s holding cell. It’s recommended you kidnap one crew at a time, else they could attempt to break out together. Once we've got a cutie back at our den, all we do is wait for the station to pay the ransom. In the meantime, you can raise our profits by pinning said slave against the Sex research racks at the end of the holding brig. Nets us money, eases their needs, and we’re busting. When you're done taking advantage of your slavetoy, drag them to the export pad and use the computer to return them home. Don't forget to give back their things, as much as it'd be nice to keep those sunglasses, it gets us in more trouble than we want. Good luck, Slaver!"; + name = "Zydras' Guide to the slave trade" }, /turf/open/floor/plasteel/dark, -/area/slavers/export) +/area/slavers) "Fj" = ( /obj/structure/closet/crate/bin, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Fk" = ( +/turf/open/floor/plasteel/showroomfloor, +/area/slavers) +"Fl" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "rock1" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "Fm" = ( /obj/machinery/shower{ dir = 4 @@ -14236,23 +14429,6 @@ }, /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) -"FA" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/turf/open/floor/plasteel, -/area/slavers) -"FB" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/structure/closet/slaver, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/slavers) "FD" = ( /obj/machinery/shower{ dir = 4 @@ -14389,6 +14565,13 @@ }, /turf/open/floor/engine/cult, /area/wizard_station) +"FV" = ( +/obj/machinery/shower{ + pixel_y = 14 + }, +/obj/item/soap/homemade, +/turf/open/floor/plasteel/showroomfloor/shower, +/area/slavers) "FW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -14405,21 +14588,6 @@ }, /turf/open/floor/plasteel/stairs, /area/centcom/holding) -"FY" = ( -/obj/structure/table/plasmaglass, -/obj/item/assembly/signaler{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/dildo/random{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/dildo/knotted{ - pixel_y = 2 - }, -/turf/open/floor/padded, -/area/slavers) "FZ" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -14517,14 +14685,6 @@ }, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) -"Gk" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/tdome/tdomeobserve) "Gl" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/yellow{ @@ -14642,6 +14802,13 @@ }, /turf/open/floor/plasteel/dark, /area/syndicate_mothership) +"GB" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/tdome/tdomeobserve) "GC" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -14843,6 +15010,14 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) +"GN" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table, +/obj/item/book/manual/chef_recipes, +/turf/open/floor/plasteel/cafeteria, +/area/slavers) "GO" = ( /obj/structure/table/wood, /obj/structure/sign/plaques/golden{ @@ -14895,24 +15070,6 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) -"GS" = ( -/obj/structure/table/wood, -/obj/structure/reagent_dispensers/beerkeg, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/tdome/tdomeobserve) "GT" = ( /obj/machinery/vending/cigarette, /obj/effect/turf_decal/tile/neutral{ @@ -14971,15 +15128,15 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"Ha" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 +"GZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/centcom/supplypod) +/turf/open/floor/plasteel/dark, +/area/slavers) "Hb" = ( /obj/structure/sink{ dir = 8; @@ -15048,35 +15205,33 @@ /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) "Hi" = ( -/obj/structure/holohoop{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/slavers) +/obj/effect/holodeck_effect/mobspawner/bumbles, +/obj/item/clothing/head/beekeeper_head, +/turf/open/floor/holofloor/asteroid, +/area/holodeck/rec_center/anthophila) "Hj" = ( /obj/structure/bedsheetbin, /turf/open/indestructible/hotelwood, /area/centcom/holding) "Hk" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets{ + pixel_x = 5; + pixel_y = 15 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/holohoop{ - dir = 8 +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ + pixel_y = 6 }, -/turf/open/floor/plasteel, -/area/slavers) +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "Hl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/toy/beach_ball/holoball{ - pixel_x = 12 +/obj/effect/turf_decal/stripes/white/line{ + dir = 9 }, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/slavers) "Hm" = ( /obj/structure/flora/ausbushes/fernybush, @@ -15237,8 +15392,12 @@ /turf/open/floor/wood, /area/centcom/holding) "Hz" = ( -/obj/effect/turf_decal/tile/green, -/turf/open/floor/plasteel/dark, +/obj/structure/flora/rock/jungle{ + icon_state = "rock5" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia0" + }, /area/slavers) "HA" = ( /obj/structure/sink{ @@ -15374,6 +15533,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) +"HL" = ( +/obj/structure/fans/tiny/invisible, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "HM" = ( /obj/structure/chair, /obj/effect/landmark/thunderdome/observe, @@ -15434,6 +15602,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) +"HQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "HR" = ( /obj/structure/sink{ dir = 4; @@ -15707,21 +15881,12 @@ /turf/closed/indestructible/fakeglass, /area/tdome/tdomeobserve) "Im" = ( -/obj/structure/table/plasmaglass, -/obj/item/camera{ - pixel_y = 11 - }, -/obj/item/restraints/handcuffs/fake/kinky{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/camera_film{ - pixel_x = 9; - pixel_y = 7 - }, -/obj/item/restraints/handcuffs/fake/kinky, -/turf/open/floor/padded, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, /area/slavers) +"In" = ( +/turf/open/floor/circuit/red/off, +/area/slavers/export) "Io" = ( /obj/item/storage/box/matches{ pixel_x = -3; @@ -15788,6 +15953,10 @@ }, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) +"Is" = ( +/obj/structure/lattice, +/turf/open/water/decorative, +/area/slavers) "It" = ( /turf/open/floor/plasteel, /area/tdome/arena) @@ -15921,13 +16090,6 @@ }, /turf/open/floor/plasteel, /area/tdome/arena) -"IK" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/centcom/supplypod) "IL" = ( /obj/effect/landmark/thunderdome/one, /obj/effect/turf_decal/stripes/line{ @@ -16313,9 +16475,6 @@ "JI" = ( /turf/closed/indestructible/fakeglass, /area/tdome/tdomeadmin) -"JJ" = ( -/turf/open/floor/circuit/red/off, -/area/slavers/export) "JK" = ( /obj/machinery/computer/telecrystals/uplinker, /obj/effect/turf_decal/stripes/line{ @@ -16455,17 +16614,16 @@ /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) "JV" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/structure/table/wood, +/obj/item/crowbar/power{ + pixel_y = 15 }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/obj/item/lighter{ + pixel_x = -6; + pixel_y = -2 }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/space_heater, -/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/dark, -/area/slavers) +/area/centcom/supplypod) "JX" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -16473,6 +16631,12 @@ }, /turf/open/floor/plasteel, /area/tdome/tdomeadmin) +"JY" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "JZ" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -16521,12 +16685,27 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) -"Ke" = ( -/obj/effect/turf_decal/tile/bar{ +"Kd" = ( +/obj/structure/chair{ dir = 8 }, +/turf/open/floor/plasteel, +/area/slavers) +"Ke" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/beach_ball/holoball{ + pixel_x = 12 + }, /turf/open/floor/plasteel/dark, /area/slavers) +"Kf" = ( +/obj/structure/sign/poster/contraband/tools, +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 + }, +/area/ruin/powered) "Kg" = ( /turf/closed/indestructible/fakedoor{ name = "Thunderdome Admin" @@ -16543,14 +16722,6 @@ }, /turf/open/floor/plasteel, /area/tdome/tdomeadmin) -"Ki" = ( -/obj/structure/sign/poster/contraband/kudzu, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 - }, -/area/ruin/powered) "Kj" = ( /obj/machinery/door/airlock/external{ name = "Backup Emergency Escape Shuttle" @@ -16571,15 +16742,15 @@ /turf/open/space/basic, /area/space) "Kl" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/machinery/shower{ + pixel_y = 14 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel/showroomfloor/shower, /area/slavers) +"Km" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/holofloor/hyperspace, +/area/centcom/supplypod/supplypod_temp_holding) "Kn" = ( /obj/structure/bookcase/random, /obj/effect/turf_decal/tile/neutral{ @@ -16611,14 +16782,6 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) -"Kp" = ( -/obj/item/toy/beach_ball/holoball, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/slavers) "Kq" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -16797,15 +16960,6 @@ }, /turf/open/floor/plasteel/dark, /area/tdome/tdomeadmin) -"Kz" = ( -/obj/machinery/button/door{ - id = "slavers_cell1"; - name = "privacy shutters"; - pixel_x = 26 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/slavers) "KA" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -16833,13 +16987,12 @@ /turf/closed/indestructible/riveted, /area/tdome/tdomeadmin) "KE" = ( -/obj/machinery/button/door{ - id = "slavers_cell2"; - name = "privacy shutters"; - pixel_x = -26 +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/turf/open/floor/plasteel/dark/corner{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, /area/slavers) "KG" = ( /obj/structure/flora/ausbushes/lavendergrass, @@ -17013,38 +17166,35 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/holding) "Lk" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/table, -/obj/item/paper{ - info = "Hey, you, new to kidnapping crew? The name’s Zydras, professional Slaver and here to help you. So! First step is to actually kidnap crewmembers. Take your things from the lockers - especially the **collection tool** - and hop onto the shuttle. I personally recommend docking somewhere close to arrivals that’s still outside of view from an engineer space-walking. It’s a good spot to enter the station as it typically has multiple airlocks. Don’t forget: **Never try to harm people.** You can use your telebaton, flash, the likes, but harming our kidnappees is not going to please the boss. As for intimidation, giving your kidnappees the easy way in can often save a lot of trouble. Don’t bother going against a target that fights back too well - there’s always easier fish. If you really want to slow someone down, you can craft Bolas out of metal and cable cuffs. Helps catch the quick ones! Once they’re stunned down, grab them and put cuffs onto their asses and use your capture tool to send them right back to the shuttle’s holding cell. It’s recommended you kidnap one crew at a time, else they could attempt to break out together. Once we've got a cutie back at our den, all we do is wait for the station to pay the ransom. In the meantime, you can raise our profits by pinning said slave against the Sex research racks at the end of the holding brig. Nets us money, eases their needs, and we’re busting. When you're done taking advantage of your slavetoy, drag them to the export pad and use the computer to return them home. Don't forget to give back their things, as much as it'd be nice to keep those sunglasses, it gets us in more trouble than we want. Good luck, Slaver!"; - name = "Zydras' Guide to the slave trade" - }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"Ll" = ( -/obj/structure/railing/corner, -/obj/structure/flora/rock/jungle{ - icon_state = "rock1" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) +"Ll" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/showroomfloor, /area/slavers) "Lm" = ( /obj/structure/table, /obj/item/clothing/mask/luchador/tecnicos, /turf/open/floor/holofloor/wood, /area/holodeck/rec_center/wrestlingarena) -"Ln" = ( -/obj/effect/decal/remains/xeno, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" +"Lo" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet{ + anchored = 1; + name = "slave asset storage" }, +/turf/open/floor/plasteel/dark, /area/slavers) "Lp" = ( /obj/structure/chair{ @@ -17059,6 +17209,16 @@ }, /turf/open/floor/wood, /area/centcom/holding) +"Lr" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/machinery/vending/snack/green, +/turf/open/floor/plasteel/dark, +/area/slavers) "Ls" = ( /obj/docking_port/stationary{ dir = 4; @@ -17112,14 +17272,11 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "LD" = ( -/obj/structure/sink/kitchen{ - pixel_y = 16 - }, -/obj/structure/mirror{ - pixel_y = 28 +/obj/structure/toilet{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white, +/obj/effect/decal/cleanable/semen, +/turf/open/floor/plasteel/showroomfloor, /area/slavers) "LE" = ( /obj/structure/table, @@ -17127,13 +17284,11 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "LF" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, -/area/slavers) +/obj/effect/holodeck_effect/mobspawner/bumbles, +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/beekeeper_suit, +/turf/open/floor/holofloor/asteroid, +/area/holodeck/rec_center/anthophila) "LG" = ( /obj/structure/filingcabinet, /turf/open/floor/mineral/titanium/blue, @@ -17147,26 +17302,11 @@ /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "LI" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/paper/guides/jobs/hydroponics, -/obj/item/seeds/onion, -/obj/item/seeds/garlic, -/obj/item/seeds/potato, -/obj/item/seeds/tomato, -/obj/item/seeds/carrot, -/obj/item/seeds/grass, -/obj/item/seeds/ambrosia, -/obj/item/seeds/wheat, -/obj/item/seeds/pumpkin, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/slavers) "LJ" = ( /obj/structure/table, @@ -17279,17 +17419,6 @@ planetary_atmos = 0 }, /area/awaymission/errorroom) -"Mc" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 9 - }, -/area/slavers/export) "Md" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -17389,17 +17518,13 @@ /turf/open/floor/plating, /area/syndicate_mothership) "Ml" = ( -/obj/effect/turf_decal/arrows/red, -/obj/effect/turf_decal/trimline/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 1 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 1 +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/area/slavers/export) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/caution/red, +/turf/open/floor/plasteel/dark, +/area/slavers) "Mm" = ( /turf/open/floor/grass, /area/centcom/holding) @@ -17409,6 +17534,25 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Mp" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/sleeper{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "Mq" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green{ @@ -17424,11 +17568,22 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Mr" = ( -/obj/structure/railing/corner{ +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, +/area/slavers) +"Ms" = ( +/obj/structure/window/reinforced/tinted{ dir = 4 }, -/obj/structure/fans/tiny/invisible, -/turf/open/water/decorative, +/turf/open/floor/plasteel/white, /area/slavers) "Mt" = ( /obj/structure/window/reinforced{ @@ -17440,8 +17595,8 @@ /turf/open/indestructible/boss/air, /area/centcom/holding) "Mu" = ( -/obj/structure/railing, -/turf/open/water/decorative, +/obj/machinery/hydroponics/soil, +/turf/open/floor/grass, /area/slavers) "Mv" = ( /obj/structure/table/reinforced, @@ -17491,26 +17646,14 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "MA" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 +/obj/structure/flora/junglebush, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia0" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, /area/slavers) "MB" = ( /turf/open/indestructible/binary, /area/fabric_of_reality) -"MC" = ( -/obj/machinery/vending/cigarette, -/turf/open/floor/plasteel, -/area/centcom/supplypod) "MD" = ( /obj/effect/light_emitter{ set_cap = 1; @@ -17553,11 +17696,35 @@ /turf/open/floor/plating, /area/syndicate_mothership) "MJ" = ( -/obj/structure/table/wood, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/brute, -/turf/open/indestructible/hotelwood, -/area/ruin/powered) +/obj/structure/rack, +/obj/item/electropack/shockcollar/slave{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/electropack/shockcollar/slave{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/item/electropack/shockcollar/slave, +/turf/open/floor/plasteel/dark, +/area/slavers) +"MK" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel/dark, +/area/slavers) "ML" = ( /obj/structure/table/wood/fancy, /turf/open/indestructible/hotelwood, @@ -17567,16 +17734,20 @@ /turf/open/indestructible/boss/air, /area/centcom/holding) "MN" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/plasteel/dark/side{ - dir = 5 +/turf/open/indestructible/hotelwood, +/area/ruin/powered) +"MO" = ( +/obj/machinery/button/door{ + id = "slavers_cell3"; + name = "privacy shutters"; + pixel_y = -26 }, -/area/slavers/export) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/slavers) "MP" = ( /obj/machinery/light{ dir = 8 @@ -17594,11 +17765,13 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "MR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "slavers_cell1" +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "MS" = ( /obj/structure/table, @@ -17606,11 +17779,7 @@ /turf/open/floor/plasteel/cafeteria, /area/syndicate_mothership) "MT" = ( -/obj/machinery/door/airlock/centcom{ - name = "Cell 2" - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plating/rust, /area/slavers) "MU" = ( /obj/effect/turf_decal/tile/brown{ @@ -17619,14 +17788,6 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/two) -"MV" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock1" - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, -/area/slavers) "MW" = ( /obj/structure/mopbucket, /obj/item/mop, @@ -17646,25 +17807,21 @@ /turf/open/floor/plasteel/white, /area/centcom/holding) "MY" = ( -/obj/machinery/door/airlock/external, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/railing/corner, +/obj/structure/flora/rock/jungle{ + icon_state = "rock1" }, -/obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" }, -/turf/open/floor/plating, /area/slavers) "MZ" = ( -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" +/obj/machinery/door/airlock/centcom{ + name = "Cell 3" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/structure/bed/pod, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/slavers) "Na" = ( @@ -17672,6 +17829,18 @@ /obj/structure/table/wood, /turf/open/floor/engine/cult, /area/wizard_station) +"Nb" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/structure/closet/crate/bin, +/obj/effect/spawner/lootdrop/prison_contraband, +/obj/effect/spawner/lootdrop/prison_contraband, +/obj/effect/spawner/lootdrop/prison_contraband, +/turf/open/floor/plasteel/dark/corner{ + dir = 4 + }, +/area/slavers) "Nc" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -17688,14 +17857,6 @@ smooth = 1 }, /area/centcom/holding) -"Ne" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/caution/red, -/turf/open/floor/plasteel/dark, -/area/slavers) "Nf" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/med/surgery, @@ -17720,6 +17881,11 @@ /obj/item/canvas/nineteenXnineteen, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Nh" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/two) "Ni" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -17751,7 +17917,7 @@ /area/centcom/holding) "Nm" = ( /turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia1" + icon_state = "layenia0" }, /area/slavers) "Nn" = ( @@ -17768,6 +17934,14 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"No" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "grassb5" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "Np" = ( /obj/machinery/door/airlock/wood{ id_tag = "Ninja7"; @@ -17776,36 +17950,23 @@ /turf/open/floor/wood, /area/centcom/holding) "Nq" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/mob/living/simple_animal/bot/medbot{ + desc = "A little medical robot, with the NT logo hidden by stickers. You can make out the word \"Stolen!\" written with a pen on its chassis."; + name = "Candybox"; + radio_key = null; + skin = null; + stationary_mode = 1 }, -/obj/machinery/vending/cola/black, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/slavers) "Nr" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table, -/obj/item/book/manual/chef_recipes, -/turf/open/floor/plasteel/cafeteria, +/turf/closed/indestructible/rock, /area/slavers) "Ns" = ( /obj/structure/mopbucket, /obj/item/mop, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"Nt" = ( -/obj/structure/sign/poster/contraband/lamarr, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 - }, -/area/ruin/powered) "Nu" = ( /turf/open/floor/wood, /area/syndicate_mothership) @@ -17821,6 +17982,34 @@ /obj/machinery/recharge_station, /turf/open/floor/plasteel/white, /area/centcom/holding) +"Nx" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 6 + }, +/turf/open/floor/plasteel, +/area/slavers) +"Ny" = ( +/obj/structure/bed{ + dir = 8 + }, +/obj/item/bedsheet/hos{ + desc = "A fancy red bedsheet."; + dir = 1; + name = "red bedsheet" + }, +/obj/effect/landmark/start/slaver, +/obj/structure/sign/poster/contraband/syndicate_recruitment{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/slavers) "Nz" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -17835,11 +18024,23 @@ /obj/item/storage/belt/champion/wrestling/holodeck, /turf/open/floor/holofloor/wood, /area/holodeck/rec_center/wrestlingarena) +"NC" = ( +/obj/effect/turf_decal/vg_decals/numbers/one, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/slavers) "ND" = ( -/turf/closed/indestructible/fakedoor{ - desc = "One must wonder what hides behind this terribly frightening airlock..."; - name = "John Slaver Smut Den Access" +/turf/open/floor/wood, +/area/slavers) +"NE" = ( +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" }, +/obj/structure/bed/pod, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/slavers) "NF" = ( /obj/structure/ladder/unbreakable/binary, @@ -17857,106 +18058,42 @@ /turf/open/floor/plasteel, /area/centcom/control) "NH" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/kitchen/rollingpin, -/turf/open/floor/plasteel/cafeteria, -/area/slavers) -"NI" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/splurt_space_law, -/obj/item/taperecorder, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/centcom/control) -"NJ" = ( -/obj/structure/sink/kitchen{ - dir = 8; - pixel_x = 11 - }, -/turf/open/floor/plasteel/cafeteria, -/area/slavers) -"NK" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/arrows/red{ - dir = 8 - }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark/side{ - dir = 8 - }, -/area/slavers/export) -"NM" = ( -/obj/structure/rack, -/obj/item/electropack/shockcollar/slave{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/electropack/shockcollar/slave{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ dir = 4 }, -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/area/slavers) +"NI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/obj/item/electropack/shockcollar/slave, -/obj/machinery/power/apc{ - cell_type = /obj/item/stock_parts/cell/infinite; - name = "Slaver Hideout APC"; - pixel_x = 28; - start_charge = 100 +/obj/structure/table, +/obj/item/storage/box/handcuffs{ + pixel_y = 8 }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"NN" = ( -/obj/structure/fans/tiny/invisible, -/obj/effect/decal/remains/xeno, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +/obj/item/storage/box/handcuffs{ + pixel_x = 3; + pixel_y = 3 }, +/turf/open/floor/plasteel/dark, /area/slavers) -"NO" = ( -/obj/effect/turf_decal/tile/bar{ +"NJ" = ( +/obj/effect/holodeck_effect/mobspawner/femclaw, +/turf/open/floor/holofloor/basalt, +/area/holodeck/rec_center/wildlife) +"NL" = ( +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 9 - }, +/turf/open/floor/plasteel, /area/slavers) +"NN" = ( +/obj/effect/holodeck_effect/mobspawner/funclaw, +/turf/open/floor/holofloor/basalt, +/area/holodeck/rec_center/wildlife) "NP" = ( /obj/machinery/button/crematorium{ id = "crematoriumGhostDojo"; @@ -17964,6 +18101,11 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"NR" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/slavers) "NS" = ( /turf/open/indestructible/hotelwood, /area/centcom/holding) @@ -17992,8 +18134,10 @@ /turf/open/floor/plasteel, /area/syndicate_mothership) "NW" = ( -/obj/structure/sign/poster/contraband/lusty_xenomorph{ - pixel_y = 32 +/obj/machinery/button/door{ + id = "slavers_cell2"; + name = "privacy shutters"; + pixel_x = -26 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -18026,33 +18170,32 @@ }, /turf/open/floor/plasteel/cafeteria, /area/syndicate_mothership) +"Od" = ( +/turf/closed/indestructible/fakedoor{ + desc = "One must wonder what hides behind this terribly frightening airlock..."; + name = "John Slaver Smut Den Access" + }, +/area/slavers) "Oe" = ( /obj/machinery/deepfryer, /turf/open/floor/plasteel/cafeteria, /area/syndicate_mothership) -"Of" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/mech_bay_recharge_port{ +"Og" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/splurt_space_law, +/obj/item/taperecorder, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"Og" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/structure/chair/wood/normal{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/slavers) +/area/centcom/ferry) "Oh" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -18126,17 +18269,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/two) +"Os" = ( +/turf/open/indestructible/binary, +/area/holodeck/rec_center/burn) "Ot" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/centcom{ - name = "Slave Export Bay"; - req_access_txt = "152" - }, -/turf/open/floor/plating, -/area/slavers) +/obj/effect/holodeck_effect/mobspawner/alphaclaw, +/turf/open/floor/holofloor/basalt, +/area/holodeck/rec_center/wildlife) "Ou" = ( /turf/closed/indestructible/fakedoor{ name = "Cold Storage" @@ -18153,11 +18292,21 @@ /turf/open/floor/wood, /area/centcom/holding) "Ox" = ( -/obj/machinery/microwave{ - pixel_y = 6 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/table, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/centcom{ + name = "Slave Preparation Room"; + req_access_txt = "152" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, /area/slavers) "Oy" = ( /obj/machinery/shower{ @@ -18175,6 +18324,13 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) +"OA" = ( +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 + }, +/area/ruin/powered) "OB" = ( /obj/machinery/door/airlock/centcom{ name = "Barracks"; @@ -18182,48 +18338,24 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) -"OC" = ( -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/bowl, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/item/storage/bag/tray/cafeteria, -/obj/structure/table, -/turf/open/floor/plasteel/cafeteria, -/area/slavers) "OD" = ( -/obj/structure/sign/poster/contraband/bulldog, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 - }, -/area/ruin/powered) -"OE" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/structure/table, +/obj/item/storage/dice{ + pixel_y = 11 }, +/obj/item/toy/cards/deck, /turf/open/floor/plasteel, -/area/centcom/supplypod) -"OG" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 9 +/area/slavers) +"OF" = ( +/obj/structure/rack{ + icon = 'icons/obj/stationobjs.dmi'; + icon_state = "minibar_right"; + name = "skeletal minibar" }, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 4 +/obj/machinery/chem_dispenser/drinks/beer{ + pixel_x = -2 }, -/turf/open/floor/plasteel, +/turf/open/floor/wood, /area/slavers) "OH" = ( /obj/effect/spawner/structure/window/reinforced, @@ -18233,18 +18365,22 @@ /obj/structure/bedsheetbin/towel, /turf/open/floor/plasteel/white, /area/centcom/holding) +"OJ" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/structure/chair/wood/normal{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "OL" = ( /obj/structure/mineral_door/paperframe{ name = "Dojo" }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"OM" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/centcom/supplypod) "ON" = ( /obj/structure/table, /obj/item/storage/box/handcuffs, @@ -18260,22 +18396,14 @@ }, /turf/open/floor/mineral/titanium/blue, /area/centcom/holding) -"OR" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/turf/open/floor/plasteel/cafeteria, +"OP" = ( +/obj/machinery/vending/boozeomat/syndicate_access, +/turf/open/floor/wood, /area/slavers) "OS" = ( /obj/structure/mecha_wreckage/mauler, /turf/open/floor/plasteel/dark, /area/syndicate_mothership) -"OT" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet{ - anchored = 1; - name = "slave asset storage" - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "OU" = ( /obj/item/clothing/under/costume/jabroni, /obj/item/clothing/under/costume/geisha, @@ -18291,32 +18419,38 @@ /turf/open/floor/wood, /area/syndicate_mothership) "OW" = ( -/obj/item/book/manual/splurt_space_law, -/obj/item/taperecorder, -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/bar{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/caution/red{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/centcom/control) +/area/slavers) "OX" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 10 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/turf/open/floor/plasteel/dark/side{ - dir = 10 +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/area/slavers/export) +/obj/machinery/vending/assist, +/turf/open/floor/plasteel/dark, +/area/slavers) +"OY" = ( +/obj/machinery/vending/security, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel, +/area/centcom/control) "OZ" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plating, @@ -18327,41 +18461,55 @@ }, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) +"Pb" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia0" + }, +/area/slavers) +"Pc" = ( +/obj/structure/sign/poster/contraband/ambrosia_vulgaris, +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 + }, +/area/ruin/powered) +"Pd" = ( +/obj/effect/mob_spawn/human/ghostcafeVR, +/turf/open/indestructible/hotelwood, +/area/ruin/powered) "Pe" = ( -/obj/structure/closet/crate/bin, -/obj/effect/spawner/lootdrop/prison_contraband, -/obj/effect/turf_decal/tile/bar{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/spawner/lootdrop/prison_contraband, -/obj/effect/spawner/lootdrop/prison_contraband, -/turf/open/floor/plasteel/dark/side{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, /area/slavers) -"Pg" = ( -/obj/machinery/light{ - dir = 1 +"Pf" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/corner, +/area/slavers) +"Ph" = ( +/obj/effect/decal/remains/xeno, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia0" }, -/turf/open/floor/plasteel/dark, -/area/centcom/supplypod) -"Pj" = ( -/obj/effect/turf_decal/arrows/red{ - dir = 1 +/area/slavers) +"Pi" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "rock5" }, -/obj/effect/turf_decal/trimline/red/line, -/obj/effect/turf_decal/trimline/red/filled/line, -/turf/open/floor/plasteel/dark/side, -/area/slavers/export) -"Pk" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark, /area/slavers) "Pl" = ( /obj/structure/window/reinforced, @@ -18389,23 +18537,17 @@ }, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) +"Pq" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "Pr" = ( /obj/structure/table, /obj/item/book/manual/chef_recipes, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) -"Ps" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/dark, -/area/centcom/supplypod) -"Pt" = ( -/obj/structure/sign/poster/official/wtf_is_co2, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 - }, -/area/ruin/powered) "Pv" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -18436,20 +18578,22 @@ /turf/open/indestructible/boss/air, /area/centcom/holding) "PB" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 6 +/obj/structure/fans/tiny/invisible, +/obj/structure/fans/tiny/invisible, +/turf/open/floor/holofloor/hyperspace, +/area/space) +"PC" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 6 +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/turf/open/floor/plasteel/dark/side{ - dir = 6 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/area/slavers/export) -"PC" = ( -/obj/effect/turf_decal/vg_decals/numbers/three, /turf/open/floor/plasteel/dark/side{ - dir = 4 + dir = 9 }, /area/slavers) "PD" = ( @@ -18469,20 +18613,6 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"PF" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/structure/closet/slaver, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, -/area/slavers) "PG" = ( /obj/structure/table/reinforced, /obj/item/camera, @@ -18512,38 +18642,19 @@ /turf/open/floor/plating, /area/syndicate_mothership) "PK" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 9 +/obj/structure/sign/poster/contraband/lamarr, +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 }, -/area/slavers) +/area/ruin/powered) "PL" = ( /obj/machinery/light{ dir = 8 }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"PM" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/plasteel/dark/side{ - dir = 5 - }, -/area/slavers) "PO" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light{ @@ -18568,15 +18679,33 @@ /turf/open/floor/plating, /area/syndicate_mothership) "PQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/effect/turf_decal/stripes/white/line{ + dir = 6 }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"PR" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white, +/obj/effect/turf_decal/stripes/white/corner, +/turf/open/floor/plasteel, /area/slavers) +"PR" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/splurt_space_law, +/obj/item/taperecorder, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/centcom/control) "PS" = ( /obj/machinery/computer/shuttle/syndicate/recall, /obj/effect/turf_decal/tile/bar, @@ -18585,20 +18714,6 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) -"PT" = ( -/obj/machinery/door/airlock{ - id_tag = null; - name = "Toilet" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/showroomfloor, -/area/slavers) -"PU" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white, -/obj/item/pen/blue, -/turf/open/floor/plasteel, -/area/centcom/supplypod) "PV" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -18609,6 +18724,10 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/holofloor, /area/holodeck/rec_center/firingrange) +"PW" = ( +/obj/structure/fans/tiny/invisible, +/turf/open/floor/holofloor/hyperspace, +/area/space) "PX" = ( /obj/machinery/computer/arcade/battle, /turf/open/indestructible/hotelwood, @@ -18647,14 +18766,6 @@ }, /turf/open/floor/mineral/titanium, /area/centcom/evac) -"Qc" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 8 - }, -/area/slavers) "Qd" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/white, @@ -18662,29 +18773,6 @@ "Qe" = ( /turf/open/ai_visible, /area/ai_multicam_room) -"Qf" = ( -/obj/structure/rack, -/obj/item/electropack/shockcollar/slave{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/electropack/shockcollar/slave{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/item/electropack/shockcollar/slave, -/turf/open/floor/plasteel/dark, -/area/slavers) "Qh" = ( /obj/machinery/door/airlock/wood{ id_tag = "Ninja1"; @@ -18699,6 +18787,24 @@ /obj/structure/window/reinforced/fulltile, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Ql" = ( +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/book/manual/splurt_space_law, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/tdome/tdomeadmin) "Qm" = ( /obj/singularity/wizard/mapped, /turf/open/indestructible/binary, @@ -18711,24 +18817,24 @@ /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) "Qp" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/turf/open/floor/plasteel/dark/side{ + dir = 4 }, -/obj/machinery/vending/assist, -/turf/open/floor/plasteel/dark, /area/slavers) "Qq" = ( /turf/open/floor/plasteel/freezer, /area/syndicate_mothership) "Qr" = ( -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel/dark/corner, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/caution/stand_clear/white{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "Qs" = ( /obj/structure/table/wood/bar, @@ -18747,21 +18853,10 @@ /turf/open/floor/plasteel, /area/syndicate_mothership) "Qv" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/slavers) "Qw" = ( /obj/structure/table, @@ -18775,6 +18870,10 @@ /obj/structure/table/wood/fancy/royalblue, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Qz" = ( +/obj/machinery/computer/arcade/tetris, +/turf/open/floor/plasteel, +/area/slavers) "QA" = ( /obj/machinery/deepfryer, /turf/open/floor/plasteel/cafeteria, @@ -18808,36 +18907,22 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"QH" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 +"QG" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/splurt_space_law, +/obj/item/taperecorder, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/effect/turf_decal/tile/bar{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/rack, -/obj/item/stack/sheet/mineral/wood/twenty, -/obj/item/stack/sheet/mineral/sandbags{ - amount = 20 - }, -/obj/item/stack/sheet/metal/twenty, -/obj/item/stack/sheet/glass/fifty{ - amount = 20 - }, -/obj/item/storage/toolbox/electrical{ - pixel_x = 4; - pixel_y = 4 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/item/storage/toolbox/mechanical, -/obj/item/multitool, -/obj/item/clothing/head/welding, /turf/open/floor/plasteel/dark, -/area/slavers) -"QI" = ( -/obj/effect/holodeck_effect/mobspawner/femclaw, -/turf/open/floor/holofloor/basalt, -/area/holodeck/rec_center/wildlife) +/area/centcom/evac) "QK" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -18860,18 +18945,6 @@ /obj/item/reagent_containers/rag/towel, /turf/open/floor/carpet/red, /area/centcom/holding) -"QO" = ( -/obj/machinery/seed_extractor, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "QP" = ( /obj/machinery/computer/mech_bay_power_console{ dir = 1 @@ -18907,9 +18980,6 @@ smooth = 1 }, /area/centcom/holding) -"QU" = ( -/turf/open/floor/plasteel/white, -/area/slavers) "QV" = ( /turf/closed/indestructible/riveted, /area/syndicate_mothership) @@ -18930,17 +19000,19 @@ /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) "QZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: EXTERNAL AIRLOCK"; - pixel_y = 30 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, +/obj/machinery/light/floor, /turf/open/floor/plasteel/dark, -/area/slavers) +/area/centcom/control) "Ra" = ( /obj/machinery/door/window/eastright, /turf/open/indestructible/boss/air, @@ -18951,17 +19023,10 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) -"Rc" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/structure/table/wood, -/obj/item/toy/cards/deck{ - pixel_y = 5 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) +"Rd" = ( +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/podStorage) "Re" = ( /obj/structure/mineral_door/paperframe, /turf/open/floor/wood, @@ -18971,30 +19036,43 @@ /turf/open/floor/plasteel, /area/centcom/supplypod) "Rg" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ +/obj/item/book/manual/splurt_space_law, +/obj/item/taperecorder, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/structure/rack, -/obj/item/card/id/syndicate/slaver, -/obj/item/card/id/syndicate/slaver, -/obj/item/card/id/syndicate/slaver, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/glasses/sunglasses/blindfold{ - pixel_y = 4 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, /turf/open/floor/plasteel/dark, -/area/slavers) +/area/centcom/control) "Rh" = ( /obj/structure/window/reinforced{ dir = 1 }, /turf/open/floor/grass, /area/centcom/holding) +"Ri" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia1" + }, +/area/slavers) +"Rk" = ( +/obj/structure/sink/kitchen{ + dir = 8; + pixel_x = 11 + }, +/turf/open/floor/plasteel/cafeteria, +/area/slavers) "Rl" = ( /obj/structure/mirror{ pixel_x = -28 @@ -19009,89 +19087,72 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"Rn" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 8 +"Ro" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/turf/open/floor/plasteel, +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "Rp" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/book/manual/splurt_space_law, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/white/line{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/decal/cleanable/dirt, +/obj/structure/holohoop{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/centcom/ferry) +/turf/open/floor/plasteel, +/area/slavers) "Rq" = ( /obj/machinery/washing_machine, /turf/open/floor/mineral/titanium/blue, /area/centcom/holding) +"Rt" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/fans/tiny/invisible, +/turf/open/water/decorative, +/area/slavers) "Ru" = ( /obj/structure/table, /obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/plasteel/white, /area/centcom/holding) "Rv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, +/obj/machinery/computer/arcade/orion_trail, +/turf/open/floor/plasteel, /area/slavers) -"Rw" = ( -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +"Rz" = ( +/obj/effect/turf_decal/loading_area, +/turf/open/floor/plating, +/area/syndicate_mothership) +"RB" = ( +/obj/item/book/manual/splurt_space_law, +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"Rx" = ( -/obj/machinery/biogenerator, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, /turf/open/floor/plasteel/dark, -/area/slavers) -"Ry" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/area/centcom/control) +"RC" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "rock3" }, -/obj/item/pen, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 6 +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia0" }, -/turf/open/floor/plasteel, /area/slavers) -"Rz" = ( -/obj/effect/turf_decal/loading_area, -/turf/open/floor/plating, -/area/syndicate_mothership) -"RC" = ( -/obj/effect/holodeck_effect/mobspawner/newclaw, -/turf/open/floor/holofloor/basalt, -/area/holodeck/rec_center/wildlife) "RD" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -19103,75 +19164,57 @@ /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) "RE" = ( -/turf/open/floor/plasteel/dark, -/area/slavers) -"RI" = ( -/obj/effect/turf_decal/trimline/red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/line{ +/obj/structure/toilet{ dir = 4 }, -/obj/effect/turf_decal/arrows/red{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/showroomfloor, +/area/slavers) +"RG" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "slavers_cell4" }, -/turf/open/floor/plasteel/dark/side{ +/obj/effect/spawner/structure/window/plasma/reinforced, +/turf/open/floor/plating, +/area/slavers) +"RH" = ( +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/area/slavers/export) -"RJ" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"RK" = ( +/obj/structure/fans/tiny, /obj/machinery/door/airlock/centcom{ - name = "Cell 1" + name = "Slave Wing"; + req_access_txt = "152" }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/slavers) -"RL" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "slavers_cell2" +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 }, /turf/open/floor/plating, /area/slavers) +"RI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/slavers) "RM" = ( /obj/structure/chair/comfy/brown{ color = "#596479" }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"RN" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +"RP" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 9 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 }, -/obj/item/cautery, -/obj/item/circular_saw, -/obj/item/scalpel, -/obj/item/surgicaldrill, -/obj/item/retractor/advanced, -/obj/structure/table, -/turf/open/floor/plasteel/dark, -/area/slavers) -"RO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/turf/open/floor/plasteel/dark/side{ + dir = 9 }, -/obj/structure/closet/crate, -/turf/open/floor/plasteel/dark, -/area/slavers) +/area/slavers/export) "RQ" = ( /obj/item/kirbyplants{ icon_state = "plant-21"; @@ -19195,49 +19238,24 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "RT" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/fans/tiny/invisible, -/obj/structure/window/reinforced{ - dir = 4 +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia1" }, -/turf/open/water/decorative, /area/slavers) "RU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table, -/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask, -/turf/open/floor/plasteel/dark, -/area/slavers) +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/four) "RV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"RX" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 8 - }, -/area/slavers) -"RY" = ( -/obj/structure/fans/tiny/invisible, -/obj/structure/railing/corner, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) +"RW" = ( +/obj/effect/spawner/structure/window/reinforced/indestructable, +/turf/open/floor/plating, /area/slavers) "RZ" = ( /obj/effect/turf_decal/tile/bar, @@ -19249,12 +19267,6 @@ }, /turf/open/floor/plasteel, /area/syndicate_mothership) -"Sa" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/slavers) "Sb" = ( /obj/structure/table/wood, /obj/item/toy/prize/mauler{ @@ -19262,14 +19274,6 @@ }, /turf/open/floor/plasteel/dark, /area/syndicate_mothership) -"Sc" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 4 - }, -/area/slavers) "Sd" = ( /obj/structure/sign/painting{ pixel_x = 32 @@ -19277,12 +19281,12 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Se" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/vending/cola/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark/corner{ - dir = 1 + dir = 8 }, /area/slavers) "Sf" = ( @@ -19310,13 +19314,29 @@ /obj/item/toy/nuke, /turf/open/floor/wood, /area/syndicate_mothership) -"Sn" = ( +"Sj" = ( /obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) +"Sm" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/cryopod{ dir = 4 }, -/turf/open/floor/plasteel/dark/side{ +/obj/machinery/computer/cryopod{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) +"Sn" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/corner{ dir = 4 }, +/turf/open/floor/plasteel, /area/slavers) "So" = ( /obj/structure/chair/wood/wings{ @@ -19328,53 +19348,38 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Sq" = ( -/obj/machinery/research_table/slaver, -/turf/open/floor/padded, +/obj/item/chair, +/turf/open/floor/plasteel, /area/slavers) -"St" = ( -/obj/machinery/shower{ - dir = 4 +"Ss" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/turf/open/floor/plasteel/freezer, -/area/centcom/holding) -"Sv" = ( -/obj/structure/closet/secure_closet, -/obj/item/coin/silver, -/turf/open/indestructible/hotelwood, -/area/centcom/holding) -"Sw" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/machinery/sleeper{ - dir = 8 +/obj/effect/turf_decal/tile/green{ + dir = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/slavers) -"Sx" = ( -/obj/docking_port/stationary{ - area_type = /area/slavers; - dheight = 1; - dir = 8; - dwidth = 10; - height = 15; - id = "slaver_away"; - name = "slave trader hideout"; - roundstart_template = /datum/map_template/shuttle/slaveship/basic; - width = 22 +"St" = ( +/obj/machinery/shower{ + dir = 4 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia1" +/turf/open/floor/plasteel/freezer, +/area/centcom/holding) +"Sv" = ( +/obj/structure/closet/secure_closet, +/obj/item/coin/silver, +/turf/open/indestructible/hotelwood, +/area/centcom/holding) +"Sx" = ( +/obj/effect/turf_decal/vg_decals/numbers/three, +/turf/open/floor/plasteel/dark/side{ + dir = 4 }, /area/slavers) "Sy" = ( @@ -19387,11 +19392,13 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/four) "SA" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/corner{ +/obj/structure/holohoop{ dir = 4 }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/slavers) "SB" = ( @@ -19404,6 +19411,12 @@ }, /turf/open/floor/plasteel/white, /area/centcom/holding) +"SC" = ( +/obj/structure/table, +/obj/item/instrument/piano_synth, +/obj/item/instrument/harmonica, +/turf/open/floor/plasteel, +/area/slavers) "SD" = ( /obj/structure/mopbucket, /obj/item/mop, @@ -19425,6 +19438,20 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod) +"SG" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/arrows/red{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/slavers/export) "SH" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -19442,6 +19469,14 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/two) +"SK" = ( +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/plasteel/dark, +/area/slavers) +"SL" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/wood, +/area/slavers) "SM" = ( /obj/machinery/vending/autodrobe{ extended_inventory = 1 @@ -19455,56 +19490,15 @@ /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "SO" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/indestructible/hotelwood, -/area/ruin/powered) +/obj/effect/holodeck_effect/sparks, +/turf/open/indestructible/binary, +/area/holodeck/rec_center/burn) "SP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/space/basic, /area/centcom/supplypod) "SR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/centcom{ - name = "Slaver Hideout Access"; - req_access_txt = "152" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plating, -/area/slavers) -"SS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/caution/stand_clear/white{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"ST" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/centcom{ - name = "Slave Preparation Room"; - req_access_txt = "152" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, +/obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/slavers) "SU" = ( @@ -19542,15 +19536,40 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"SX" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/cafeteria, -/area/slavers) "SY" = ( /obj/structure/table/wood, /turf/open/indestructible/hotelwood, /area/centcom/holding) "SZ" = ( +/obj/machinery/research_table/slaver, +/turf/open/floor/padded, +/area/slavers) +"Ta" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel/dark/corner{ + dir = 1 + }, +/area/slavers) +"Tc" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/airlock/centcom{ + name = "Slave Export Bay"; + req_access_txt = "152" + }, +/turf/open/floor/plating, +/area/slavers) +"Td" = ( +/obj/structure/fireplace, +/turf/open/floor/carpet/red, +/area/centcom/holding) +"Te" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -19559,7 +19578,7 @@ }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/centcom{ - name = "Slave Wing"; + name = "Slaver Hideout Access"; req_access_txt = "152" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -19567,24 +19586,6 @@ }, /turf/open/floor/plating, /area/slavers) -"Tb" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/dark/side, -/area/slavers) -"Tc" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "slavers_cell4" - }, -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/slavers) -"Td" = ( -/obj/structure/fireplace, -/turf/open/floor/carpet/red, -/area/centcom/holding) "Tf" = ( /obj/machinery/light, /obj/effect/landmark/holding_facility, @@ -19594,6 +19595,12 @@ /obj/structure/closet/crate/bin, /turf/open/floor/plasteel/white, /area/centcom/holding) +"Th" = ( +/turf/open/floor/carpet/red, +/area/slavers) +"Ti" = ( +/turf/open/floor/plasteel/white, +/area/slavers) "Tj" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -19602,16 +19609,31 @@ /obj/machinery/vending/cigarette/syndicate, /turf/open/floor/plasteel, /area/syndicate_mothership) -"Tm" = ( +"Tk" = ( /obj/effect/turf_decal/tile/bar{ - dir = 8 + dir = 4 }, +/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 4 }, -/obj/machinery/iv_drip, +/obj/machinery/autodoc, /turf/open/floor/plasteel/dark, /area/slavers) +"Tl" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/centcom/evac) "Tn" = ( /obj/structure/table/wood/fancy, /obj/item/candle/infinite/hugbox{ @@ -19622,13 +19644,38 @@ "To" = ( /turf/open/indestructible/airblock, /area/fabric_of_reality) +"Tp" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/light/floor, +/turf/open/floor/plasteel/dark, +/area/centcom/prison) "Tq" = ( -/obj/structure/table, -/obj/item/storage/dice{ - pixel_y = 11 +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/obj/item/toy/cards/deck, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "Tr" = ( /obj/structure/closet/chefcloset, @@ -19641,9 +19688,8 @@ /turf/open/floor/plasteel/white, /area/centcom/holding) "Tt" = ( -/obj/machinery/vending/kink, -/turf/open/floor/padded, -/area/slavers) +/turf/open/floor/holofloor/hyperspace, +/area/space) "Tu" = ( /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/fullgrass, @@ -19653,22 +19699,45 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Tv" = ( -/obj/effect/light_emitter{ - set_cap = 1; - set_luminosity = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 10 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/tdome/tdomeadmin) +"Tw" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/cautery, +/obj/item/circular_saw, +/obj/item/scalpel, +/obj/item/surgicaldrill, +/obj/item/retractor/advanced, +/obj/structure/table, +/turf/open/floor/plasteel/dark, /area/slavers) "Tx" = ( -/turf/open/floor/padded, +/obj/structure/flora/rock/jungle{ + icon_state = "rock2" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia0" + }, /area/slavers) "Ty" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plasteel, /area/slavers) "Tz" = ( /obj/effect/light_emitter, @@ -19702,34 +19771,15 @@ }, /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) -"TG" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/plasteel/dark, -/area/slavers) "TH" = ( /obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"TI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table, -/obj/item/storage/box/handcuffs{ - pixel_y = 8 + dir = 5 }, -/obj/item/storage/box/handcuffs{ - pixel_x = 3; - pixel_y = 3 +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: EXTERNAL AIRLOCK"; + pixel_y = 30 }, /turf/open/floor/plasteel/dark, /area/slavers) @@ -19741,9 +19791,11 @@ /turf/open/floor/wood, /area/centcom/holding) "TL" = ( -/obj/structure/bed/pod, -/turf/open/floor/plating, -/area/slavers) +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) "TM" = ( /mob/living/simple_animal/bot/medbot{ desc = "When engaged in combat, the vanquishing of thine enemy can be the warrior's only concern."; @@ -19754,11 +19806,18 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "TN" = ( -/obj/effect/turf_decal/vg_decals/numbers/one, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark/side{ +/obj/structure/table, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/structure/window/reinforced{ dir = 1 }, +/turf/open/floor/plasteel/cafeteria, /area/slavers) "TO" = ( /obj/effect/turf_decal/tile/bar, @@ -19777,16 +19836,24 @@ /turf/open/floor/plasteel/freezer, /area/syndicate_mothership) "TQ" = ( -/obj/structure/sign/poster/contraband/ambrosia_vulgaris, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 +/obj/structure/table, +/obj/item/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 }, -/area/ruin/powered) -"TR" = ( -/obj/machinery/computer/arcade/tetris, -/turf/open/floor/plasteel, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/brute{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "TS" = ( /obj/structure/closet{ @@ -19805,18 +19872,12 @@ /obj/item/clothing/head/helmet/space/plasmaman, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"TT" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/slavers) "TU" = ( -/obj/effect/light_emitter{ - set_cap = 1; - set_luminosity = 4 - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia1" +/obj/machinery/door/airlock/centcom{ + name = "Cell 2" }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plating, /area/slavers) "TV" = ( /obj/structure/table, @@ -19825,15 +19886,31 @@ /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "TW" = ( -/obj/effect/mob_spawn/human/ghostcafeVR, -/turf/open/indestructible/hotelwood, -/area/ruin/powered) -"TX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/structure/table, +/obj/item/storage/firstaid/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, /turf/open/floor/plasteel/dark, /area/slavers) +"TX" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/space) "TY" = ( /obj/structure/bedsheetbin/color, /turf/open/indestructible/hotelwood, @@ -19845,9 +19922,8 @@ /turf/open/floor/plasteel/white, /area/centcom/holding) "Ua" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark/corner, +/obj/structure/bed/pod, +/turf/open/floor/plating, /area/slavers) "Uc" = ( /obj/structure/bodycontainer/crematorium{ @@ -19857,39 +19933,46 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Ud" = ( -/obj/machinery/research_table/slaver, -/obj/machinery/button/door{ - id = "slavers_cell4"; - name = "privacy shutters"; - pixel_y = -26 +/obj/item/plant_analyzer{ + pixel_y = 7 }, -/turf/open/floor/padded, -/area/slavers) -"Ue" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 +/obj/item/reagent_containers/glass/bucket{ + pixel_x = 6 }, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/toxin{ - pixel_x = -3; +/obj/item/cultivator{ + pixel_x = -4; pixel_y = -3 }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/rack, +/turf/open/floor/plasteel/dark, +/area/slavers) +"Ue" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/item/papercutter, /turf/open/floor/plasteel/dark, -/area/slavers) +/area/centcom/supply) "Uf" = ( -/turf/open/floor/mech_bay_recharge_floor{ - color = "#8c8c8c" +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 9 }, /area/slavers) "Ug" = ( @@ -19913,21 +19996,15 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Ui" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/splurt_space_law, -/obj/item/taperecorder, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/bed{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/item/bedsheet/syndie{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/centcom/evac) +/obj/effect/landmark/start/slaver_leader, +/turf/open/floor/wood, +/area/slavers) "Uj" = ( /obj/machinery/door/airlock/centcom{ name = "Restroom"; @@ -19946,27 +20023,14 @@ /turf/open/floor/plasteel/cafeteria, /area/syndicate_mothership) "Um" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/book/manual/splurt_space_law, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/bar{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, /turf/open/floor/plasteel/dark, -/area/centcom/ferry) +/area/slavers) "Un" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome"; @@ -19976,17 +20040,13 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) -"Up" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 +"Uo" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "rock2" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" }, -/obj/structure/closet/slaver, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, /area/slavers) "Uq" = ( /obj/machinery/button/door{ @@ -20013,20 +20073,22 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Us" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line, -/obj/item/kirbyplants/random, /turf/open/floor/plasteel/dark/corner{ - dir = 1 + dir = 4 }, /area/slavers) "Ut" = ( -/obj/effect/turf_decal/vg_decals/numbers/two, -/turf/open/floor/plasteel/dark/side{ - dir = 1 +/obj/structure/railing{ + dir = 8 }, +/obj/structure/fans/tiny/invisible, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/water/decorative, /area/slavers) "Uu" = ( /obj/machinery/light{ @@ -20053,42 +20115,29 @@ /obj/effect/light_emitter, /turf/open/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) -"Uz" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 5 - }, -/area/slavers) "UA" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/structure/closet/crate/bin, -/obj/effect/spawner/lootdrop/prison_contraband, -/obj/effect/spawner/lootdrop/prison_contraband, -/obj/effect/spawner/lootdrop/prison_contraband, -/turf/open/floor/plasteel/dark/corner{ - dir = 4 +/turf/open/floor/plasteel/cafeteria, +/area/slavers) +"UB" = ( +/obj/machinery/door/airlock/centcom{ + name = "Dormitories"; + req_access_txt = "152" }, +/turf/open/floor/wood, /area/slavers) "UC" = ( /obj/machinery/vending/cola, /turf/open/floor/plasteel, /area/centcom/supplypod) "UD" = ( -/obj/structure/sink/kitchen{ - pixel_y = 16 +/obj/effect/turf_decal/tile/bar{ + dir = 8 }, -/obj/structure/mirror{ - pixel_y = 28 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/plasteel/white, +/obj/machinery/iv_drip, +/turf/open/floor/plasteel/dark, /area/slavers) "UE" = ( /obj/structure/chair/stool/bar, @@ -20100,6 +20149,18 @@ /obj/effect/light_emitter, /turf/open/floor/plating/asteroid/snow/airless, /area/syndicate_mothership) +"UH" = ( +/obj/machinery/biogenerator, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "UI" = ( /obj/machinery/door/airlock/wood{ id_tag = "Ninja4"; @@ -20107,33 +20168,32 @@ }, /turf/open/floor/wood, /area/centcom/holding) -"UK" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/indestructible/hotelwood, -/area/ruin/powered) -"UL" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +"UJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, +/obj/machinery/light/floor, /turf/open/floor/plasteel, -/area/centcom/supplypod) -"UN" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/area/tdome/tdomeadmin) +"UK" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "rock3" }, -/obj/machinery/door/airlock/centcom{ - name = "Medical Bay"; - req_access_txt = "152" +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" }, -/turf/open/floor/plating, /area/slavers) +"UM" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/plasteel/dark, +/area/slavers) +"UN" = ( +/obj/structure/flora/ausbushes/fernybush, +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/ausbushes/palebush, +/obj/structure/window/reinforced/fulltile, +/turf/open/indestructible/hotelwood, +/area/ruin/powered) "UO" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security"; @@ -20162,13 +20222,15 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/one) "UR" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock3" - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, +/turf/closed/wall/r_wall, /area/slavers) +"US" = ( +/obj/machinery/door/airlock/centcom{ + name = "Orbital Drop Pod Loading"; + req_access_txt = "101" + }, +/turf/open/floor/plating, +/area/centcom/ferry) "UT" = ( /obj/structure/chair/wood/wings{ dir = 1 @@ -20206,8 +20268,17 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/three) "UY" = ( -/obj/machinery/hydroponics/soil, -/turf/open/floor/grass, +/obj/effect/holodeck_effect/mobspawner/bigmommyclaw, +/turf/open/floor/holofloor/basalt, +/area/holodeck/rec_center/wildlife) +"UZ" = ( +/obj/machinery/button/door{ + id = "slavers_cell1"; + name = "privacy shutters"; + pixel_x = 26 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, /area/slavers) "Va" = ( /obj/effect/turf_decal/tile/red, @@ -20231,48 +20302,36 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/two) -"Vd" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/machinery/computer/cryopod{ - pixel_x = -32 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "Vf" = ( /obj/structure/table, /obj/item/assembly/flash/handheld, /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) -"Vh" = ( +"Vg" = ( +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 8 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/bar{ dir = 4 }, -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/structure/rack, +/obj/item/stack/sheet/mineral/wood/twenty, +/obj/item/stack/sheet/mineral/sandbags{ + amount = 20 }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"Vi" = ( -/obj/effect/light_emitter{ - set_cap = 1; - set_luminosity = 4 +/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/glass/fifty{ + amount = 20 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" +/obj/item/storage/toolbox/electrical{ + pixel_x = 4; + pixel_y = 4 }, +/obj/item/storage/toolbox/mechanical, +/obj/item/multitool, +/obj/item/clothing/head/welding, +/turf/open/floor/plasteel/dark, /area/slavers) "Vj" = ( /obj/structure/toilet{ @@ -20287,44 +20346,62 @@ /obj/structure/window/reinforced/tinted, /turf/open/floor/plasteel/freezer, /area/syndicate_mothership) +"Vl" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/structure/closet/slaver, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/slavers) +"Vm" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/structure/weightmachine/stacklifter, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, +/area/slavers) "Vn" = ( /obj/item/storage/box/bodybags, /obj/item/storage/box/bodybags, /turf/open/indestructible/hotelwood, /area/centcom/holding) "Vo" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Showers" - }, +/obj/item/toy/beach_ball/holoball, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/white, -/area/slavers) -"Vp" = ( -/obj/structure/chair{ +/obj/effect/turf_decal/stripes/white/line{ dir = 8 }, /turf/open/floor/plasteel, /area/slavers) "Vq" = ( -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/slavers) -"Vr" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/structure/chair/wood/normal{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, /turf/open/floor/plasteel/dark, /area/slavers) +"Vr" = ( +/obj/effect/holodeck_effect/mobspawner/newclaw, +/turf/open/floor/holofloor/basalt, +/area/holodeck/rec_center/wildlife) "Vs" = ( -/obj/machinery/vr_sleeper, -/turf/open/indestructible/hotelwood, -/area/ruin/powered) +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) "Vt" = ( /obj/item/paper/fluff/stations/centcom/disk_memo, /obj/structure/noticeboard{ @@ -20366,6 +20443,14 @@ }, /turf/open/space, /area/space) +"Vy" = ( +/obj/structure/table/wood/fancy, +/obj/item/book/manual/splurt_space_law, +/turf/open/floor/holofloor{ + dir = 8; + icon_state = "dark" + }, +/area/holodeck/rec_center/chapelcourt) "Vz" = ( /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; @@ -20397,11 +20482,18 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"VD" = ( -/obj/effect/turf_decal/stripes/line{ +"VE" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar{ dir = 8 }, -/turf/open/floor/plasteel, +/obj/machinery/vending/tool, +/turf/open/floor/plasteel/dark, /area/slavers) "VF" = ( /obj/structure/rack, @@ -20411,6 +20503,10 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"VG" = ( +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/four) "VH" = ( /obj/machinery/vending/sustenance, /turf/open/indestructible/hotelwood, @@ -20419,24 +20515,38 @@ /obj/machinery/autolathe, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"VJ" = ( +/turf/open/floor/plasteel/dark, +/area/slavers) "VK" = ( /obj/machinery/vending/clothing, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"VM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/airlock/centcom{ - name = "Auxiliary Storage"; - req_access_txt = "152" +"VL" = ( +/obj/structure/railing/corner{ + dir = 4 }, -/turf/open/floor/plating, +/obj/structure/fans/tiny/invisible, +/turf/open/water/decorative, /area/slavers) "VN" = ( -/obj/machinery/computer/arcade/orion_trail, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/card/id/syndicate/slaver, +/obj/item/card/id/syndicate/slaver, +/obj/item/card/id/syndicate/slaver, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/glasses/sunglasses/blindfold{ + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, /area/slavers) "VO" = ( /turf/closed/indestructible/riveted, @@ -20446,19 +20556,15 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plating, /area/syndicate_mothership) -"VQ" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/centcom/supplypod) "VR" = ( /obj/machinery/light, /turf/open/floor/plating, /area/syndicate_mothership) +"VS" = ( +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "VT" = ( /obj/structure/table/wood, /obj/item/syndicatedetonator{ @@ -20466,12 +20572,38 @@ }, /turf/open/floor/wood, /area/syndicate_mothership) -"VW" = ( -/obj/machinery/shower{ - pixel_y = 14 +"VU" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 5 + }, +/area/slavers/export) +"VV" = ( +/obj/structure/sign/warning/securearea{ + desc = "A warning sign which reads 'FOURTH WALL'."; + name = "\improper FOURTH WALL"; + pixel_x = -32 + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia0" }, -/turf/open/floor/plasteel/showroomfloor/shower, /area/slavers) +"VW" = ( +/obj/effect/turf_decal/trimline/red/line{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 6 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 6 + }, +/area/slavers/export) "VX" = ( /obj/effect/landmark/shuttle_import, /turf/open/space/basic, @@ -20481,20 +20613,8 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "VZ" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/turf/open/water/decorative, -/area/slavers) -"Wa" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/plasteel/dark/side{ - dir = 1 - }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/cafeteria, /area/slavers) "Wb" = ( /obj/machinery/door/window/westleft, @@ -20514,56 +20634,39 @@ /turf/open/floor/plasteel, /area/centcom/evac) "Wd" = ( -/obj/machinery/deepfryer, -/turf/open/floor/plasteel/cafeteria, -/area/slavers) +/obj/effect/turf_decal/delivery, +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/centcom/evac) "We" = ( /obj/machinery/vending/coffee, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"Wg" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ +"Wf" = ( +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/bar{ dir = 8 }, -/obj/machinery/stasis{ - dir = 4 - }, +/obj/structure/table, +/obj/machinery/recharger, /turf/open/floor/plasteel/dark, /area/slavers) -"Wh" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/condiment/saltshaker{ - layer = 3.1; - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/food/condiment/enzyme{ - pixel_x = 9; - pixel_y = 3 +"Wg" = ( +/turf/closed/indestructible/fakedoor{ + name = "External Access" }, -/turf/open/floor/plasteel/cafeteria, /area/slavers) -"Wi" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +"Wh" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/effect/turf_decal/tile/brown{ +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/corner{ dir = 1 }, -/turf/open/floor/plasteel, -/area/centcom/supplypod) +/area/slavers) "Wj" = ( /obj/structure/closet/cardboard/metal, /obj/effect/turf_decal/stripes/corner{ @@ -20572,9 +20675,41 @@ /turf/open/floor/plating, /area/syndicate_mothership) "Wk" = ( -/obj/effect/holodeck_effect/mobspawner/alphaclaw, -/turf/open/floor/holofloor/basalt, -/area/holodeck/rec_center/wildlife) +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/tdome/tdomeobserve) +"Wl" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) +"Wn" = ( +/obj/structure/fans/tiny/invisible, +/obj/structure/railing/corner, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "Wp" = ( /obj/machinery/processor, /obj/machinery/light{ @@ -20589,13 +20724,6 @@ "Wr" = ( /turf/open/floor/plasteel/dark, /area/centcom/supplypod) -"Ws" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/corner{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/slavers) "Wu" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -20609,52 +20737,89 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"Wz" = ( +"Wv" = ( +/obj/structure/table, +/obj/item/flashlight/lamp, +/turf/open/floor/plasteel, +/area/slavers) +"Ww" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/fans/tiny/invisible, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/water/decorative, +/area/slavers) +"Wx" = ( /obj/effect/turf_decal/tile/bar{ - dir = 4 + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/stasis{ dir = 4 }, -/obj/machinery/autodoc, /turf/open/floor/plasteel/dark, /area/slavers) -"WB" = ( -/obj/effect/decal/cleanable/oil, +"Wy" = ( +/obj/effect/turf_decal/stripes/white/line, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/stripes/white/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/slavers) +"Wz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/tdome/tdomeadmin) +"WA" = ( +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, /area/slavers) "WC" = ( /obj/structure/table/reinforced, /obj/item/pen, /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) -"WF" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/fans/tiny/invisible, -/obj/structure/window/reinforced{ - dir = 8 +"WE" = ( +/obj/machinery/door/airlock{ + id_tag = null; + name = "Toilet" }, -/turf/open/water/decorative, -/area/slavers) -"WG" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/showroomfloor, /area/slavers) -"WH" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_y = 5 - }, +"WF" = ( +/obj/machinery/vending/kink, +/turf/open/floor/padded, +/area/slavers) +"WG" = ( +/obj/machinery/computer/security, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, -/area/centcom/supplypod) +/area/centcom/control) "WI" = ( -/obj/structure/lattice, -/turf/open/water/decorative, -/area/slavers) +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/two) "WJ" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Administration"; @@ -20674,13 +20839,9 @@ /turf/open/floor/plasteel, /area/centcom/supplypod/loading/one) "WL" = ( -/obj/structure/sign/poster/official/walk, -/turf/closed/indestructible{ - icon = 'icons/turf/walls/wood_wall.dmi'; - icon_state = "wood"; - smooth = 1 - }, -/area/ruin/powered) +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/one) "WM" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 32 @@ -20688,12 +20849,13 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "WN" = ( -/obj/machinery/shower{ - pixel_y = 14 +/obj/structure/sign/poster/contraband/kudzu, +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 }, -/obj/item/soap/homemade, -/turf/open/floor/plasteel/showroomfloor/shower, -/area/slavers) +/area/ruin/powered) "WO" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -20725,9 +20887,10 @@ /obj/structure/closet/syndicate/personal, /turf/open/floor/wood, /area/syndicate_mothership) +"WT" = ( +/turf/open/floor/plating, +/area/slavers) "WU" = ( -/obj/item/book/manual/splurt_space_law, -/obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -20738,8 +20901,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/light/floor, /turf/open/floor/plasteel/dark, -/area/centcom/control) +/area/tdome/tdomeobserve) "WV" = ( /obj/machinery/vending/cigarette, /obj/machinery/light{ @@ -20751,21 +20915,34 @@ /obj/machinery/processor, /turf/open/floor/plasteel/cafeteria, /area/syndicate_mothership) -"WX" = ( -/obj/structure/railing/corner, -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +"WY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) +"WZ" = ( +/obj/structure/rack{ + icon = 'icons/obj/stationobjs.dmi'; + icon_state = "minibar_left"; + name = "skeletal minibar" + }, +/obj/machinery/chem_dispenser/drinks{ + pixel_x = 1 }, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/open/floor/wood, /area/slavers) "Xa" = ( -/obj/machinery/door/airlock/centcom{ - name = "Cell 3" - }, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 9 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel/dark, /area/slavers) "Xb" = ( /obj/structure/closet/crate, @@ -20786,6 +20963,13 @@ /obj/item/vending_refill/snack, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Xc" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "Xd" = ( /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/fullgrass, @@ -20793,6 +20977,21 @@ /obj/structure/window/reinforced/fulltile, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Xe" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/structure/reagent_dispensers/beerkeg{ + pixel_x = 5; + pixel_y = 6 + }, +/turf/open/floor/plasteel/dark, +/area/centcom/supplypod) +"Xf" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/plasteel/cafeteria, +/area/slavers) "Xg" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -20805,11 +21004,22 @@ }, /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) +"Xi" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/turf/open/floor/plasteel/dark/side{ + dir = 1 + }, +/area/slavers) "Xj" = ( -/obj/machinery/door/airlock/centcom{ - name = "Broadcasting Cell" +/obj/structure/chair{ + dir = 4 }, -/turf/open/floor/padded, +/turf/open/floor/plasteel, /area/slavers) "Xk" = ( /obj/structure/window/reinforced{ @@ -20838,13 +21048,32 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "Xn" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/slavers) +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/book/manual/splurt_space_law, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/centcom/ferry) "Xo" = ( /obj/machinery/vending/dinnerware, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) +"Xp" = ( +/turf/open/floor/mech_bay_recharge_floor{ + color = "#8c8c8c" + }, +/area/slavers) "Xq" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -20862,6 +21091,11 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/four) +"Xs" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/water/decorative, +/area/slavers) "Xt" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security"; @@ -20881,24 +21115,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/holofloor, /area/holodeck/rec_center/firingrange) -"Xw" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/slavers) -"Xx" = ( -/obj/structure/table, -/obj/item/storage/fancy/egg_box, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/plasteel/cafeteria, -/area/slavers) "Xy" = ( /obj/machinery/door/airlock/external{ name = "Ferry Airlock" @@ -20912,25 +21128,6 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "Xz" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "grassb3" - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, -/area/slavers) -"XA" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/flora/rock/jungle{ - icon_state = "rock4" - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" - }, -/area/slavers) -"XD" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 5 }, @@ -20939,45 +21136,50 @@ }, /turf/open/floor/plasteel, /area/slavers) -"XE" = ( -/obj/machinery/door/airlock/centcom{ - name = "Kitchen"; - req_access_txt = "150" - }, -/turf/open/floor/plasteel, -/area/syndicate_mothership) -"XG" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +"XA" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/condiment/saltshaker{ + layer = 3.1; + pixel_x = -2; + pixel_y = 2 }, -/turf/open/floor/plasteel, -/area/slavers) -"XH" = ( -/turf/open/floor/plasteel/cafeteria, -/area/slavers) -"XI" = ( -/obj/structure/railing{ - dir = 1 +/obj/item/reagent_containers/food/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 }, -/obj/structure/fans/tiny/invisible, -/obj/structure/window/reinforced{ - dir = 1 +/obj/item/reagent_containers/food/condiment/enzyme{ + pixel_x = 9; + pixel_y = 3 }, -/turf/open/water/decorative, +/turf/open/floor/plasteel/cafeteria, /area/slavers) -"XJ" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock1" +"XC" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/light_emitter, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/one) +"XE" = ( +/obj/machinery/door/airlock/centcom{ + name = "Kitchen"; + req_access_txt = "150" }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia1" +/turf/open/floor/plasteel, +/area/syndicate_mothership) +"XG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/area/slavers) -"XK" = ( +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) +"XH" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/bar{ dir = 8 }, +/obj/structure/chair/wood/normal{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/slavers) "XL" = ( @@ -20994,37 +21196,39 @@ /turf/open/floor/carpet/red, /area/centcom/holding) "XO" = ( -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/palebush, -/obj/structure/window/reinforced/fulltile, -/turf/open/indestructible/hotelwood, -/area/ruin/powered) -"XR" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) -"XS" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/obj/structure/table/wood, +/obj/item/folder/red, +/obj/item/book/manual/splurt_space_law, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/structure/weightmachine/weightlifter, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/bar{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, /turf/open/floor/plasteel/dark, +/area/centcom/ferry) +"XQ" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel/dark/side{ + dir = 5 + }, /area/slavers) "XT" = ( /obj/structure/table/wood, @@ -21037,6 +21241,12 @@ }, /turf/open/floor/mineral/plastitanium/red, /area/centcom/evac) +"XV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "XW" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -27 @@ -21061,10 +21271,15 @@ /area/centcom/holding) "Yb" = ( /obj/effect/turf_decal/tile/bar{ - dir = 4 + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/mech_bay_recharge_port{ + dir = 1 }, -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/box/white, /turf/open/floor/plasteel/dark, /area/slavers) "Yc" = ( @@ -21096,34 +21311,52 @@ }, /turf/open/floor/plating, /area/syndicate_mothership) +"Yh" = ( +/obj/structure/sink/kitchen{ + pixel_y = 16 + }, +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/white, +/area/slavers) "Yi" = ( /obj/structure/dresser, /turf/open/floor/plasteel/dark, /area/syndicate_mothership) +"Yj" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/slavers) "Yl" = ( -/obj/machinery/vending/sustenance, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/bar{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/closet/slaver, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/plasteel/dark, /area/slavers) "Ym" = ( /obj/machinery/computer/arcade/orion_trail, /turf/open/indestructible/hotelwood, /area/centcom/holding) "Yp" = ( -/obj/structure/sign/warning/securearea{ - desc = "A warning sign which reads 'FOURTH WALL'."; - name = "\improper FOURTH WALL"; - pixel_x = -32 - }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia0" - }, +/obj/item/kirbyplants/random, +/turf/open/floor/carpet/red, /area/slavers) -"Yr" = ( -/obj/structure/fans/tiny/invisible, -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +"Yq" = ( +/obj/structure/sink/kitchen{ + pixel_y = 16 }, +/obj/structure/mirror{ + pixel_y = 28 + }, +/turf/open/floor/plasteel/white, /area/slavers) "Ys" = ( /obj/structure/table/reinforced, @@ -21147,16 +21380,10 @@ /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "Yv" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/dark/side{ +/obj/structure/bed/pod{ dir = 1 }, +/turf/open/floor/plating, /area/slavers) "Yw" = ( /turf/closed/indestructible/fakedoor{ @@ -21164,13 +21391,14 @@ }, /area/syndicate_mothership) "Yx" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/obj/structure/railing{ + dir = 4 }, -/obj/machinery/computer/mech_bay_power_console{ +/obj/structure/fans/tiny/invisible, +/obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/plasteel/dark, +/turf/open/water/decorative, /area/slavers) "Yy" = ( /obj/machinery/door/airlock/titanium, @@ -21183,33 +21411,47 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"YA" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 +"YB" = ( +/obj/machinery/microwave{ + pixel_y = 6 }, -/obj/effect/turf_decal/tile/bar{ +/obj/structure/table, +/turf/open/floor/plasteel/cafeteria, +/area/slavers) +"YC" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/seeds/onion, +/obj/item/seeds/garlic, +/obj/item/seeds/potato, +/obj/item/seeds/tomato, +/obj/item/seeds/carrot, +/obj/item/seeds/grass, +/obj/item/seeds/ambrosia, +/obj/item/seeds/wheat, +/obj/item/seeds/pumpkin, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/defibrillator_mount/loaded{ - pixel_y = 28 - }, -/obj/machinery/computer/operating, /turf/open/floor/plasteel/dark, /area/slavers) "YD" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +/obj/structure/sign/poster/contraband/lusty_xenomorph{ + pixel_y = 32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/slavers) +"YE" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 }, +/turf/open/floor/plasteel/dark, /area/slavers) "YF" = ( /obj/machinery/vending/clothing{ @@ -21217,9 +21459,6 @@ }, /turf/open/floor/wood, /area/centcom/holding) -"YG" = ( -/turf/open/floor/plasteel/showroomfloor, -/area/slavers) "YH" = ( /obj/item/hilbertshotel/ghostdojo, /turf/open/indestructible/hotelwood, @@ -21233,26 +21472,33 @@ /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "YK" = ( -/obj/machinery/button/door{ - id = "slavers_cell3"; - name = "privacy shutters"; - pixel_y = -26 +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/white/corner, +/turf/open/floor/plasteel, /area/slavers) "YL" = ( -/obj/effect/spawner/structure/window/reinforced/indestructable, -/turf/open/floor/plating, +/obj/structure/table/plasmaglass, +/obj/item/camera{ + pixel_y = 11 + }, +/obj/item/restraints/handcuffs/fake/kinky{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/camera_film{ + pixel_x = 9; + pixel_y = 7 + }, +/obj/item/restraints/handcuffs/fake/kinky, +/turf/open/floor/padded, /area/slavers) "YM" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/flora/junglebush, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" }, -/turf/open/floor/plasteel/dark, /area/slavers) "YN" = ( /obj/structure/window/reinforced{ @@ -21281,8 +21527,20 @@ /obj/item/book/manual/hydroponics_pod_people, /turf/open/indestructible/hotelwood, /area/centcom/holding) -"YS" = ( -/turf/closed/wall/r_wall, +"YQ" = ( +/obj/machinery/light/floor, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/floor/pod/light, +/area/slavers) +"YT" = ( +/obj/machinery/door/airlock{ + id_tag = null; + name = "Toilet" + }, +/turf/open/floor/plasteel/showroomfloor, /area/slavers) "YU" = ( /obj/structure/window/reinforced{ @@ -21302,31 +21560,20 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "YW" = ( -/obj/machinery/vending/cola/red, -/obj/effect/turf_decal/tile/bar{ - dir = 8 - }, -/turf/open/floor/plasteel/dark/corner{ - dir = 8 - }, +/turf/open/water/decorative, /area/slavers) -"YY" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, +"YX" = ( +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/bar{ dir = 4 }, -/obj/effect/turf_decal/tile/red, -/obj/structure/closet/slaver, -/obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/slavers) -"YZ" = ( -/obj/structure/flora/junglebush, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +"YY" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, +/turf/open/floor/plasteel/dark, /area/slavers) "Za" = ( /obj/machinery/door/airlock/wood{ @@ -21334,51 +21581,39 @@ }, /turf/open/floor/wood, /area/centcom/holding) -"Zc" = ( -/turf/open/indestructible/binary, -/area/space) -"Zd" = ( -/obj/machinery/door/airlock{ - id_tag = null; - name = "Toilet" - }, -/turf/open/floor/plasteel/showroomfloor, -/area/slavers) -"Ze" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 +"Zb" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/rglass{ + amount = 50; + pixel_x = 2; + pixel_y = -1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -3; + pixel_y = -2 }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/rack, +/obj/effect/turf_decal/tile/bar{ dir = 8 }, -/obj/structure/table/optable, -/obj/effect/turf_decal/bot_white, -/obj/item/surgical_drapes, /turf/open/floor/plasteel/dark, /area/slavers) -"Zf" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/book/manual/splurt_space_law, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +"Zc" = ( +/turf/open/indestructible/binary, +/area/space) +"Zd" = ( +/obj/effect/holodeck_effect/mobspawner/bumbles, +/obj/item/melee/flyswatter, +/turf/open/floor/holofloor/asteroid, +/area/holodeck/rec_center/anthophila) +"Zg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, +/obj/structure/closet/crate, /turf/open/floor/plasteel/dark, -/area/tdome/tdomeadmin) -"Zg" = ( -/turf/closed/indestructible/rock, /area/slavers) "Zh" = ( /obj/item/kirbyplants{ @@ -21389,64 +21624,43 @@ "Zi" = ( /turf/open/floor/plasteel, /area/centcom/supplypod/podStorage) -"Zj" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/centcom/supplypod) -"Zk" = ( -/obj/structure/table/wood/fancy, -/obj/item/book/manual/splurt_space_law, -/turf/open/floor/holofloor{ - dir = 8; - icon_state = "dark" - }, -/area/holodeck/rec_center/chapelcourt) "Zl" = ( /obj/structure/bed/dogbed, /turf/open/indestructible/hotelwood, /area/centcom/holding) "Zn" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/slavers) -"Zp" = ( -/turf/open/water/decorative, +/obj/effect/holodeck_effect/mobspawner/bumbles, +/turf/open/floor/holofloor/asteroid, +/area/holodeck/rec_center/anthophila) +"Zq" = ( +/obj/machinery/light/floor, +/turf/open/floor/pod/light, /area/slavers) "Zr" = ( /obj/machinery/light, /turf/open/floor/plasteel/dark, /area/syndicate_mothership) "Zs" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/light/floor, +/turf/open/floor/plasteel, +/area/tdome/tdomeadmin) +"Zt" = ( +/obj/structure/bed{ dir = 4 }, -/obj/item/roller, -/obj/item/roller{ - pixel_x = 3; - pixel_y = 5 +/obj/item/bedsheet/hos{ + desc = "A fancy red bedsheet."; + name = "red bedsheet" }, -/turf/open/floor/plasteel/dark, +/obj/effect/landmark/start/slaver, +/turf/open/floor/wood, /area/slavers) -"Zt" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/white/corner, -/turf/open/floor/plasteel, +"Zu" = ( +/obj/structure/lattice/catwalk, +/turf/open/water/decorative, /area/slavers) "Zv" = ( /obj/structure/closet, @@ -21473,37 +21687,50 @@ }, /turf/open/indestructible/hotelwood, /area/centcom/holding) +"Zy" = ( +/obj/structure/flora/rock/jungle{ + icon_state = "grassb3" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia2" + }, +/area/slavers) "Zz" = ( /obj/effect/landmark/start/nukeop_leader, /turf/open/floor/wood, /area/syndicate_mothership) "ZA" = ( -/obj/effect/turf_decal/stripes/white/line{ +/obj/effect/turf_decal/arrows/red{ dir = 1 }, -/obj/effect/turf_decal/stripes/white/corner, -/turf/open/floor/plasteel, -/area/slavers) +/obj/effect/turf_decal/trimline/red/line, +/obj/effect/turf_decal/trimline/red/filled/line, +/turf/open/floor/plasteel/dark/side, +/area/slavers/export) "ZB" = ( -/obj/structure/toilet{ +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/showroomfloor, +/obj/machinery/vending/cola/black, +/turf/open/floor/plasteel/dark, /area/slavers) "ZC" = ( -/obj/structure/toilet{ - dir = 4 +/obj/structure/flora/rock/jungle{ + icon_state = "rock1" + }, +/turf/open/floor/plating/asteroid/layenia/garden{ + icon_state = "layenia1" }, -/obj/effect/decal/cleanable/semen, -/turf/open/floor/plasteel/showroomfloor, /area/slavers) "ZE" = ( -/obj/structure/toilet{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/turf/open/floor/plasteel/showroomfloor, -/area/slavers) +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) "ZF" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -21511,31 +21738,12 @@ }, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/four) -"ZG" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "ZH" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 }, /turf/open/floor/plating, /area/syndicate_mothership) -"ZI" = ( -/obj/machinery/computer/shuttle/slaver/recall, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/slavers) "ZJ" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security"; @@ -21563,33 +21771,40 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding) "ZM" = ( -/obj/effect/turf_decal/tile/bar{ - dir = 8 +/obj/structure/table/plasmaglass, +/obj/item/assembly/signaler{ + pixel_x = 7; + pixel_y = 9 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/item/dildo/random{ + pixel_x = -4; + pixel_y = 6 }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/bar{ - dir = 4 +/obj/item/dildo/knotted{ + pixel_y = 2 }, -/obj/structure/weightmachine/stacklifter, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/plasteel/dark, +/turf/open/floor/padded, /area/slavers) "ZN" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/machinery/research_table/slaver, +/obj/machinery/button/door{ + id = "slavers_cell4"; + name = "privacy shutters"; + pixel_y = -26 }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/padded, /area/slavers) "ZO" = ( -/obj/structure/flora/rock/jungle{ - icon_state = "rock4" +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +/obj/effect/turf_decal/tile/bar{ + dir = 4 }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/space_heater, +/obj/effect/turf_decal/box/white, +/turf/open/floor/plasteel/dark, /area/slavers) "ZP" = ( /obj/effect/turf_decal/stripes/line{ @@ -21613,10 +21828,13 @@ /turf/open/floor/plasteel/white, /area/centcom/holding) "ZS" = ( -/turf/open/floor/plating/asteroid/layenia/garden{ - icon_state = "layenia2" +/obj/structure/sign/poster/official/walk, +/turf/closed/indestructible{ + icon = 'icons/turf/walls/wood_wall.dmi'; + icon_state = "wood"; + smooth = 1 }, -/area/slavers) +/area/ruin/powered) "ZT" = ( /mob/living/simple_animal/cow, /turf/open/floor/grass, @@ -21652,12 +21870,41 @@ }, /turf/open/floor/plasteel, /area/centcom/supply) -"ZZ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/showroomfloor, -/area/slavers) +"ZY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/centcom/supplypod/loading/ert) (1,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +gu +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -21732,33 +21979,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -gu -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -21915,8 +22135,23 @@ aa aa "} (2,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +aa aa -ad aa aa aa @@ -21989,21 +22224,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -22172,6 +22392,21 @@ LV aa "} (3,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -22246,21 +22481,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -22429,6 +22649,21 @@ LV aa "} (4,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -22503,21 +22738,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -22686,6 +22906,21 @@ LV aa "} (5,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -22760,21 +22995,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -22943,6 +23163,21 @@ LV aa "} (6,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -23017,21 +23252,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -23200,6 +23420,21 @@ LV aa "} (7,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -23274,21 +23509,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -23457,6 +23677,21 @@ LV aa "} (8,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -23531,21 +23766,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -23714,6 +23934,21 @@ LV aa "} (9,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -23788,21 +24023,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -23971,6 +24191,21 @@ LV aa "} (10,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -24045,21 +24280,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -24228,6 +24448,21 @@ LV aa "} (11,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fY +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -24302,21 +24537,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -fY -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -24485,6 +24705,21 @@ LV aa "} (12,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -24559,21 +24794,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -24742,6 +24962,21 @@ LV aa "} (13,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -24816,21 +25051,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -24999,6 +25219,21 @@ LV aa "} (14,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -25073,21 +25308,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -25256,6 +25476,21 @@ LV aa "} (15,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -25330,21 +25565,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -25513,6 +25733,278 @@ LV aa "} (16,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +LV +LV +LV +LV +LV +LV +LV +LV +LV +LV +LV +aa +"} +(17,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -25587,21 +26079,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -25756,20 +26233,35 @@ aa aa aa aa -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa "} -(17,1,1) = {" +(18,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -25844,21 +26336,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -25945,13 +26422,13 @@ lI lI lI lI -lI -lI -lI -lI -lI -lI -lI +qE +qE +Ax +Ax +Ax +qE +qE lI lI lI @@ -26026,7 +26503,22 @@ aa aa aa "} -(18,1,1) = {" +(19,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -26101,21 +26593,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -26199,15 +26676,18 @@ lI lI lI lI -lI -lI -lI qE qE +qE +qE +yC +zo +zN +zo +Bf +qE Ax Ax -Ax -qE qE lI lI @@ -26222,26 +26702,6 @@ lI lI lI lI -lI -lI -lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -26281,9 +26741,41 @@ aa aa aa aa +PB +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PB aa "} -(19,1,1) = {" +(20,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -26358,21 +26850,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -26455,20 +26932,21 @@ lI lI lI lI -lI qE qE +ME +vj +ya +qZ +qZ +qZ +qZ +qZ +BS +qZ +qZ qE qE -yC -zo -zN -zo -Bf -qE -Ax -Ax -qE lI lI lI @@ -26481,24 +26959,6 @@ lI lI lI lI -lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -26538,9 +26998,41 @@ aa aa aa aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa "} -(20,1,1) = {" +(21,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -26615,21 +27107,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -26711,22 +27188,26 @@ lI lI lI lI -lI qE qE -ME +uD +wM vj -ya +qE qZ qZ qZ qZ qZ -BS +qE qZ +uE qZ qE qE +qE +qE +qE lI lI lI @@ -26735,27 +27216,6 @@ lI lI lI lI -lI -lI -lI -lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -26795,9 +27255,41 @@ aa aa aa aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa "} -(21,1,1) = {" +(22,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -26872,21 +27364,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -26967,37 +27444,35 @@ lI lI lI lI -lI qE qE -uD -wM +vj +vj +vj vj qE +yC +zo qZ -qZ -qZ -qZ -qZ +zo +Bf qE qZ -uE +qZ qZ qE +DL +DZ +Eh qE qE -qE +Ax qE lI lI lI lI lI -lI -lI -lI -aa -aa aa aa aa @@ -27037,7 +27512,26 @@ aa aa aa aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa +"} +(23,1,1) = {" aa aa aa @@ -27053,8 +27547,6 @@ aa aa aa aa -"} -(22,1,1) = {" aa aa aa @@ -27129,21 +27621,6 @@ aa aa aa aa -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl -Cl aa aa aa @@ -27225,29 +27702,29 @@ lI lI lI qE -qE -vj -vj +uC +vk vj vj +xu +qE +qE +Ax +Ax +Ax qE -yC -zo -qZ -zo -Bf qE +Ci +uE qZ +DC +DM +DM +Ei +EC qZ qZ qE -DL -DZ -Eh -qE -qE -Ax -qE lI lI lI @@ -27292,26 +27769,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa "} -(23,1,1) = {" +(24,1,1) = {" aa aa aa @@ -27478,55 +27955,38 @@ lI lI lI lI -lI -lI -lI qE -uC -vk -vj -vj -xu qE qE -Ax -Ax -Ax qE +uD +vj +vj +vj +xv qE -Ci -uE +yD qZ -DC -DM -DM -Ei -EC qZ qZ +Bg +qE +qZ +qZ +qZ +qE +DN +Ea +Ej +qE +qE +EC +qE +qE qE lI lI lI -lI -lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -27566,9 +28026,26 @@ aa aa aa aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa "} -(24,1,1) = {" +(25,1,1) = {" aa aa aa @@ -27734,35 +28211,35 @@ lI lI lI lI -lI qE qE +rW +sW qE qE -uD -vj -vj -vj -xv qE -yD +wb +qE +qE +qE +yE qZ qZ qZ -Bg +Bh qE qZ -qZ +uE qZ qE -DN -Ea -Ej qE qE -EC qE qE +qZ +qZ +FT +Gr qE lI lI @@ -27806,26 +28283,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa "} -(25,1,1) = {" +(26,1,1) = {" aa aa aa @@ -27991,37 +28468,37 @@ lI lI lI lI -qE -qE -rW -sW -qE -qE -qE -wb -qE -qE -qE -yE +Ax +EW qZ qZ +Ax qZ -Bh -qE qZ -uE qZ +wN +xw qE +qZ +qZ +qZ +qZ +qZ +Ax +qZ +qZ +qZ qE +DO +Eb +Ek qE -qE -qE +EW qZ qZ -FT Gr -qE -lI +Gz +GX lI lI aa @@ -28063,26 +28540,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa "} -(26,1,1) = {" +(27,1,1) = {" aa aa aa @@ -28249,31 +28726,31 @@ lI lI lI Ax -EW -qZ -qZ -Ax +ra +Bf qZ +tX qZ qZ -wN -xw -qE qZ qZ qZ +yb qZ qZ -Ax +zO +Ay qZ +BS qZ +uE qZ -qE -DO -Eb -Ek -qE -EW +DD +uE +Ec +uE +Ax +EX qZ qZ Gr @@ -28281,6 +28758,7 @@ Gz GX lI lI +HG aa aa aa @@ -28319,27 +28797,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +PW +PW +PW +PW +PW +Tt +Tt +Tt +Tt +Tt +PW aa "} -(27,1,1) = {" +(28,1,1) = {" aa aa aa @@ -28506,31 +28983,31 @@ lI lI lI Ax -ra -Bf -qZ -tX +Na qZ qZ +Ax qZ qZ qZ -yb +wO +xx +qE qZ qZ -zO -Ay qZ -BS qZ -uE qZ -DD -uE -Ec -uE Ax -EX +qZ +qZ +qZ +qE +DP +Ed +El +qE +EW qZ qZ Gr @@ -28538,23 +29015,6 @@ Gz GX lI lI -HG -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -28594,9 +29054,26 @@ aa aa aa aa +PW +Tt +Tt +Tt +Tt +Tt +PW +Km +Km +Km +PW +Tt +Tt +Tt +Tt +Tt +PW aa "} -(28,1,1) = {" +(29,1,1) = {" aa aa aa @@ -28762,37 +29239,37 @@ lI lI lI lI -Ax -Na -qZ -qZ -Ax -qZ -qZ -qZ -wO -xx qE +qE +rX +sX +qE +qE +qE +wc +qE +qE +qE +yF qZ qZ qZ +Bh +qE qZ -qZ -Ax -qZ -qZ +uE qZ qE -DP -Ed -El qE -EW -qZ +qE +qE +qE +EY qZ +FT Gr -Gz -GX +qE +lI lI lI aa @@ -28834,26 +29311,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +PW +Km +Km +Km +PW +Tt +Tt +Tt +Tt +Tt +PW aa "} -(29,1,1) = {" +(30,1,1) = {" aa aa aa @@ -29019,35 +29496,35 @@ lI lI lI lI +lI qE qE -rX -sX -qE -qE -qE -wc qE qE +uE +vl +uE +wP +xy qE -yF -qZ +yG +zp +zP qZ qZ -Bh qE qZ -uE +qZ qZ qE +DQ +Ee +Em qE qE +Ax qE qE -EY -qZ -FT -Gr qE lI lI @@ -29091,26 +29568,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +PW +Km +Km +Km +PW +Tt +Tt +Tt +Tt +Tt +PW aa "} -(30,1,1) = {" +(31,1,1) = {" aa aa aa @@ -29277,38 +29754,38 @@ lI lI lI lI +lI +lI +lI qE -qE -qE -qE -uE -vl +uF +vm +wd uE -wP -xy -qE -yG -zp -zP -qZ -qZ -qE -qZ -qZ -qZ -qE -DQ -Ee -Em +xz qE qE Ax +Ax +Ax qE qE +Ci +uE +qZ +DE +DR +DR +En qE lI lI lI +lI +lI +lI +lI +lI aa aa aa @@ -29348,26 +29825,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +PW +PW +PW +PW +PW +Tt +Tt +Tt +Tt +Tt +PW aa "} -(31,1,1) = {" +(32,1,1) = {" aa aa aa @@ -29538,25 +30015,25 @@ lI lI lI qE -uF -vm -wd -uE -xz -qE qE +vn +uE +vl +uE Ax +yH +yK +zQ +Az +yK Ax -Ax -qE -qE -Ci -uE qZ -DE -DR -DR -En +qZ +qZ +qE +DS +Ef +Eo qE lI lI @@ -29605,26 +30082,26 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa "} -(32,1,1) = {" +(33,1,1) = {" aa aa aa @@ -29794,26 +30271,26 @@ lI lI lI lI +lI qE qE -vn -uE -vl -uE +uF +wQ +wd Ax -yH -yK -zQ -Az -yK +yI +zq +yI +AA +yI Ax qZ -qZ +uE qZ qE -DS -Ef -Eo +qE +qE +qE qE lI lI @@ -29832,37 +30309,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI aa aa aa @@ -29880,8 +30326,39 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW +aa "} -(33,1,1) = {" +(34,1,1) = {" aa aa aa @@ -30052,26 +30529,26 @@ lI lI lI lI +lI qE qE -uF -wQ -wd +vn +uE Ax -yI +yJ +zr +yK zq -yI -AA -yI +yK Ax qZ -uE qZ qE qE -qE -qE -qE +lI +lI +lI +lI lI lI lI @@ -30089,37 +30566,6 @@ aa aa aa aa -lI -lI -lI -Zc -Zc -Zc -Zc -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI aa aa aa @@ -30137,8 +30583,39 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW +aa "} -(34,1,1) = {" +(35,1,1) = {" aa aa aa @@ -30310,20 +30787,19 @@ lI lI lI lI +lI +qE +qE qE qE -vn -uE -Ax -yJ -zr yK zq -yK -Ax -qZ -qZ +yI +AB +Bi qE +Ax +Ax qE lI lI @@ -30337,6 +30813,17 @@ lI lI lI lI +lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -30346,37 +30833,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -Zc -Zc -Zc -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -lI -Zc -Zc -lI -lI -lI -lI -lI -lI -lI aa aa aa @@ -30394,8 +30850,29 @@ aa aa aa aa +aa +aa +aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW +aa "} -(35,1,1) = {" +(36,1,1) = {" aa aa aa @@ -30568,18 +31045,15 @@ lI lI lI lI +lI +lI +lI +qE qE qE qE qE -yK -zq -yI -AB -Bi qE -Ax -Ax qE lI lI @@ -30594,43 +31068,6 @@ lI lI lI lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -Zc -Zc -lI -lI -lI -lI -lI lI lI lI @@ -30651,41 +31088,6 @@ aa aa aa aa -"} -(36,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -30708,7 +31110,26 @@ aa aa aa aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW aa +"} +(37,1,1) = {" aa aa aa @@ -30806,6 +31227,62 @@ aa aa aa aa +mB +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh aa lI lI @@ -30828,13 +31305,13 @@ lI lI lI lI -qE -qE -qE -qE -qE -qE -qE +lI +lI +lI +lI +lI +lI +lI lI lI lI @@ -30860,37 +31337,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -lI -Zc -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -Zc -Zc -lI -lI -lI -lI -lI -lI -Zc -Zc -lI aa aa aa @@ -30908,8 +31354,39 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW +aa "} -(37,1,1) = {" +(38,1,1) = {" aa aa aa @@ -31007,61 +31484,61 @@ aa aa aa aa -mB -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh hh +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl hh aa lI @@ -31117,37 +31594,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -lI -lI -lI -lI -lI -lI -lI -lI -Zc -lI -lI aa aa aa @@ -31165,8 +31611,39 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +PW +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +Tt +PW +aa "} -(38,1,1) = {" +(39,1,1) = {" aa aa aa @@ -31374,37 +31851,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -lI -lI -lI aa aa aa @@ -31422,8 +31868,39 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +PB +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PW +PB +aa "} -(39,1,1) = {" +(40,1,1) = {" aa aa aa @@ -31631,37 +32108,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -MB -MB -MB -To -To -To -To -To -MH -To -To -To -MB -To -To -To -To -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -31680,7 +32157,7 @@ aa aa aa "} -(40,1,1) = {" +(41,1,1) = {" aa aa aa @@ -31888,37 +32365,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -MB -MB -To -To -To -To -To -To -To -MB -MB -To -To -To -To -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -31937,7 +32414,7 @@ aa aa aa "} -(41,1,1) = {" +(42,1,1) = {" aa aa aa @@ -32145,37 +32622,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -MB -MB -To -To -To -To -To -To -MB -To -To -To -To -To -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -32194,7 +32671,7 @@ aa aa aa "} -(42,1,1) = {" +(43,1,1) = {" aa aa aa @@ -32349,50 +32826,6 @@ hl hl hh aa -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI aa aa aa @@ -32402,37 +32835,81 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -To -MB -MB -To -To -To -To -To -MB -To -To -To -MB -MB -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -32451,7 +32928,7 @@ aa aa aa "} -(43,1,1) = {" +(44,1,1) = {" aa aa aa @@ -32605,6 +33082,43 @@ hl hl hl hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh aa aa aa @@ -32659,43 +33173,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -To -To -MB -MB -To -To -MB -MB -MB -To -To -MB -MB -To -lI -lI -lI -lI -lI -lI -lI -aa -aa -aa -aa -aa -aa aa aa aa @@ -32708,7 +33185,7 @@ aa aa aa "} -(44,1,1) = {" +(45,1,1) = {" aa aa aa @@ -32861,43 +33338,43 @@ hl hl hl hl -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh -hh +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +my +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +kt +MD +kt +kt +kt +kt +kt +kt +kt +kt +kt +kt +hl hh aa aa @@ -32916,37 +33393,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -To -To -To -MB -MB -To -MB -MB -MB -MB -MB -MB -To -To -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -32965,7 +33442,7 @@ aa aa aa "} -(45,1,1) = {" +(46,1,1) = {" aa aa aa @@ -33120,7 +33597,9 @@ hl hl hl hl +mz hl +my hl hl hl @@ -33131,28 +33610,26 @@ hl hl hl hl -my -hl -hl -hl -hl -hl -hl -hl hl hl hl kt -MD -kt -kt -kt kt kt kt kt kt kt +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl kt hl hh @@ -33173,37 +33650,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -MB -MB -To -To -To -To -To -MB -To -To -MB -To -To -To -To -To -To -lI -lI -lI -Zc -Zc -lI -lI aa aa aa @@ -33221,14 +33667,45 @@ aa aa aa aa -"} -(46,1,1) = {" -aa -aa -aa -aa -aa -aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(47,1,1) = {" +aa +aa +aa +aa +aa +aa aa aa aa @@ -33377,13 +33854,12 @@ hl hl hl hl -mz -hl -my hl +nx hl hl hl +nx hl hl hl @@ -33391,15 +33867,16 @@ hl hl hl hl +my hl hl kt -kt -kt -kt -kt -kt -kt +hl +hl +hl +hl +hl +hl hl hl hl @@ -33430,37 +33907,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -MB -To -To -To -To -To -MB -MB -MB -To -To -To -To -To -To -To -lI -lI -Zc -Zc -Zc -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -33479,7 +33956,7 @@ aa aa aa "} -(47,1,1) = {" +(48,1,1) = {" aa aa aa @@ -33635,11 +34112,12 @@ hl hl hl hl -nx hl +mA hl hl -nx +hl +mz hl hl hl @@ -33647,7 +34125,6 @@ hl hl hl hl -my hl hl kt @@ -33687,37 +34164,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -NF -To -To -To -To -To -To -MB -Qm -MB -To -To -To -To -To -To -AG -lI -lI -lI -Zc -Zc -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -33736,7 +34213,7 @@ aa aa aa "} -(48,1,1) = {" +(49,1,1) = {" aa aa aa @@ -33890,13 +34367,6 @@ hl hl hl hl -hl -hl -hl -mA -hl -hl -hl mz hl hl @@ -33907,6 +34377,13 @@ hl hl hl hl +hl +kt +kt +kt +kt +kt +kt kt hl hl @@ -33944,37 +34421,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -To -MB -MB -MB -MB -To -MB -MB -To -To -To -To -To -To -lI -lI -lI -Zc -Zc -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -33993,7 +34470,7 @@ aa aa aa "} -(49,1,1) = {" +(50,1,1) = {" aa aa aa @@ -34147,7 +34624,14 @@ hl hl hl hl -mz +hl +hl +hl +hl +mz +hl +hl +hl hl hl hl @@ -34158,13 +34642,6 @@ hl hl hl hl -kt -kt -kt -kt -kt -kt -kt hl hl hl @@ -34201,37 +34678,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -MB -MB -MB -MB -To -To -To -MB -To -To -To -To -To -To -lI -lI -lI -lI -Zc -Zc -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -34250,7 +34727,7 @@ aa aa aa "} -(50,1,1) = {" +(51,1,1) = {" aa aa aa @@ -34405,16 +34882,15 @@ hl hl hl hl -hl -hl -hl -mz +nx hl hl hl hl +my hl hl +my hl hl hl @@ -34439,6 +34915,7 @@ hl hl hl kt +kt hl hh aa @@ -34458,37 +34935,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -MB -MB -MB -To -To -To -To -To -MB -MB -To -To -To -To -To -lI -lI -lI -lI -lI -Zc -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -34507,7 +34984,7 @@ aa aa aa "} -(51,1,1) = {" +(52,1,1) = {" aa aa aa @@ -34662,15 +35139,15 @@ hl hl hl hl -nx hl hl hl hl -my hl hl -my +hl +hl +hl hl hl hl @@ -34695,7 +35172,7 @@ hl hl hl kt -kt +hl hl hh aa @@ -34715,37 +35192,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -MB -MB -To -MB -To -To -To -To -To -To -MB -MB -MB -To -To -To -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -34764,7 +35241,7 @@ aa aa aa "} -(52,1,1) = {" +(53,1,1) = {" aa aa aa @@ -34917,16 +35394,16 @@ hl hl hl hl +my hl hl +mA hl hl hl hl hl -hl -hl -hl +mA hl hl hl @@ -34972,43 +35449,6 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -MB -MB -To -To -MB -MB -To -To -To -To -To -To -To -MB -MB -To -To -lI -lI -lI -lI -lI -lI -lI -aa -aa -aa -aa -aa -aa aa aa aa @@ -35020,14 +35460,51 @@ aa aa aa aa -"} -(53,1,1) = {" -aa -aa -aa -aa -aa -aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(54,1,1) = {" +aa +aa +aa +aa +aa +aa aa aa aa @@ -35174,16 +35651,16 @@ hl hl hl hl -my hl hl -mA hl hl hl hl +mz +hl +hl hl -mA hl hl hl @@ -35229,37 +35706,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -MB -MB -MB -To -To -To -To -To -To -To -To -MB -MB -To -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35278,7 +35755,7 @@ aa aa aa "} -(54,1,1) = {" +(55,1,1) = {" aa aa aa @@ -35434,12 +35911,12 @@ hl hl hl hl +mz hl hl hl -mz -hl hl +nx hl hl hl @@ -35467,7 +35944,7 @@ hl hl kt hl -hl +my hh aa aa @@ -35486,37 +35963,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -MB -To -To -To -To -To -To -To -To -To -To -To -MB -MB -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35535,7 +36012,7 @@ aa aa aa "} -(55,1,1) = {" +(56,1,1) = {" aa aa aa @@ -35691,12 +36168,12 @@ hl hl hl hl -mz hl hl hl hl -nx +hl +hl hl hl hl @@ -35724,7 +36201,7 @@ hl hl kt hl -my +hl hh aa aa @@ -35743,37 +36220,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -To -To -To -MB -To -To -To -To -To -MB -To -To -To -To -To -To -MB -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -35792,7 +36269,7 @@ aa aa aa "} -(56,1,1) = {" +(57,1,1) = {" aa aa aa @@ -35951,7 +36428,7 @@ hl hl hl hl -hl +mA hl hl hl @@ -35980,7 +36457,7 @@ hl hl hl kt -hl +kt hl hh aa @@ -36000,37 +36477,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36049,7 +36526,7 @@ aa aa aa "} -(57,1,1) = {" +(58,1,1) = {" aa aa aa @@ -36206,12 +36683,13 @@ hl hl hl hl +mz hl hl -mA hl hl hl +mA hl hl hl @@ -36237,7 +36715,6 @@ hl hl hl kt -kt hl hh aa @@ -36257,37 +36734,37 @@ aa aa aa aa -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -36306,7 +36783,7 @@ aa aa aa "} -(58,1,1) = {" +(59,1,1) = {" aa aa aa @@ -36463,21 +36940,21 @@ hl hl hl hl -mz -hl -hl -hl -hl -hl -mA -hl hl hl hl +mz hl hl hl hl +kt +kt +kt +kt +kt +kt +kt hl hl hl @@ -36514,113 +36991,6 @@ aa aa aa aa -lI -lI -lI -lI -Zc -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(59,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -36661,156 +37031,6 @@ aa aa aa aa -hh -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -mz -hl -hl -hl -hl -kt -kt -kt -kt -kt -kt -kt -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -kt -hl -hh -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -lI -lI -lI -Zc -Zc -lI -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -lI -lI -lI -lI -lI -lI -lI -lI -lI -Zc -Zc -Zc -lI -lI -lI -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -37028,11 +37248,23 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI lI lI lI -Zc -Zc lI lI lI @@ -37054,22 +37286,10 @@ lI lI lI lI -Zc lI lI lI lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -37285,19 +37505,30 @@ aa aa aa aa -lI +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa lI lI lI Zc +Zc +Zc +Zc lI lI lI lI lI lI -Zc -lI lI lI lI @@ -37322,17 +37553,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa "} (62,1,1) = {" aa @@ -37542,11 +37762,25 @@ aa aa aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa lI lI lI lI lI +Zc +Zc +Zc lI lI lI @@ -37559,7 +37793,10 @@ lI lI lI lI +Zc lI +Zc +Zc lI lI lI @@ -37567,23 +37804,6 @@ lI lI lI lI -lI -lI -lI -lI -lI -lI -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -37810,37 +38030,37 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +Zc +Zc +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -38056,37 +38276,6 @@ aa aa aa aa -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -38098,6 +38287,37 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +Zc +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +Zc +Zc +lI +lI +lI +lI +lI +lI +Zc +Zc +lI aa aa aa @@ -38313,37 +38533,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -38355,6 +38544,37 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +lI +lI +lI +lI +lI +lI +lI +lI +Zc +lI +lI aa aa aa @@ -38570,37 +38790,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -38612,6 +38801,37 @@ aa aa aa aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +lI +lI +lI aa aa aa @@ -38827,50 +39047,50 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +lI +lI +lI +lI +lI +lI +lI +MB +MB +MB +To +To +To +To +To +MH +To +To +To +MB +To +To +To +To +lI +lI +lI +lI +lI +lI +lI +aa +aa aa aa aa @@ -39069,63 +39289,63 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +MB +MB +To +To +To +To +To +To +To +MB +MB +To +To +To +To +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -39326,21 +39546,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -39367,22 +39572,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +MB +MB +To +To +To +To +To +To +MB +To +To +To +To +To +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -39583,21 +39803,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -39624,22 +39829,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +To +MB +MB +To +To +To +To +To +MB +To +To +To +MB +MB +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -39840,21 +40060,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -39881,22 +40086,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +To +To +MB +MB +To +To +MB +MB +MB +To +To +MB +MB +To +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -40097,21 +40317,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -40138,22 +40343,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +To +To +To +MB +MB +To +MB +MB +MB +MB +MB +MB +To +To +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -40354,21 +40574,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -40395,22 +40600,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +MB +MB +To +To +To +To +To +MB +To +To +MB +To +To +To +To +To +To +lI +lI +lI +Zc +Zc +lI +lI aa aa aa @@ -40512,120 +40732,105 @@ aa aa aa aa -aa -aa -aa -aa -hh -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -hl -Ug -ZH -MI -MI -MI -MI -MI -MI -QV -Uy -BY -Cp -BY -hl -Uy -QV -QV -QV -QV -QV -OB -QV -QV -QV -QV -QV -QV -QV -zs -wp -GA -wp -Pn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +aa +aa +aa +aa +hh +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +hl +Ug +ZH +MI +MI +MI +MI +MI +MI +QV +Uy +BY +Cp +BY +hl +Uy +QV +QV +QV +QV +QV +OB +QV +QV +QV +QV +QV +QV +QV +zs +wp +GA +wp +Pn +aa +aa +aa +aa +aa +aa +aa Di Qe Qe @@ -40652,22 +40857,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +MB +To +To +To +To +To +MB +MB +MB +To +To +To +To +To +To +To +lI +lI +Zc +Zc +Zc +lI +lI aa aa aa @@ -40868,21 +41088,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -40894,7 +41099,7 @@ Qe Qe Qe Qe -pW +Qe Qe Qe Qe @@ -40909,22 +41114,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +NF +To +To +To +To +To +To +MB +Qm +MB +To +To +To +To +To +To +AG +lI +lI +lI +Zc +Zc +lI +lI aa aa aa @@ -41125,21 +41345,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -41166,22 +41371,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +To +MB +MB +MB +MB +To +MB +MB +To +To +To +To +To +To +lI +lI +lI +Zc +Zc +lI +lI aa aa aa @@ -41382,21 +41602,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -41423,22 +41628,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +MB +MB +MB +MB +To +To +To +MB +To +To +To +To +To +To +lI +lI +lI +lI +Zc +Zc +lI aa aa aa @@ -41639,21 +41859,6 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -41680,22 +41885,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +MB +MB +MB +To +To +To +To +To +MB +MB +To +To +To +To +To +lI +lI +lI +lI +lI +Zc +lI aa aa aa @@ -41896,21 +42116,6 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -41922,7 +42127,7 @@ Qe Qe Qe Qe -Qe +pW Qe Qe Qe @@ -41937,22 +42142,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +MB +MB +To +MB +To +To +To +To +To +To +MB +MB +MB +To +To +To +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -42153,21 +42373,6 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -42194,22 +42399,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +MB +MB +To +To +MB +MB +To +To +To +To +To +To +To +MB +MB +To +To +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -42410,21 +42630,6 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -42451,22 +42656,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +MB +MB +MB +To +To +To +To +To +To +To +To +MB +MB +To +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -42667,21 +42887,6 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -42708,22 +42913,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +MB +To +To +To +To +To +To +To +To +To +To +To +MB +MB +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -42924,21 +43144,6 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -42965,22 +43170,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +To +To +To +MB +To +To +To +To +To +MB +To +To +To +To +To +To +MB +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -43181,21 +43401,6 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -43222,22 +43427,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -43438,21 +43658,6 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa Di Qe Qe @@ -43479,22 +43684,37 @@ Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -43695,63 +43915,63 @@ QV aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +Zc +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -43952,63 +44172,63 @@ QV aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +Zc +Zc +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +Zc +Zc +lI +lI +lI aa aa aa @@ -44209,63 +44429,63 @@ QV aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +Zc +Zc +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +Zc +lI +lI +lI +lI aa aa aa @@ -44466,63 +44686,63 @@ QV aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +Zc +lI +lI +lI +lI +lI +lI +Zc +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -44723,63 +44943,63 @@ QV aa aa aa +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI +lI aa aa aa @@ -51154,12 +51374,12 @@ aa aa aa aa -yi -Pt -yi -yi -yi -sm +OA +xA +OA +OA +OA +Kf Nd Zv VA @@ -51411,12 +51631,12 @@ aa aa aa aa -yi -Vs -nh -UK -nh -XO +OA +Ck +jA +MN +jA +UN Nd Dn ZW @@ -51668,12 +51888,12 @@ aa aa aa aa -yi -Vs -nh -MJ -nh -Vs +OA +Ck +jA +rZ +jA +Ck Nd TZ yf @@ -51925,12 +52145,12 @@ aa aa aa aa -yi -Vs -nh -XO -nh -Vs +OA +Ck +jA +UN +jA +Ck Nd Nd Nd @@ -52182,12 +52402,12 @@ aa aa aa aa -yi -Vs -nh -XO -nh -Vs +OA +Ck +jA +UN +jA +Ck Nd aa aa @@ -52439,12 +52659,12 @@ aa aa aa aa -yi -Vs -nh -TW -nh -Vs +OA +Ck +jA +Pd +jA +Ck Nd aa aa @@ -52696,12 +52916,12 @@ aa aa aa aa -yi -Vs -nh -SO -nh -XO +OA +Ck +jA +uN +jA +UN Nd aa aa @@ -52953,12 +53173,12 @@ aa aa aa aa -yi -WL -TQ -OD -Ki -Nt +OA +ZS +Pc +we +WN +PK Nd aa aa @@ -56005,7 +56225,7 @@ aa aa aa oe -wR +Og sq to uj @@ -56272,7 +56492,7 @@ oe xc oe aa -mD +aa aa aa aa @@ -56786,13 +57006,13 @@ oe Xy oe vB -mD -aa -aa -aa -aa -aa -aa +nU +TX +TX +ab +TX +TX +ab aa aa aa @@ -57043,13 +57263,13 @@ wr xe wr yo -nU -aa -aa -aa -aa -aa -aa +mD +Sj +ye +ye +ye +ZY +TX aa aa aa @@ -57300,13 +57520,13 @@ ws xf ws yp -oe -aa -aa -aa -aa -aa -aa +US +WY +uI +uI +Lk +TL +TX aa aa aa @@ -57558,12 +57778,12 @@ xg wt yq mD -aa -aa -aa -aa -aa -aa +ZE +RV +RV +RV +XG +TX aa aa aa @@ -58077,7 +58297,7 @@ oA uV Bu BZ -Rp +Xn mD aa aa @@ -58316,7 +58536,7 @@ of oA oX pH -Um +XO mD rs sw @@ -58846,7 +59066,7 @@ zb pg Ac AK -uK +wf pg Ct nT @@ -60414,7 +60634,7 @@ Gv Ix IS Je -Jo +Tv IS WJ IS @@ -60670,7 +60890,7 @@ FL Gv Ix IS -Jf +UJ Jp IS WJ @@ -61134,7 +61354,7 @@ aa aa aa iX -mb +Ue mG nl nD @@ -63763,7 +63983,7 @@ JI JQ Ka JG -Zf +Ql IR KG Iv @@ -63988,7 +64208,7 @@ tL io iu io -NI +PR vM Ds DG @@ -64511,8 +64731,8 @@ iu Ew Ey Fs -FM -Gk +GB +Gl Ep Ev Ev @@ -65029,7 +65249,7 @@ EO Gm Un GM -GM +WU GM Nk GM @@ -65539,8 +65759,8 @@ iu EA Ey Fu -FN -Gk +Bo +Gl Ep Ev Ev @@ -66258,22 +66478,22 @@ aa aa il iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp il mQ io @@ -67341,7 +67561,7 @@ Ep FH Gq Ep -GS +Wk Hf Hf HD @@ -67804,17 +68024,17 @@ iC iC iC iC -ji +OY im jw iC jG im -jT -iC +WG iC iC iC +QZ iC kZ iC @@ -67891,17 +68111,17 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr aa aa aa @@ -68144,21 +68364,21 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zg -YS -YS -YS -tQ -YS -tQ -YS -YS -YS -Zg +Nr +Nr +Nr +Nr +Nr +UR +UR +UR +Wg +UR +Wg +UR +UR +UR +Nr aa aa aa @@ -68400,31 +68620,31 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -YS -ZS -ZS -YZ -YS -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +UR +VS +VS +YM +UR +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr aa aa aa @@ -68657,31 +68877,31 @@ aa aa aa aa -Zg -Zg -Zg -ZS -ZS -Zg -Zg -ZS -yS -ZS -Nm -Nm -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg +Nr +Nr +Nr +VS +VS +Nr +Nr +VS +Uo +VS +RT +RT +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr aa aa aa @@ -68914,32 +69134,32 @@ aa aa aa aa -Zg -Zg -ZO -ZS -YZ -ZS -wo -wo -wo -wo -wo -XJ -ZS -YZ -ZS -wo -wo -Yp -wo -ZS -ZO +Nr +Nr +fy +VS +YM +VS Nm -ZS -Zg -Zg -Zg +Nm +Nm +Nm +Nm +ZC +VS +YM +VS +Nm +Nm +VV +Nm +VS +fy +RT +VS +Nr +Nr +Nr aa aa aa @@ -69132,9 +69352,9 @@ lN iu iC io -Wr -MP -Wr +Vs +xC +Vs Ep Fx FR @@ -69170,33 +69390,33 @@ aa aa aa aa -Zg -Zg -Zg -ZS -xK -ZS -zt -wo -ZS -ZS -YZ -wo -wo +Nr +Nr +Nr +VS +Dj +VS +RC Nm +VS +VS +YM Nm -ZS -lm -ZS -ZS -wo -wo Nm -wo -wo -Zg -Zg -Zg +RT +RT +VS +Hz +VS +VS +Nm +Nm +RT +Nm +Nm +Nr +Nr +Nr aa aa aa @@ -69342,24 +69562,24 @@ aa aa il iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp iH iq -iA +Tp il -WU +RB nt nO iC @@ -69408,7 +69628,7 @@ FL Gv Ix IS -Je +Wz Jo IS WJ @@ -69427,33 +69647,33 @@ aa aa aa aa -Zg -Zg -Zg -wo -Bt -wo -Ln -ZS -Bj -ZS -YZ +Nr +Nr +Nr Nm -wo -ZS -xO -wo -ZS -ZS -Bj -ZS -wo -wo -Bt -ZS -UR -Zg -Zg +MA +Nm +Ph +VS +Zq +VS +YM +RT +Nm +VS +xK +Nm +VS +VS +Zq +VS +Nm +Nm +MA +VS +UK +Nr +Nr aa aa aa @@ -69666,7 +69886,7 @@ Gv Ix IS Jf -Jp +Zs IS WJ IS @@ -69684,34 +69904,34 @@ aa aa aa aa -Zg -Zg -Bj -ZS +Nr +Nr +Zq +VS +RT Nm -wo -wo -ZS -ZS -ZS -ZS -ZS -wo -zt -wo -wo -ZS -ZS -ZS Nm +VS +VS +VS +VS +VS Nm -wo +RC Nm -ZS -Bj -Zg -Zg -Zg +Nm +VS +VS +VS +RT +RT +Nm +RT +VS +Zq +Nr +Nr +Nr aa aa aa @@ -69940,35 +70160,35 @@ aa aa aa aa -Zg -Zg -Zg -ZS -YZ -ZS -YZ -Tv -Tv -Tv -Tv -Tv -MV -ZS -ZS -ZS -ZS -Tv -Tv -Tv -TU -Tv -ZS -ZS -ZS -ZS -Zg -Zg -Zg +Nr +Nr +Nr +VS +YM +VS +YM +xM +xM +xM +xM +xM +Fl +VS +VS +VS +VS +xM +xM +xM +Ri +xM +VS +VS +VS +VS +Nr +Nr +Nr aa aa aa @@ -70162,8 +70382,8 @@ Cc VO yN QE +Oh Wr -td ZP td Wr @@ -70197,35 +70417,35 @@ aa aa aa aa -Zg -YS -Zg -zw -ZS -ZS -TU -Nm -Nm -ZS -ZS -ZS -Tv -Tv -TU -Tv -Tv -ZS -Nm -ZS -Nm -ZS -Tv -Nm -ZS -ZS -ZS -Zg -Zg +Nr +UR +Nr +Pi +VS +VS +Ri +RT +RT +VS +VS +VS +xM +xM +Ri +xM +xM +VS +RT +VS +RT +VS +xM +RT +VS +VS +VS +Nr +Nr aa aa aa @@ -70419,10 +70639,10 @@ Cc VO PG QE +Oh Ov yc UC -MC Oh Wr Wr @@ -70454,35 +70674,35 @@ aa aa aa aa -Zg -YS -Zg -ZS -Bj -ZS -TU -Nm -Nm -ZS -ZS -Nm -ZS -Nm -ZS -ZS -Nm -ZS -Nm -ZS -ZS -Nm -Tv -Nm -Bj -yS -ZS -Zg -Zg +Nr +UR +Nr +VS +Zq +VS +Ri +RT +RT +VS +VS +RT +VS +RT +VS +VS +RT +VS +RT +VS +VS +RT +xM +RT +Zq +Uo +VS +Nr +Nr aa aa aa @@ -70655,7 +70875,7 @@ io qA qy qV -sP +qO tT uB ve @@ -70711,36 +70931,36 @@ aa aa aa aa -Zg -YS -ZS -ZS -ZS -ZS -TU -Nm -Nm -ZS -ZS -Nm -ZS -ZS -Nm -ZS -Nm -Nm -Nm -ZS -Nm -ZS -TU -Nm -ZS -ZS -ZS -Zg -Zg -Zg +Nr +UR +VS +VS +VS +VS +Ri +RT +RT +VS +VS +RT +VS +VS +RT +VS +RT +RT +RT +VS +RT +VS +Ri +RT +VS +VS +VS +Nr +Nr +Nr aa aa "} @@ -70918,7 +71138,7 @@ uB vf vX vW -uB +Tl uB uB uB @@ -70968,36 +71188,36 @@ aa aa aa aa -Zg -YS -wo -ZS -ZS -Tv -Nm -ZS -ZS -ZS -ZS -Nm -ZS -ZS -Nm -ZS -ZS -ZS -Nm -Nm +Nr +UR Nm -ZS -ZS -TU -ZS -ZS -ZS -Zg -YS -Zg +VS +VS +xM +RT +VS +VS +VS +VS +RT +VS +VS +RT +VS +VS +VS +RT +RT +RT +VS +VS +Ri +VS +VS +VS +Nr +UR +Nr aa aa "} @@ -71189,7 +71409,7 @@ qx sL VO sY -sY +WL sY sY QK @@ -71202,11 +71422,11 @@ wh Qa wh Qa -wh +xD UW VO Zi -Zi +Rd Zi tY aa @@ -71225,36 +71445,36 @@ aa aa aa aa -Zg -YS -qh -Nm -Tv -ZS -ZS -Nm -Nm -ZS -Nm -ZS -Nm -ZS -Nm -ZS -ZS -ZS -Nm -Nm -Nm -ZS -Nm -ZS -Tv -ZS -ZS -Zg -YS -Zg +Nr +UR +Tx +RT +xM +VS +VS +RT +RT +VS +RT +VS +RT +VS +RT +VS +VS +VS +RT +RT +RT +VS +RT +VS +xM +VS +VS +Nr +UR +Nr aa aa "} @@ -71482,36 +71702,36 @@ aa aa aa aa -Zg -YS -YS -wo -Tv -ZS -Nm -Nm -Nm -ZS -ZS -Nm -ZS -ZS -Nm -ZS -ZS -ZS -Nm -Nm -ZS -ZS -ZS +Nr +UR +UR Nm -Tv -ZS -YZ -YS -YS -Zg +xM +VS +RT +RT +RT +VS +VS +RT +VS +VS +RT +VS +VS +VS +RT +RT +VS +VS +VS +RT +xM +VS +YM +UR +UR +Nr aa aa "} @@ -71739,36 +71959,36 @@ aa aa aa aa -Zg -tQ -Nm -TU -ZS -ZS -Nm -ZS -ZS -Nm -Nm -ZS -Nm -Nm -Nm -ZS -Nm -Nm -Nm -Nm -Nm -ZS -ZS -Nm -ZS -Tv -ZS -ZS -tQ -Zg +Nr +Wg +RT +Ri +VS +VS +RT +VS +VS +RT +RT +VS +RT +RT +RT +VS +RT +RT +RT +RT +RT +VS +VS +RT +VS +xM +VS +VS +Wg +Nr aa aa "} @@ -71922,7 +72142,7 @@ aa aa aa in -OW +Rg kl kE lb @@ -71943,13 +72163,13 @@ rU sO tT uB -vh +fR vg vY -vY +Bt vY yB -vh +fR uB At Ba @@ -71963,14 +72183,14 @@ sY sY sY sY -QK +XC VB VO Ob Ob VO wh -wh +xD wh wh wh @@ -71996,36 +72216,36 @@ aa aa aa aa -Zg -YS -ZS -TU -ZS -ZS -ZS -Nm -Nm -Nm -Nm -Nm -ZS -ZS -Nm -Nm -Nm -ZS -Nm -Nm -Nm -Nm -ZS -Nm -ZS -Tv -ZS -ZS -YS -Zg +Nr +UR +VS +Ri +VS +VS +VS +RT +RT +RT +RT +RT +VS +VS +RT +RT +RT +VS +RT +RT +RT +RT +VS +RT +VS +xM +VS +VS +UR +Nr aa aa "} @@ -72214,7 +72434,7 @@ BP Cf Cc Dg -Ui +QG VO WK WK @@ -72223,8 +72443,8 @@ WK WK UQ VO -Pg -Ps +Wr +Wr VO Om Om @@ -72253,36 +72473,36 @@ aa aa aa aa -Zg -tQ -YZ -TU -ZS -ZS -ZS -Nm -ZS -Nm -Nm -Nm -ZS -ZS -Nm -ZS -Nm -Nm -Nm -Nm -Nm -ZS -ZS -Nm -ZS -Tv -Nm -xO -tQ -Zg +Nr +Wg +YM +Ri +VS +VS +VS +RT +VS +RT +RT +RT +VS +VS +RT +VS +RT +RT +RT +RT +RT +VS +VS +RT +VS +xM +RT +xK +Wg +Nr aa aa "} @@ -72479,14 +72699,14 @@ vo vo VO VO -Zj -SF -SF -OE +VO +OH +OH +VO +VO +VO VO VO -vo -vo VO VO VO @@ -72510,36 +72730,36 @@ aa aa aa aa -Zg -YS -YS -TU -ZS -ZS -Nm -Nm -ZS -Nm -ZS -Nm -ZS -ZS -Nm -ZS -ZS -ZS -Nm -Nm -ZS -ZS -Nm -Nm -ZS -Tv -ZS -YS -YS -Zg +Nr +UR +UR +Ri +VS +VS +RT +RT +VS +RT +VS +RT +VS +VS +RT +VS +VS +VS +RT +RT +VS +VS +RT +RT +VS +xM +VS +UR +UR +Nr aa aa "} @@ -72730,23 +72950,23 @@ qx qx qx VO -Wr -Ov -Ha -IK -Oh -MP -VQ -QE -QE -IK -MP -Ov -Ha -IK -Oh -PU -OH +Nz +Nz +Nz +Nz +Nz +oU +VO +aa +aa +VO +Sy +Sy +Sy +Sy +Sy +Pv +VO Zi Zi Zi @@ -72767,36 +72987,36 @@ aa aa aa aa -Zg -YS -ZS -wo -Tv -Nm -Nm -Nm -Nm -ZS -ZS -ZS -ZS -ZS -Nm -ZS -ZS -ZS -Nm -Nm -Nm -ZS -ZS -Nm -Tv -Nm -Nm +Nr +UR +VS Nm -YS -Zg +xM +RT +RT +RT +RT +VS +VS +VS +VS +VS +RT +VS +VS +VS +RT +RT +RT +VS +VS +RT +xM +RT +RT +RT +UR +Nr aa aa "} @@ -72984,26 +73204,26 @@ AY rS qz qx -Wr -Wr -Wr -Wr -Ov -Ha -IK -Oh -OM -VQ -QE -QE -IK -OM -Ov -Ha -IK -Oh -QE -OH +pE +Hk +VO +Or +WI +Or +Or +Or +MU +VO +aa +aa +VO +PZ +PZ +PZ +RR +VG +Sh +VO Zi Zi Zi @@ -73024,36 +73244,36 @@ aa aa aa aa -Zg -YS -YZ -wo -CQ -ZS -ZS -ZS -Nm -ZS -ZS -Nm -ZS -Nm -Sx -Nm -ZS -ZS -Nm -Nm -Nm -Nm -ZS -Nm -CQ +Nr +UR +YM Nm -MV -ZS -YS -Zg +YQ +VS +VS +VS +RT +VS +VS +RT +VS +RT +ym +RT +VS +VS +RT +RT +RT +RT +VS +RT +YQ +RT +Fl +VS +UR +Nr aa aa "} @@ -73231,7 +73451,7 @@ uB uB uB uB -uB +Tl uB xt zl @@ -73241,25 +73461,25 @@ Bb qV Cd qx -Pg +Xe Wr VO +Or +ZQ +Or +ZQ +Or +MU VO +aa +aa VO -vo -vo -VO -VO -Wi -WO -WO -UL -VO -VO -vo -vo -VO -VO +RR +RR +PZ +RR +RR +Sh VO Zi Zi @@ -73281,36 +73501,36 @@ aa aa aa aa -Zg -YS -Nm -Nm -ZS -Tv -TU -TU -Nm -Tv -ZS -Nm -ZS -Xw -MY -Xw -ZS -ZS -Nm -TU -Nm -Tv -Tv -TU -ZS -xO -ZS -ZS -YS -Zg +Nr +UR +RT +RT +VS +xM +Ri +Ri +RT +xM +VS +RT +VS +zZ +Br +zZ +VS +VS +RT +Ri +RT +xM +xM +Ri +VS +xK +VS +VS +UR +Nr aa aa "} @@ -73498,28 +73718,28 @@ AW qx qy qx -Wr +tf Wr VO -Nz -Nz -Nz -Nz -Nz -oU +Or +ZQ +Or +ZQ +Or +MU VO -Pg -Ps +aa +aa VO -Sy -Sy -Sy -Sy -Sy -Pv +RR +RR +PZ +RR +RR +Sh VO Zi -Zi +Rd Zi VO aa @@ -73538,36 +73758,36 @@ aa aa aa aa -Zg -YS -Nm -ZS -ZO -Nm -Nm -wo -Vi -wo -TU -Tv -Tv -Xw -DA -Xw -Tv -Tv -TU -Nm -TU -ZS -ZS +Nr +UR +RT +VS +fy +RT +RT Nm -ZS +Pb Nm -ZS -Zg -YS -Zg +Ri +xM +xM +zZ +WT +zZ +xM +xM +Ri +RT +Ri +VS +VS +RT +VS +RT +VS +Nr +UR +Nr aa aa "} @@ -73755,24 +73975,24 @@ Bc qx qz qx -Wr +JV Wr VO Or -ZQ -Or Or Or +ZQ +Nh MU VO -td -td +aa +aa VO PZ +RU +PZ PZ PZ -RR -RR Sh VO Zi @@ -73795,36 +74015,36 @@ aa aa aa aa -Zg -YS -ZS -Bj -ZS -YZ -wo -wo -xO -Nm -Nm -yS -ZS -Xw -DA -Xw -ZS -ZS -Nm -ZS +Nr +UR +VS +Zq +VS +YM Nm -xO Nm -ZS -ZS -Bj -ZS -Zg -YS -Zg +xK +RT +RT +Uo +VS +zZ +WT +zZ +VS +VS +RT +VS +RT +xK +RT +VS +VS +Zq +VS +Nr +UR +Nr aa aa "} @@ -73998,39 +74218,39 @@ qx qx sU tV +Wd tV tV tV +Wd tV tV tV -tV -tV -tV +Wd tV Bd qx qx qx -WH +Bj QE VO -Or -ZQ -Or -ZQ -Or -MU -vo -SF -SF -vo -RR -RR -PZ -RR -RR -Sh +SI +SI +SI +SI +SI +Vc +VO +aa +aa +VO +ZF +ZF +ZF +ZF +ZF +Xr VO Zi Zi @@ -74052,36 +74272,36 @@ aa aa aa aa -Zg -YS -Zg -Zg -Zg -wo -ZS -zw -ZS -Bj -Nm -xO -YS -Xw -SR -Xw -YS -ZS -Nm -Bj -ZS +Nr +UR +Nr +Nr +Nr Nm -ZS -ZS -Zg -Zg -Zg -Zg -Zg -Zg +VS +Pi +VS +Zq +RT +xK +UR +zZ +Te +zZ +UR +VS +RT +Zq +VS +RT +VS +VS +Nr +Nr +Nr +Nr +Nr +Nr aa aa "} @@ -74272,29 +74492,27 @@ qx SP SP VO -Or -ZQ -Or -ZQ -Or -MU -vo -WO -WO -vo -RR -RR -PZ -RR -RR -Sh VO -Zi -Zi -Zi +VO +VO +VO +VO +VO VO aa aa +VO +VO +VO +VO +VO +VO +VO +VO +tY +tY +VO +VO aa aa aa @@ -74309,37 +74527,39 @@ aa aa aa aa -Zg -YS -Zg -Zg -Zg -Zg -Zg -Zg -YD -YZ -MV -ZS -YS -QZ -RV -Ty -YS -ZS -ZS -YD -YD -YD -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg +aa +aa +Nr +UR +Nr +Nr +Nr +Nr +Nr +Nr +Pq +YM +Fl +VS +UR +TH +Qr +Vq +UR +VS +VS +Pq +Pq +Pq +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr aa "} (206,1,1) = {" @@ -74528,27 +74748,6 @@ aa aa aa aa -VO -Or -Or -Or -ZQ -Or -MU -VO -Ob -Ob -VO -PZ -PZ -PZ -PZ -PZ -Sh -VO -tY -tY -VO aa aa aa @@ -74564,39 +74763,60 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zp -Zp -Zp -Zp -YD -RY -YD -Xw -ZI -RE -XK -Xw -RY -YD -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg -Zg -Zg -Zg -Zg +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Nr +Nr +Nr +Nr +Nr +Nr +Nr +YW +YW +YW +YW +Pq +Wn +Pq +zZ +px +VJ +Xc +zZ +Wn +Pq +YW +YW +YW +YW +YW +YW +YW +Nr +Nr +Nr +Nr +Nr aa "} (207,1,1) = {" @@ -74785,24 +75005,6 @@ aa aa aa aa -VO -SI -SI -SI -SI -SI -Vc -VO -QE -QE -VO -ZF -ZF -ZF -ZF -ZF -Xr -VO aa aa aa @@ -74821,39 +75023,57 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zg -Zp -Zp -Zp -Zg -Zp -Zp -Zp -Mu -xD -Xw -sp -RE -XK -Xw -VZ -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Nr +Nr +Nr +Nr +Nr +YW +YW +YW +Nr +YW +YW +YW +CV +Zu +zZ +sb +VJ +Xc +zZ +Xs +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (208,1,1) = {" @@ -75042,24 +75262,6 @@ aa aa aa aa -VO -VO -VO -VO -VO -VO -VO -VO -OH -OH -VO -VO -VO -VO -VO -VO -VO -VO aa aa aa @@ -75078,39 +75280,57 @@ aa aa aa aa -Zg -Zp -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Mu -xD -Xw -sp -RE -TG -Xw -VZ -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Nr +YW +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +CV +Zu +zZ +sb +VJ +rY +zZ +Xs +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (209,1,1) = {" @@ -75335,39 +75555,39 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Mu -xD -Xw -ED -RE -Vr -Xw -VZ -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +CV +Zu +zZ +MR +VJ +XH +zZ +Xs +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (210,1,1) = {" @@ -75592,39 +75812,39 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zp -Zp -YD -Yr -YD -Zp -Zp -Zp -Mu -xD -Xw -ED -RE -Rc -Xw -VZ -Zp -Zp -Zp -YD -YD -YD -Zp -Zp -NN -Zg -Zg -Zg -Zg +Nr +Nr +Nr +Nr +YW +YW +Pq +BX +Pq +YW +YW +YW +CV +Zu +zZ +MR +VJ +Fd +zZ +Xs +YW +YW +YW +Pq +Pq +Pq +YW +YW +vs +Nr +Nr +Nr +Nr aa "} (211,1,1) = {" @@ -75849,39 +76069,39 @@ aa aa aa aa -Zg -Zg -Zg -Zg -YD -YD -ZS -ZS -YZ -YD -Zp -Zp -ua -ZS -Xw -Nq -RE -Og -Xw -ua -YD -Yr -YD -ZS -zw -ZS -YD -YD -xK -Zg -Zg -Zg -Zg +Nr +Nr +Nr +Nr +Pq +Pq +VS +VS +YM +Pq +YW +YW +HL +VS +zZ +ZB +VJ +OJ +zZ +HL +Pq +BX +Pq +VS +Pi +VS +Pq +Pq +Dj +Nr +Nr +Nr +Nr aa "} (212,1,1) = {" @@ -76106,39 +76326,39 @@ aa aa aa aa -Zg -Zg -Zg -Zg -YZ -ZS -ZS -ZS -ZS -ZS -YD -YD -ZS +Nr +Nr +Nr +Nr +YM +VS +VS +VS +VS +VS +Pq +Pq +VS +UK UR -YS -wZ -RE -XK -YS -ZS -ZO -ZS -ZS -Xz -ZS -ZS -ZS -tj -Zg -Zg -Zg -Zg -Zg +ui +VJ +Xc +UR +VS +fy +VS +VS +Zy +VS +VS +VS +No +Nr +Nr +Nr +Nr +Nr aa "} (213,1,1) = {" @@ -76363,39 +76583,39 @@ aa aa aa aa -Zg -Zg -YS -YS -YS -YS -YS -YZ -YS -Xw -Xw -Xw -YS -YZ -YS -xN -RE -XK -YS -YZ -YS -Xw -Xw -Xw -YS -ZS -YS -YS -YS -YS -YS -Zg -Zg +Nr +Nr +UR +UR +UR +UR +UR +YM +UR +zZ +zZ +zZ +UR +YM +UR +Lr +VJ +Xc +UR +YM +UR +zZ +zZ +zZ +UR +VS +UR +UR +UR +UR +UR +Nr +Nr aa "} (214,1,1) = {" @@ -76411,16 +76631,16 @@ af af af bj -bk -bk -bk -bk -bk -bk -bk -bk -bk -bk +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn bj dm dm @@ -76620,39 +76840,39 @@ aa aa aa aa -Zg -YS -YS -kR -ti -tZ -YS -YS -YS -zT +Nr +UR +UR +Ny +hH +Ui +UR +UR +UR +Wf +sm Fi -Lk -YS -YS -YS -BX -RE -XK -YS -YS -YS -YA -Ze -RN -YS -YS -YS -Qp -Uf -Of -YS -YS -Zg +UR +UR +UR +Cm +VJ +Xc +UR +UR +UR +xE +wo +Tw +UR +UR +UR +OX +Xp +Yb +UR +UR +Nr aa "} (215,1,1) = {" @@ -76668,16 +76888,16 @@ af ax af bj -bk -bk -bk -bk -bk -bk -bk -bk -bk -bk +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn bj dm dG @@ -76877,39 +77097,39 @@ aa aa aa aa -Zg -YS -fR -Dp -uN -Dp -xA -YS -ED -Mc -NK -OX -XK -Xw -PF -ZN -RE -Ke -Up -Xw -Wg -ui -wf -Tm -Ue -YS -Bs -ZN -WB -Yx -Rg -YS -Zg +Nr +UR +OP +Th +Yp +Th +vz +UR +MR +RP +ng +AI +Xc +zZ +Vl +YE +VJ +JY +Yl +zZ +Wx +YY +xP +UD +TW +UR +VE +YE +ri +qL +VN +UR +Nr aa "} (216,1,1) = {" @@ -76925,16 +77145,16 @@ af ax af bj -bk -bk -bk -bk -ce -cq -bk -bk -bk -bk +Zn +Zn +Zn +Zn +Hi +LF +Zn +Zn +Zn +Zn bj dm dG @@ -77134,39 +77354,39 @@ aa aa aa aa -Zg -YS -px -Dp -Dp -Dp -Bp -yR -zc +Nr +UR +WZ +Th +Th +Th +ND +UB +OW +pS +In +ZA Ml -JJ -Pj -Ne -Ot -ZG -RE -RE -RE -Pk -UN -RE -wf -ub -wf -RE -VM -ZG -RE -RE -Hl -tk -YS -Zg +Tc +zt +VJ +VJ +VJ +MK +Dp +VJ +xP +Nq +xP +VJ +qN +zt +VJ +VJ +Ke +Zb +UR +Nr aa "} (217,1,1) = {" @@ -77182,16 +77402,16 @@ af aG af bj -bk -bk -bk -bk -bk -cr -bk -bk -bk -bk +Zn +Zn +Zn +Zn +Zn +Zd +Zn +Zn +Zn +Zn bj dm dG @@ -77391,39 +77611,39 @@ aa aa aa aa -Zg -YS +Nr +UR +OF +Th +Yp +Th +SL +UR +MR +VU +SG +VW +Xc +RW +tw +YX +VJ +YX pD -Dp -uN -Dp -Bq -YS -ED -MN -RI -PB -XK -YL -YY -RJ -RE -RJ -FB -Xw -Wz -YM -wf -qN -ng -YS -JV -Yb -RE -vz -QH -YS -Zg +zZ +Tk +Um +xP +SK +TQ +UR +ZO +wg +VJ +yM +Vg +UR +Nr aa "} (218,1,1) = {" @@ -77439,16 +77659,16 @@ af af af bj -bk -bk -bk -bk -bk -bk -bk -bk -bk -bk +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn bj dm dm @@ -77648,39 +77868,39 @@ aa aa aa aa -Zg -YS -YS -wg -wg -wg -YS -YS -YS -Qf -NM -Qf -YS -YS -YS -TX -SS -PQ -YS -YS -YS -Vh -Zs -Sw -YS -YS -YS -XR -Rw -mC -YS -YS -Zg +Nr +UR +UR +Zt +Zt +Zt +UR +UR +UR +MJ +ub +MJ +UR +UR +UR +HQ +GZ +sh +UR +UR +UR +Tq +EZ +Mp +UR +UR +UR +Xa +pF +Wl +UR +UR +Nr aa "} (219,1,1) = {" @@ -77905,39 +78125,39 @@ aa aa aa aa -Zg -Zg -YS -YS -YS -YS -YS -Zg -YS -YS -YS -YS -YS -Zg -YS -Xw -ST -Xw -YS -Zg -YS -YS -YS -YS -YS -Zg -YS -YS -ND -YS -YS -Zg -Zg +Nr +Nr +UR +UR +UR +UR +UR +Nr +UR +UR +UR +UR +UR +Nr +UR +zZ +Ox +zZ +UR +Nr +UR +UR +UR +UR +UR +Nr +UR +UR +Od +UR +UR +Nr +Nr aa "} (220,1,1) = {" @@ -78162,39 +78382,39 @@ aa aa aa aa +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +YW +YW +YW +MY +YM +UR +UR Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zp -Zp -Zp -Ll -YZ -YS -YS -RO -RV -TH -YS -YS -WX -Zp -Zp -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg +Qr +Ro +UR +UR +vv +YW +YW +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr aa "} (221,1,1) = {" @@ -78420,38 +78640,38 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Mu -xD -Xw -OT -ED -RE -XK -OT -Xw -VZ -Zp -Zp -Zp -Zp -Zp -Zp -Zg -Zg -Zg -Zg -Zg -Zg +Nr +Nr +Nr +Nr +YW +YW +YW +YW +YW +YW +CV +Zu +zZ +Lo +MR +VJ +Xc +Lo +zZ +Xs +YW +YW +YW +YW +YW +YW +Nr +Nr +Nr +Nr +Nr +Nr aa "} (222,1,1) = {" @@ -78677,38 +78897,38 @@ aa aa aa aa -Zg -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Mu -xD -Xw -OT -ED -RE -XK -OT -Xw -VZ -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg -Zg -Zg +Nr +Nr +YW +YW +YW +YW +YW +YW +YW +YW +CV +Zu +zZ +Lo +MR +VJ +Xc +Lo +zZ +Xs +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr +Nr +Nr aa "} (223,1,1) = {" @@ -78934,38 +79154,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Mu -xD -Xw -OT -ED -RE -XK -OT -Xw -VZ -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg -Zg -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +CV +Zu +zZ +Lo +MR +VJ +Xc +Lo +zZ +Xs +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr +Nr +Nr aa "} (224,1,1) = {" @@ -79191,38 +79411,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -LF -ZS -YS -YS -RU -SS -TI -YS -YS -XA -ZS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +zw +VS +UR +UR +yh +GZ +NI +UR +UR +ny +VS +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr +Nr aa "} (225,1,1) = {" @@ -79448,38 +79668,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -xD -WI -WI -ZS -ZS -yS -tj -YS -Xw -SZ -Xw -YS -ZS -ZS -YZ -WI -WI -WI -xD -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +Zu +Is +Is +VS +VS +Uo +No +UR +zZ +RH +zZ +UR +VS +VS +YM +Is +Is +Is +Zu +YW +YW +YW +YW +YW +YW +Nr aa "} (226,1,1) = {" @@ -79705,38 +79925,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp +Nr +YW +YW +YW +YW +YW +YW +YW +YW +UK +YM UR -YZ -YS -YS -YS -Rv -RV -Ty -YS -YS -YS -zw -ZS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +UR +UR +XV +Qr +Vq +UR +UR +UR +Pi +VS +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (227,1,1) = {" @@ -79962,38 +80182,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -YS -YS -YS -Ox -PK -RX -RX -zZ -Us -Vd -YS -YS -YS -RT -RT +Nr +YW +YW +YW +YW +YW +YW +YW +YW +UR +UR +UR +YB +PC +th +th Mr -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Ta +Sm +UR +UR +UR +Yx +Yx +VL +YW +YW +YW +YW +YW +YW +Nr aa "} (228,1,1) = {" @@ -80219,38 +80439,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -YS -YS -YS -LI Nr -Wd -zv -wf -wf -Xn -wT -VD -XG -Tb -Zt -Hi -XD -XI -Zp -Zp -Zp -Zp -Zp -Zp -Zg +YW +YW +YW +YW +YW +YW +UR +UR +UR +YC +GN +tj +Bp +xP +xP +RI +Qv +NL +Cj +yS +PQ +SA +Xz +Ww +YW +YW +YW +YW +YW +YW +Nr aa "} (229,1,1) = {" @@ -80476,38 +80696,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -AF -Hz -Qv -XH -SX -Yv -Sa -Sa -wf -Xn -wf -qK -Tb -WG -Kp -SA -XI -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +zZ +UM +Fc +AC +UA +VZ +WA +Xj +Xj +xP +RI +xP +yi +yS +Yj +Vo +Sn +Ww +YW +YW +YW +YW +YW +YW +Nr aa "} (230,1,1) = {" @@ -80733,38 +80953,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -UY -UY -UY -NH -OC -zv -FA -Tq -TR -Xn -wf -wf -Tb -Ws -wf -Zn -XI -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +zZ +Mu +Mu +Mu +re +wT +Bp +Wv +OD +Qz +RI +xP +xP +yS +Ty +xP +NR +Ww +YW +YW +YW +YW +YW +YW +Nr aa "} (231,1,1) = {" @@ -80990,52 +81210,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -UY -UY -UY -Xx -Wh -zv -Dw -Ry -VN -wf -wf -XS -Tb -BT -Xn -WG -XI -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +zZ +Mu +Mu +Mu +TN +XA +Bp +SC +Nx +Rv +xP +xP +sj +yS +yQ +RI +Yj +Ww +YW +YW +YW +YW +YW +YW +Nr aa "} (232,1,1) = {" ac -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Co +Co +Co +Co +Co +Co +Co +Co +Co +Co bj bt bI @@ -81247,52 +81467,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -Bo -Kl -MA -SX -SX -zv -Vp -wf -pY -wf -wf -ZM -Tb -ZA -ym -Rn -XI -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +zZ +Ud +Pe +Ss +VZ +VZ +Bp +Kd +xP +Sq +xP +xP +Vm +yS +YK +LI +Wy +Ww +YW +YW +YW +YW +YW +YW +Nr aa "} (233,1,1) = {" ac -ap -aB -ap -ap -ap -ap -ap -ap -Ck -ap +Co +NN +Co +Co +Co +Co +Co +Co +UY +Co bj Xg TF @@ -81504,52 +81724,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -YS -YS -YS -QO -XH -SX -Yv -wf -wf -wf -Xn -wf -wf -Tb -jA -Hk -OG -XI -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +UR +UR +UR +CQ +UA +VZ +WA +xP +xP +xP +RI +xP +xP +yS +xF +Rp +Hl +Ww +YW +YW +YW +YW +YW +YW +Nr aa "} (234,1,1) = {" ac -ap -ap -ap -ap -ap -RC -ap -ap -ap -ap +Co +Co +Co +Co +Co +Vr +Co +Co +Co +Co bj bu bJ @@ -81761,52 +81981,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -YS -Rx -NJ -OR -PM -Sc -Xn -Ua -UA -wf -Yl +Nr YW -YS -WF -WF -ye -Zp -Zp -Zp -Zp -Zp -Zp -Zg +YW +YW +YW +YW +YW +YW +YW +UR +UH +Rk +Xf +XQ +Us +RI +Pf +Nb +xP +uL +Se +UR +Ut +Ut +Rt +YW +YW +YW +YW +YW +YW +Nr aa "} (235,1,1) = {" ac -ap -Wk -ap -ap -ap -ap -ap -ap -QI -ap +Co +Ot +Co +Co +Co +Co +Co +Co +NJ +Co bj bv bK @@ -82018,52 +82238,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -xD -WI -YS -YS -YS -YS -YS -YS -YS -zv -Xn -Tb -YS -Vo -YS -YS -YS -YS -WI -WI -xD -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +Zu +Is +UR +UR +UR +UR +UR +UR +UR +Bp +RI +yS +UR +tn +UR +UR +UR +UR +Is +Is +Zu +YW +YW +YW +YW +YW +Nr aa "} (236,1,1) = {" ac -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +Co +Co +Co +Co +Co +Co +Co +Co +Co +Co bj RD Va @@ -82275,38 +82495,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -WG +Nr +YW +YW +YW +YW +YW +YW +zZ +Yj +MT +Bs +Uf +qh +UR +WA xP -MR -NO -Pe -YS -Yv -wf -Tb -YS -QU -PR -PT -ZB -YS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +yS +UR +Ti +Im +WE +RE +UR +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (237,1,1) = {" @@ -82532,38 +82752,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -MZ -Kz -RK -TN -wf -Qc -Se -Xn -Tb -YS -LD -QU -YS -YS -YS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +zZ +NE +UZ +sa +NC +xP +KE +Wh +RI +yS +UR +Yh +Ti +UR +UR +UR +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (238,1,1) = {" @@ -82789,38 +83009,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -YS -YS -YS -YS -Wa -Xn -Xn -wf -Xn -wf -YS -yT -PR -Zd -ZC -YS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +UR +UR +UR +UR +Xi +RI +RI +xP +RI +xP +UR +vr +Im +YT +LD +UR +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (239,1,1) = {" @@ -83046,38 +83266,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -Cn -KE -MT -Ut -Xn -Qr -Sn -Dl -Dl -YS -UD -PR -YS -YS -YS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +zZ +Yv +NW +TU +yl +RI +Bk +Qp +NH +NH +UR +Yq +Im +UR +UR +UR +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (240,1,1) = {" @@ -83303,38 +83523,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Xw -xP -DA -RL -Uz -PC -YS -Tc -Xj -Tc -YS -Vq -QU -PT -ZE -YS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +zZ +MT +WT +xO +yk +Sx +UR +RG +wk +RG +UR +Ms +Ti +WE +zc +UR +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (241,1,1) = {" @@ -83361,7 +83581,7 @@ cS cY dh bj -Zk +Vy dV ep eB @@ -83560,38 +83780,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -xD -WI -YS -YS -YS -YS -wV -Xa -YS -Tx -Tx -Tx -YS -VW -YG -YS -YS -YS -WI -WI -xD -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +Zu +Is +UR +UR +UR +UR +qH +MZ +UR +vq +vq +vq +UR +Kl +Fk +UR +UR +UR +Is +Is +Zu +YW +YW +YW +YW +YW +Nr aa "} (242,1,1) = {" @@ -83817,38 +84037,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -YS -xP -YK -YS -Sq -Tx -Ud -YS -WN -YG -YS -MV -YZ -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +UR +MT +MO +UR +SZ +vq +ZN +UR +FV +Fk +UR +Fl +YM +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (243,1,1) = {" @@ -84074,52 +84294,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -YS -NW -TL -YS -Im -Tt -FY -YS -VW -ZZ -YS -YZ -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +UR +YD +Ua +UR +YL +WF +ZM +UR +Kl +Ll +UR +YM +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (244,1,1) = {" ac -ar -ar -ar -ar -ar -ar -ar -ar -ar -ar +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os bj bx bN @@ -84331,52 +84551,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -YS -Xw -Xw -YS -TT -TT -TT -YS -Xw -Xw -YS -ZS -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +UR +zZ +zZ +UR +SR +SR +SR +UR +zZ +zZ +UR +VS +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (245,1,1) = {" ac -ar -aC -ar -ar -ar -ar -ar -ar -aC -ar +Os +SO +Os +Os +Os +Os +Os +Os +SO +Os bj by bN @@ -84588,52 +84808,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -WI -Zp -Zp -WI -Zp -Zp -Zp -WI -Zp -Zp -WI -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +Is +YW +YW +Is +YW +YW +YW +Is +YW +YW +Is +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (246,1,1) = {" ac -ar -ar -ar -aC -ar -ar -aC -ar -ar -ar +Os +Os +Os +SO +Os +Os +SO +Os +Os +Os bj by bN @@ -84845,52 +85065,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -xD -Zp -Zp -WI -Zp -Zp -Zp -WI -Zp -Zp -xD -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +Zu +YW +YW +Is +YW +YW +YW +Is +YW +YW +Zu +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (247,1,1) = {" ac -ar -aC -ar -ar -ar -ar -ar -ar -aC -ar +Os +SO +Os +Os +Os +Os +Os +Os +SO +Os bj by bN @@ -85102,52 +85322,52 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -xD -Zp -Zp -Zp -xD -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Zu +YW +YW +YW +Zu +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (248,1,1) = {" ac -ar -ar -ar -ar -ar -ar -ar -ar -ar -ar +Os +Os +Os +Os +Os +Os +Os +Os +Os +Os bj bz bN @@ -85359,38 +85579,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (249,1,1) = {" @@ -85616,38 +85836,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (250,1,1) = {" @@ -85873,38 +86093,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (251,1,1) = {" @@ -86130,38 +86350,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (252,1,1) = {" @@ -86387,38 +86607,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (253,1,1) = {" @@ -86644,38 +86864,38 @@ aa aa aa aa -Zg -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zp -Zg +Nr +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +YW +Nr aa "} (254,1,1) = {" @@ -86901,38 +87121,38 @@ aa aa aa aa -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg -Zg +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr +Nr aa "} (255,1,1) = {" diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm index 074baf61d9a3..dee5d76d2a2f 100644 --- a/code/datums/elements/flavor_text.dm +++ b/code/datums/elements/flavor_text.dm @@ -191,16 +191,16 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code /datum/element/flavor_text/proc/borged_update_flavor_text(mob/new_character, client/C) C = C || GET_CLIENT(new_character) if(!C) - LAZYREMOVE(texts_by_atom, new_character) + LAZYSET(texts_by_atom, new_character, "") return var/datum/preferences/P = C.prefs if(!P) - LAZYREMOVE(texts_by_atom, new_character) + LAZYSET(texts_by_atom, new_character, "") return if(P.custom_names["cyborg"] == new_character.real_name) LAZYSET(texts_by_atom, new_character, P.features[save_key]) else - LAZYREMOVE(texts_by_atom, new_character) + LAZYSET(texts_by_atom, new_character, "") //subtypes with additional hooks for DNA and preferences. /datum/element/flavor_text/carbon diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 2c34c67c5814..54f1db323aff 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -322,7 +322,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) A.power_light = FALSE A.power_equip = FALSE A.power_environ = FALSE - INVOKE_ASYNC(A, .proc/power_change) + A.power_change() STOP_PROCESSING(SSobj, src) return ..() @@ -579,15 +579,20 @@ GLOBAL_LIST_EMPTY(teleportlocs) // called when power status changes /area/proc/power_change() - for(var/obj/machinery/M in src) // for each machine in the area - M.power_change() // reverify power status (to update icons etc.) - if(sub_areas) - for(var/i in sub_areas) - var/area/A = i - A.power_light = power_light - A.power_equip = power_equip - A.power_environ = power_environ - INVOKE_ASYNC(A, .proc/power_change) + SHOULD_NOT_SLEEP(TRUE) + if(contents.len < GLOB.machines.len) // it would be faster to loop over contents + for(var/obj/machinery/M in src) // for each machine in the area + M.power_change() // reverify power status (to update icons etc.) + else // it would be faster to loop over the machines list + for(var/obj/machinery/M as anything in GLOB.machines) // for each machine + if(get_area(M) != src) // in the area + continue + M.power_change() // reverify power status (to update icons etc.) + for(var/area/A as anything in sub_areas) + A.power_light = power_light + A.power_equip = power_equip + A.power_environ = power_environ + A.power_change() update_appearance() /area/proc/usage(chan) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index c14b7b1d0acb..cbafe64eb542 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -15,6 +15,7 @@ var/restrict_ghost_roles = TRUE /// What mob type the ruleset is restricted to. var/required_type = /mob/living/carbon/human + var/should_use_midround_pref = TRUE var/list/living_players = list() var/list/living_antags = list() var/list/dead_players = list() @@ -23,6 +24,7 @@ /datum/dynamic_ruleset/midround/from_ghosts weight = 0 required_type = /mob/dead/observer + should_use_midround_pref = FALSE /// Whether the ruleset should call generate_ruleset_body or not. var/makeBody = TRUE /// The rule needs this many applicants to be properly executed. @@ -43,6 +45,9 @@ if (!M.client) // Are they connected? trimmed_list.Remove(M) continue + if(should_use_midround_pref && !(M.client.prefs.toggles & MIDROUND_ANTAG)) + trimmed_list.Remove(M) + continue if(!mode.check_age(M.client, minimum_required_age)) trimmed_list.Remove(M) continue @@ -106,10 +111,10 @@ return message_admins("Polling [possible_volunteers.len] players to apply for the [name] ruleset.") log_game("DYNAMIC: Polling [possible_volunteers.len] players to apply for the [name] ruleset.") + var/flag = antag_flag_override ? antag_flag_override : antag_flag + candidates = pollGhostCandidates("The mode is looking for volunteers to become [antag_flag] for [name]", flag, be_special_flag = flag, ignore_category = antag_flag, poll_time = 300) - candidates = pollGhostCandidates("The mode is looking for volunteers to become [antag_flag] for [name]", antag_flag, be_special_flag = antag_flag_override ? antag_flag_override : antag_flag, poll_time = 300) - - if(!candidates || candidates.len <= 0) + if(!length(candidates)) mode.dynamic_log("The ruleset [name] received no applications.") mode.executed_rules -= src attempt_replacement() @@ -164,19 +169,10 @@ /datum/dynamic_ruleset/midround/from_ghosts/proc/setup_role(datum/antagonist/new_role) return -/// Fired when there are no valid candidates. Will spawn a sleeper agent or latejoin traitor. +/// Fired when there are no valid candidates. Will try to roll again in a minute. /datum/dynamic_ruleset/midround/from_ghosts/proc/attempt_replacement() - var/datum/dynamic_ruleset/midround/autotraitor/sleeper_agent = new - - // Otherwise, it has a chance to fail. We don't want that, since this is already pretty unlikely. - sleeper_agent.has_failure_chance = FALSE - - mode.configure_ruleset(sleeper_agent) - - if (!mode.picking_specific_rule(sleeper_agent)) - return - - mode.picking_specific_rule(/datum/dynamic_ruleset/latejoin/infiltrator) + COOLDOWN_START(mode, midround_injection_cooldown, 1 MINUTES) + mode.forced_injection = TRUE ////////////////////////////////////////////// // // @@ -233,9 +229,8 @@ return ..() /datum/dynamic_ruleset/midround/autotraitor/execute() - var/mob/M = pick(living_players) + var/mob/M = pick_n_take(living_players) assigned += M - living_players -= M var/datum/antagonist/traitor/newTraitor = new M.mind.add_antag_datum(newTraitor) message_admins("[ADMIN_LOOKUPFLW(M)] was selected by the [name] ruleset and has been made into a midround traitor.") @@ -336,7 +331,7 @@ candidates -= player continue - if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0)) + if(player.mind && (player.mind.special_role || length(player.mind.antag_datums))) candidates -= player /datum/dynamic_ruleset/midround/malf/execute() @@ -355,6 +350,70 @@ M.add_ion_law(generate_ion_law()) return TRUE +////////////////////////////////////////////// +// // +// WIZARD (CREW) // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/midround/wizard + name = "Wizard" + antag_datum = /datum/antagonist/wizard + antag_flag = "wizard mid crew" + antag_flag_override = ROLE_WIZARD + protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") + restricted_roles = list("AI", "Cyborg") + enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") + required_enemies = list(0,0,0,0,0,0,0,0,0,0) + weight = 0 + cost = 20 + requirements = list(101,101,100,60,40,20,20,20,10,10) + repeatable = TRUE + var/datum/mind/wizard + +/datum/dynamic_ruleset/midround/wizard/trim_candidates() + ..() + candidates = living_players + for(var/mob/living/player as anything in candidates) + var/turf/player_turf = get_turf(player) + if(!player_turf || !is_station_level(player_turf.z)) + candidates -= player + continue + + if(player.mind && (player.mind.special_role || length(player.mind.antag_datums) > 0)) + candidates -= player + candidates = pollCandidates("Do you want to be a wizard?", antag_flag_override, be_special_flag = antag_flag_override, ignore_category = antag_flag_override, poll_time = 300) + +/datum/dynamic_ruleset/midround/wizard/ready(forced = FALSE) + if(GLOB.wizardstart.len == 0) + log_admin("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.") + message_admins("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.") + return FALSE + return ..() + +/datum/dynamic_ruleset/midround/wizard/execute() + var/mob/M = pick_n_take(living_players) + assigned += M + var/datum/antagonist/wizard/on_station/wiz = new + M.mind.add_antag_datum(wiz) + wizard = M.mind + message_admins("[ADMIN_LOOKUPFLW(M)] was selected by the [name] ruleset and has been made into a midround wizard.") + log_game("DYNAMIC: [key_name(M)] was selected by the [name] ruleset and has been made into a midround wizard.") + return TRUE + +/datum/dynamic_ruleset/midround/wizard/rule_process() + if(isliving(wizard.current) && wizard.current.stat!=DEAD) + return FALSE + for(var/obj/item/phylactery/P in GLOB.poi_list) //TODO : IsProperlyDead() + if(P.mind && P.mind.has_antag_datum(/datum/antagonist/wizard)) + return FALSE + + if(SSevents.wizardmode) //If summon events was active, turn it off + SSevents.toggleWizardmode() + SSevents.resetFrequency() + + return RULESET_STOP_PROCESSING + ////////////////////////////////////////////// // // // WIZARD (GHOST) // @@ -459,7 +518,7 @@ antag_flag = "clock mid" antag_flag_override = ROLE_SERVANT_OF_RATVAR protected_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") - restricted_roles = list("AI", "Cyborg", "Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") + restricted_roles = list("AI", "Cyborg") enemy_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") required_enemies = list(1,1,1,1,1,1,0,0,0,0) required_candidates = 2 @@ -536,6 +595,7 @@ name = "Blob Infection" antag_datum = /datum/antagonist/blob antag_flag = "blob mid" + antag_flag_override = ROLE_BLOB protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_roles = list("Cyborg", "AI", "Positronic Brain") enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") @@ -559,11 +619,11 @@ candidates -= player /datum/dynamic_ruleset/midround/blob_infection/execute() - if(!candidates || !candidates.len) + if(!length(candidates)) return FALSE var/mob/living/carbon/human/blob_antag = pick_n_take(candidates) assigned += blob_antag.mind - blob_antag.mind.special_role = antag_flag + blob_antag.mind.special_role = antag_flag_override return ..() ////////////////////////////////////////////// diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 7b0ff1d31923..d040b98a3812 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -128,7 +128,7 @@ /obj/machinery/door/firedoor/power_change() if(powered(power_channel)) stat &= ~NOPOWER - latetoggle() + INVOKE_ASYNC(src, .proc/latetoggle) else stat |= NOPOWER diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 1821ecabfa61..e0e00b92b95a 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -1,3 +1,7 @@ +#define WIZARD_DO_NOTHING 0 +#define WIZARD_QDEL_INVENTORY 1 +#define WIZARD_DROP_INVENTORY 2 + /datum/antagonist/wizard name = "Space Wizard" roundend_category = "wizards/witches" @@ -10,7 +14,8 @@ ui_name = "AntagInfoWizard" suicide_cry = "FOR THE FEDERATION!!" var/give_objectives = TRUE - var/strip = TRUE //strip before equipping + var/inventory_mode = WIZARD_QDEL_INVENTORY + var/change_species = TRUE var/allow_rename = TRUE var/datum/team/wizard/wiz_team //Only created if wizard summons apprentices var/move_to_lair = TRUE @@ -90,10 +95,14 @@ var/mob/living/carbon/human/H = owner.current if(!istype(H)) return - if(strip) - H.delete_equipment() + switch(inventory_mode) + if(WIZARD_QDEL_INVENTORY) + H.delete_equipment() + if(WIZARD_DROP_INVENTORY) + H.unequip_everything() //Wizards are human by default. Use the mirror if you want something else. - H.set_species(/datum/species/human) + if(change_species) + H.set_species(/datum/species/human) if(H.age < wiz_age) H.age = wiz_age H.equipOutfit(outfit_type) @@ -253,6 +262,17 @@ new_objective.owner = owner objectives += new_objective +/datum/antagonist/wizard/on_station + inventory_mode = WIZARD_DROP_INVENTORY + change_species = FALSE + +/datum/antagonist/wizard/on_station/on_gain() + var/datum/effect_system/smoke_spread/smoke = new + smoke.start() + smoke.set_up(2, get_turf(owner)) + owner.current.visible_message("[owner] suddenly disappears in a puff of smoke, leaving [owner.p_their()] clothes behind!", "You feel yourself being pulled away...") + return ..() + //Solo wizard report /datum/antagonist/wizard/roundend_report() var/list/parts = list() diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm index 75703bce7aa3..62cd9d173d08 100644 --- a/code/modules/holiday/halloween/bartholomew.dm +++ b/code/modules/holiday/halloween/bartholomew.dm @@ -14,7 +14,7 @@ /obj/item/barthpot/attackby(obj/item/I, mob/user, params) if(BallTutorial) - say("Hello and welcome to the annual Citadelstation Spookyball 2021! CENTCOM requisitioned this old hospital as a new colony site two years ago, and we’re back again after a few additions here and there. Next to me you can find all the tools you’ll need to build a nice private house, if you’re here for that kind of thing. The axes will chop trees, and give you wood. Shovels will remove grass and things, which you can use the grass to make beds and backets. The pickaxe will allow you pick out the nearby rocks, if you’re more interested in building a cave dwelling. Finally the umbrella and light sources are because it’s spooky, and it might rain! As for interesting spots; There’s the old abandoned mansion which you can get to by going through the entrance and towards the east. There’s also a mech arena directly south, and a racetrack in the caves to the right of the arena, follow the lanterns. And make sure to explore the caves too! Lots of neat things to find!") + say("Hello and welcome to the annual Citadel Station Spooky Ball [time2text(world.realtime, "YYYY")]! CENTCOM requisitioned this old hospital as a new colony site [text2num(time2text(world.realtime,"YYYY")) - 2019] years ago, and we’re back again after a few additions here and there. Next to me you can find all the tools you’ll need to build a nice private house, if you’re here for that kind of thing. The axes will chop trees, and give you wood. Shovels will remove grass and things, which you can use the grass to make beds and backets. The pickaxe will allow you pick out the nearby rocks, if you’re more interested in building a cave dwelling. Finally the umbrella and light sources are because it’s spooky, and it might rain! As for interesting spots; There’s the old abandoned mansion which you can get to by going through the entrance and towards the east. There’s also a mech arena directly south, and a racetrack in the caves to the right of the arena, follow the lanterns. And make sure to explore the caves too! Lots of neat things to find!") return if(!active) say("Meow!") @@ -24,7 +24,7 @@ if(istype(I, I2)) qdel(I) new /obj/item/reagent_containers/food/snacks/special_candy(loc) - to_chat(user, "You add the [I.name] to the pot and watch as it melts into the mixture, a candy crystalising in it's wake.") + to_chat(user, "You add the [I.name] to the pot and watch as it melts into the mixture, a candy crystallizing in it's wake.") say("Hooray! Thank you!") items_list -= I2 return @@ -32,7 +32,7 @@ /obj/item/barthpot/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(BallTutorial) - say("Hello and welcome to the annual Citadelstation Spookyball 2021! CENTCOM requisitioned this old hospital as a new colony site two years ago, and we’re back again after a few additions here and there. Next to me you can find all the tools you’ll need to build a nice private house, if you’re here for that kind of thing. The axes will chop trees, and give you wood. Shovels will remove grass and things, which you can use the grass to make beds and backets. The pickaxe will allow you pick out the nearby rocks, if you’re more interested in building a cave dwelling. Finally the umbrella and light sources are because it’s spooky, and it might rain! As for interesting spots; There’s the old abandoned mansion which you can get to by going through the entrance and towards the east. There’s also a mech arena directly south, and a racetrack in the caves to the right of the arena, follow the lanterns. And make sure to explore the caves too! Lots of neat things to find!") + say("Hello and welcome to the annual Citadel Station Spooky Ball [time2text(world.realtime, "YYYY")]! CENTCOM requisitioned this old hospital as a new colony site [text2num(time2text(world.realtime,"YYYY")) - 2019] years ago, and we’re back again after a few additions here and there. Next to me you can find all the tools you’ll need to build a nice private house, if you’re here for that kind of thing. The axes will chop trees, and give you wood. Shovels will remove grass and things, which you can use the grass to make beds and backets. The pickaxe will allow you pick out the nearby rocks, if you’re more interested in building a cave dwelling. Finally the umbrella and light sources are because it’s spooky, and it might rain! As for interesting spots; There’s the old abandoned mansion which you can get to by going through the entrance and towards the east. There’s also a mech arena directly south, and a racetrack in the caves to the right of the arena, follow the lanterns. And make sure to explore the caves too! Lots of neat things to find!") return if(!active) say("Meow!") @@ -40,7 +40,7 @@ say("Hello there, I'm Bartholomew, Jacqueline's Familiar.") sleep(20) - say("I'm currently seeking items to put into my pot, if we get the right items, it should crystalise into a magic candy!") + say("I'm currently seeking items to put into my pot, if we get the right items, it should crystalize into a magic candy!") if(!iscarbon(user)) say("Though... I'm not sure you can help me.") diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index c2dd77290a58..a44a0faa068a 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -105,7 +105,7 @@ addStaticPower(-value, powerchannel) /obj/machinery/proc/power_change() - //SIGNAL_HANDLER + SHOULD_NOT_SLEEP(TRUE) //SHOULD_CALL_PARENT(TRUE) if(stat & BROKEN) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 594ccf300e5b..1f044cf3c6ae 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -773,6 +773,18 @@ icon_icon = 'icons/mob/actions/actions_items.dmi' button_icon_state = "sniper_zoom" +/datum/action/item_action/toggle_scope_zoom/IsAvailable(silent = FALSE) + . = ..() + if(!. && owner) + var/obj/item/gun/G = target + G.zoom(owner, owner.dir, FALSE) + +/datum/action/item_action/toggle_scope_zoom/Trigger() + . = ..() + if(.) + var/obj/item/gun/G = target + G.zoom(owner, owner.dir) + /datum/action/item_action/toggle_scope_zoom/Remove(mob/living/L) var/obj/item/gun/G = target G.zoom(L, L.dir, FALSE) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index d87e34f4a78d..9c7dd5797350 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -541,7 +541,7 @@ /obj/machinery/computer/shuttle/pod/Initialize(mapload) . = ..() RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, .proc/check_lock) - + /obj/machinery/computer/shuttle/pod/ComponentInitialize() . = ..() AddElement(/datum/element/update_icon_blocker) @@ -571,18 +571,19 @@ if(obj_flags & EMAGGED) return - + admin_controlled = !(new_level < SEC_LEVEL_RED) - + /obj/docking_port/stationary/random name = "escape pod" id = "pod" dwidth = 1 width = 3 height = 4 - var/target_area = list(/area/lavaland/surface/outdoors, /area/icemoon/underground/unexplored/rivers) + /// The area the pod tries to land at + var/target_area = /area/lavaland/surface/outdoors + /// Minimal distance from the map edge, setting this too low can result in shuttle landing on the edge and getting "sliced" var/edge_distance = 16 - // Minimal distance from the map edge, setting this too low can result in shuttle landing on the edge and getting "sliced" /obj/docking_port/stationary/random/Initialize(mapload) . = ..() @@ -590,15 +591,21 @@ return var/list/turfs = get_area_turfs(target_area) - var/turf/T = pick(turfs) - + var/original_len = turfs.len while(turfs.len) - if(T.x "operative trencher + gas mask" and "stripped trencher gas mask" -> "trencher gas mask", also modifies + description. Otherwise, values are unchanged.' + - rscadd: With that said, added trencher gas mask into loadout. You can still acquire + it in-round by hacking Clothesmate as usual. +2023-11-24: + BongaTheProto: + - code_imp: Fixes tgui dependencies + - rscadd: Added the purple victorian to tier 2 donator loadout + - rscadd: adds a Clussy outfit set (uniform, wig, shoes and gloves) + - bugfix: Fixes the negative size bug when using the werewolf quirk + - rscadd: Adds the Dark Passenger antag, which is obtainable through a brain trauma + through admin intervention diff --git a/modular_splurt/code/datums/brain_damage/severe.dm b/modular_splurt/code/datums/brain_damage/severe.dm new file mode 100644 index 000000000000..8dc369aeb201 --- /dev/null +++ b/modular_splurt/code/datums/brain_damage/severe.dm @@ -0,0 +1,14 @@ +/datum/brain_trauma/severe/dark_passenger + name = "Severe intrusive thoughts" + desc = "Patient presents erratic and hazardous behavior for unknown motives." + gain_text = "" + lose_text = span_warning("You've won the battle against your intrusive thoughts!") + random_gain = FALSE + +/datum/brain_trauma/severe/dark_passenger/on_gain() + owner.mind.add_antag_datum(/datum/antagonist/dark_passenger) + . = ..() + +/datum/brain_trauma/severe/dark_passenger/on_lose(silent) + owner.mind.remove_antag_datum(/datum/antagonist/dark_passenger) + . = ..() diff --git a/modular_splurt/code/datums/traits/trait_actions.dm b/modular_splurt/code/datums/traits/trait_actions.dm index 43164bf5384a..63ea04fbd24a 100644 --- a/modular_splurt/code/datums/traits/trait_actions.dm +++ b/modular_splurt/code/datums/traits/trait_actions.dm @@ -1288,7 +1288,7 @@ // Do nothing! // Check if species is already a mammal sub-type - else if(owner_species in subtypesof(/datum/species/mammal)) + else if(ispath(owner_species, /datum/species/mammal)) // Do nothing! // Check if species is a jelly @@ -1297,7 +1297,7 @@ custom_species_prefix = "Jelly " // Check if species is a jelly subtype - else if(owner_species in subtypesof(/datum/species/jelly)) + else if(ispath(owner_species, /datum/species/jelly)) // Set species prefix custom_species_prefix = "Slime " @@ -1320,7 +1320,7 @@ action_owner.dna.features["mam_snouts"] = "Sergal" action_owner.dna.features["legs"] = "Digitigrade" action_owner.dna.features["insect_fluff"] = "Hyena" - action_owner.update_size(get_size(action_owner) + 0.5) + action_owner.update_size(clamp(get_size(action_owner) + 0.5, RESIZE_MICRO, RESIZE_MACRO)) action_owner.set_bark("bark") if(old_features["taur"] != "None") action_owner.dna.features["taur"] = "Canine" @@ -1374,7 +1374,7 @@ action_owner.dna.species.mutant_bodyparts["legs"] = old_features["legs"] action_owner.update_body() action_owner.update_body_parts() - action_owner.update_size(get_size(action_owner) - 0.5) + action_owner.update_size(clamp(get_size(action_owner) - 0.5, RESIZE_MICRO, RESIZE_MACRO)) // Revert citadel organs if(organ_breasts) diff --git a/modular_splurt/code/modules/antagonists/dark_passenger/datum_dark_passenger.dm b/modular_splurt/code/modules/antagonists/dark_passenger/datum_dark_passenger.dm new file mode 100644 index 000000000000..d7ae67838597 --- /dev/null +++ b/modular_splurt/code/modules/antagonists/dark_passenger/datum_dark_passenger.dm @@ -0,0 +1,13 @@ +/datum/antagonist/dark_passenger + name = "Dark Passenger" + job_rank = ROLE_TRAITOR + +/datum/antagonist/dark_passenger/greet() + to_chat(owner, span_warning("You feel the intrusive thoughts taking over your mind...")) + to_chat(owner, span_boldwarning("Ahelp IMMEDIATELY if you got this antag in any way that wasn't through admin intervention.")) + owner.announce_objectives() + antag_memory += "I just know there's something dark in me. I hide it. I certainly don't talk about it. But it's there. Always. This 'Dark Passenger.' And when he's driving, I feel...alive. Half sick with the thrill of complete wrongness. I don't fight him. I don't want to." + +/datum/antagonist/dark_passenger/farewell() + to_chat(owner, span_warning("The intrusive thoughts begin to fade away...")) + diff --git a/modular_splurt/code/modules/cargo/packs/misc.dm b/modular_splurt/code/modules/cargo/packs/misc.dm index cb4af91dee36..55170cd3a713 100644 --- a/modular_splurt/code/modules/cargo/packs/misc.dm +++ b/modular_splurt/code/modules/cargo/packs/misc.dm @@ -533,7 +533,7 @@ /datum/supply_pack/misc/goner_yellow name = "Yellow Trencher Outfits" - desc = "Contains an import of five trench uniforms, coats, gas masks, jackboots, four helmets and one officer cap. Made by cursed Yellows." + desc = "Contains an import of five trench uniforms, coats, gas masks, jackboots, four helmets and one officer cap. Made by damn Yellows." cost = 2000 contraband = TRUE contains = list( diff --git a/modular_splurt/code/modules/client/loadout/donator/first_tier.dm b/modular_splurt/code/modules/client/loadout/donator/first_tier.dm index ce763274e175..248f29062329 100644 --- a/modular_splurt/code/modules/client/loadout/donator/first_tier.dm +++ b/modular_splurt/code/modules/client/loadout/donator/first_tier.dm @@ -19,6 +19,12 @@ ckeywhitelist = list() donator_group_id = DONATOR_GROUP_TIER_1 +/datum/gear/donator/uniform/victorian_purple + name = "Purple Victorian Suit" + path = /obj/item/clothing/under/rank/civilian/victorian_purple + ckeywhitelist = list() + donator_group_id = DONATOR_GROUP_TIER_1 + //Head /datum/gear/donator/head/crown/fancy name = "magnificent crown" diff --git a/modular_splurt/code/modules/client/loadout/gloves.dm b/modular_splurt/code/modules/client/loadout/gloves.dm index db30ca39e439..c6971d42398e 100644 --- a/modular_splurt/code/modules/client/loadout/gloves.dm +++ b/modular_splurt/code/modules/client/loadout/gloves.dm @@ -10,3 +10,9 @@ /datum/gear/gloves/syntech/ring name = "Normalizer Ring" path = /obj/item/clothing/accessory/ring/syntech + +/datum/gear/gloves/clussy_gloves + name = "Clussy gloves" + path = /obj/item/clothing/gloves/clussy_gloves + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/client/loadout/head.dm b/modular_splurt/code/modules/client/loadout/head.dm index b9df52e1509b..8f3cadba6e6a 100644 --- a/modular_splurt/code/modules/client/loadout/head.dm +++ b/modular_splurt/code/modules/client/loadout/head.dm @@ -90,3 +90,10 @@ description = "A hat made of transparent fibers, often used with reinforcement kits." path = /obj/item/clothing/head/invisihat loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION + +/datum/gear/head/clussy_wig + name = "Clussy wig" + path = /obj/item/clothing/head/clussy_wig + subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/client/loadout/mask.dm b/modular_splurt/code/modules/client/loadout/mask.dm index dd95e3c0cc49..02f1e58a7b2a 100644 --- a/modular_splurt/code/modules/client/loadout/mask.dm +++ b/modular_splurt/code/modules/client/loadout/mask.dm @@ -1,3 +1,12 @@ /datum/gear/mask/gas restricted_roles = list() +/datum/gear/mask/gas_glass + name = "Glass Gas Mask" + path = /obj/item/clothing/mask/gas/glass + cost = 2 + +/datum/gear/mask/gas_goner + name = "Trencher Gas Mask" + path = /obj/item/clothing/mask/gas/goner/basic + cost = 2 diff --git a/modular_splurt/code/modules/client/loadout/shoes.dm b/modular_splurt/code/modules/client/loadout/shoes.dm index b75b1cd62115..3e1c4320e4ae 100644 --- a/modular_splurt/code/modules/client/loadout/shoes.dm +++ b/modular_splurt/code/modules/client/loadout/shoes.dm @@ -40,3 +40,9 @@ /datum/gear/shoes/highheel_sandals name = "High-heel Sandals" path = /obj/item/clothing/shoes/highheel_sandals + +/datum/gear/shoes/clussy_heels + name = "Clussy heels" + path = /obj/item/clothing/shoes/clown_shoes/clussy_heels + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index 83cc9e478b6d..18402eb2c7ce 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -254,3 +254,10 @@ /datum/gear/uniform/suit/helltaker/skirt name = "Red Shirt with White Skirt" path = /obj/item/clothing/under/suit/helltaker/skirt + +/datum/gear/uniform/suit/clussy_outfit + name = "Clussy outfit" + path = /obj/item/clothing/under/rank/civilian/clown/clussy_outfit + subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS + restricted_roles = list("Clown") + restricted_desc = "Clown" diff --git a/modular_splurt/code/modules/clothing/gloves/miscellaneous.dm b/modular_splurt/code/modules/clothing/gloves/miscellaneous.dm new file mode 100644 index 000000000000..0d1d1facde6f --- /dev/null +++ b/modular_splurt/code/modules/clothing/gloves/miscellaneous.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/gloves/clussy_gloves + name = "Clussy gloves" + desc = "Why honking horns when you can honk someone's balls?" + icon = 'modular_splurt/icons/obj/clothing/gloves.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/hands.dmi' + icon_state = "clussy_gloves" + item_state = "clussy_gloves" diff --git a/modular_splurt/code/modules/clothing/head/misc.dm b/modular_splurt/code/modules/clothing/head/misc.dm index 923fcf5f9207..0b81ac7189f1 100644 --- a/modular_splurt/code/modules/clothing/head/misc.dm +++ b/modular_splurt/code/modules/clothing/head/misc.dm @@ -114,3 +114,12 @@ icon_state = "hat_transparent" // Makes the invisible hat not screw up hair. dynamic_hair_suffix = "" + +/obj/item/clothing/head/clussy_wig + name = "Clussy wig" + desc = "Wearing this will certainly make your pussy honk..." + icon = 'modular_splurt/icons/obj/clothing/head.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/head.dmi' + icon_state = "clussy_wig" + item_state = "clussy_wig" + flags_inv = HIDEHAIR diff --git a/modular_splurt/code/modules/clothing/masks/gasmask.dm b/modular_splurt/code/modules/clothing/masks/gasmask.dm index 7d7066ab8698..5e4bb2380c0f 100644 --- a/modular_splurt/code/modules/clothing/masks/gasmask.dm +++ b/modular_splurt/code/modules/clothing/masks/gasmask.dm @@ -22,8 +22,8 @@ // GWTB-inspired thing wooo /obj/item/clothing/mask/gas/goner - name = "trencher gas mask" - desc = "A No Man's Land-type gas mask. Equipment beloved by many mooks and romantically apocalyptic people. It has filter installed." + name = "operative trencher gas mask" + desc = "A protective, head-covering mask. This gas mask model is made by mooks and romantically apocalyptic people. It even have proper filter on!" icon = 'modular_splurt/icons/obj/clothing/masks.dmi' mob_overlay_icon = 'modular_splurt/icons/mob/clothing/mask.dmi' anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/mask_muzzle.dmi' @@ -32,8 +32,8 @@ armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 40, "acid" = 100) // MOPP's /obj/item/clothing/mask/gas/goner/basic - name = "stripped trencher gas mask" - desc = "A stripped version of No Man's Land-type mask equipment. While you can connect it to air supply, it doesn't block gas flow." + name = "trencher gas mask" + desc = "A head-covering mask. This gas mask model is made by mooks and romantically apocalyptic people. Still isn't good for blocking gas flow." armor = 0 // Cosmetic gas mask for Bane Syndrome (masked_mook) diff --git a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm index f14db24f4fa0..79c9414e3722 100644 --- a/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/shoes/miscellaneous.dm @@ -12,6 +12,14 @@ ) ) +/obj/item/clothing/shoes/clown_shoes/clussy_heels + name = "Clussy heels" + desc = "The silliest footjob of all time." + icon = 'modular_splurt/icons/obj/clothing/shoes.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/shoes.dmi' + anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/shoes_digi.dmi' + icon_state = "clussy_heels" + /obj/item/clothing/shoes/footwraps name = "cloth footwraps" desc = "A roll of treated canvas used for wrapping claws or paws." diff --git a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm index b142451e477f..0880d3e5e936 100644 --- a/modular_splurt/code/modules/clothing/suits/miscellaneous.dm +++ b/modular_splurt/code/modules/clothing/suits/miscellaneous.dm @@ -212,7 +212,7 @@ /obj/item/clothing/suit/goner/Initialize(mapload) . = ..() - allowed = GLOB.detective_vest_allowed // I am probably gonna get fire-line'd for this... But suggestion is a suggestion. Can always revert the changes, right? + allowed = GLOB.detective_vest_allowed + typecacheof(/obj/item/toy) // As per suggestion 1913 (06/07/2022). Now able to hold toys! /obj/item/clothing/suit/goner/fake name = "trencher coat replica" diff --git a/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm index 87001fc2cdae..d147cc659dd7 100644 --- a/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/modular_splurt/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -11,3 +11,12 @@ "mob_overlay_icon" = 'modular_splurt/icons/mob/clothing/uniform.dmi' ) ) + +/obj/item/clothing/under/rank/civilian/clown/clussy_outfit + name = "Clussy outfit" + desc = "Uniform for clowns who really enjoy being honked." + icon = 'modular_splurt/icons/obj/clothing/uniforms.dmi' + mob_overlay_icon = 'modular_splurt/icons/mob/clothing/uniform.dmi' + icon_state = "clussy_outfit" + item_state = "clussy_outfit" + mutantrace_variation = STYLE_DIGITIGRADE | STYLE_NO_ANTHRO_ICON diff --git a/modular_splurt/code/modules/vending/autodrobe.dm b/modular_splurt/code/modules/vending/autodrobe.dm index 065deb7ff3a9..4a128495c830 100644 --- a/modular_splurt/code/modules/vending/autodrobe.dm +++ b/modular_splurt/code/modules/vending/autodrobe.dm @@ -18,7 +18,11 @@ /obj/item/clothing/under/suit/pencil/checkered = 3, /obj/item/clothing/under/suit/pencil/tan = 3, /obj/item/clothing/under/suit/pencil/green = 3, - /obj/item/clothing/under/suit/error = 1 + /obj/item/clothing/under/suit/error = 1, + /obj/item/clothing/under/rank/civilian/clown/clussy_outfit = 1, + /obj/item/clothing/gloves/clussy_gloves = 1, + /obj/item/clothing/head/clussy_wig = 1, + /obj/item/clothing/shoes/clown_shoes/clussy_heels = 1 ) var/list/extra_premium = list( /obj/item/clothing/under/suit/tuxedo = 1, diff --git a/modular_splurt/icons/mob/clothing/hands.dmi b/modular_splurt/icons/mob/clothing/hands.dmi index 689fc93fd87e..7016adfe5305 100644 Binary files a/modular_splurt/icons/mob/clothing/hands.dmi and b/modular_splurt/icons/mob/clothing/hands.dmi differ diff --git a/modular_splurt/icons/mob/clothing/head.dmi b/modular_splurt/icons/mob/clothing/head.dmi index baa44885b6ab..163e345dbc8c 100644 Binary files a/modular_splurt/icons/mob/clothing/head.dmi and b/modular_splurt/icons/mob/clothing/head.dmi differ diff --git a/modular_splurt/icons/mob/clothing/shoes.dmi b/modular_splurt/icons/mob/clothing/shoes.dmi index 119cab3a7bb0..dc3f768f7928 100644 Binary files a/modular_splurt/icons/mob/clothing/shoes.dmi and b/modular_splurt/icons/mob/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/mob/clothing/shoes_digi.dmi b/modular_splurt/icons/mob/clothing/shoes_digi.dmi index ca7b998e5ecf..40a139509583 100644 Binary files a/modular_splurt/icons/mob/clothing/shoes_digi.dmi and b/modular_splurt/icons/mob/clothing/shoes_digi.dmi differ diff --git a/modular_splurt/icons/mob/clothing/uniform.dmi b/modular_splurt/icons/mob/clothing/uniform.dmi index f5d108cc8a8e..3ef925bb57e2 100644 Binary files a/modular_splurt/icons/mob/clothing/uniform.dmi and b/modular_splurt/icons/mob/clothing/uniform.dmi differ diff --git a/modular_splurt/icons/obj/clothing/gloves.dmi b/modular_splurt/icons/obj/clothing/gloves.dmi index e472d37ee4ad..548e2c98992b 100644 Binary files a/modular_splurt/icons/obj/clothing/gloves.dmi and b/modular_splurt/icons/obj/clothing/gloves.dmi differ diff --git a/modular_splurt/icons/obj/clothing/head.dmi b/modular_splurt/icons/obj/clothing/head.dmi index 052c3b817cea..17e75af20e4f 100644 Binary files a/modular_splurt/icons/obj/clothing/head.dmi and b/modular_splurt/icons/obj/clothing/head.dmi differ diff --git a/modular_splurt/icons/obj/clothing/shoes.dmi b/modular_splurt/icons/obj/clothing/shoes.dmi index b4e0d3c95e96..4332c222973c 100644 Binary files a/modular_splurt/icons/obj/clothing/shoes.dmi and b/modular_splurt/icons/obj/clothing/shoes.dmi differ diff --git a/modular_splurt/icons/obj/clothing/uniforms.dmi b/modular_splurt/icons/obj/clothing/uniforms.dmi index 33fa024d3b24..da4d4f386a29 100644 Binary files a/modular_splurt/icons/obj/clothing/uniforms.dmi and b/modular_splurt/icons/obj/clothing/uniforms.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 2a5a4dae6969..2c21508471c6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4391,6 +4391,7 @@ #include "modular_splurt\code\datums\shuttles.dm" #include "modular_splurt\code\datums\status_effects.dm" #include "modular_splurt\code\datums\world_topic.dm" +#include "modular_splurt\code\datums\brain_damage\severe.dm" #include "modular_splurt\code\datums\components\chasm.dm" #include "modular_splurt\code\datums\components\dullahan.dm" #include "modular_splurt\code\datums\components\genital_equipment.dm" @@ -4586,6 +4587,7 @@ #include "modular_splurt\code\modules\antagonists\bloodsucker\datum_bloodsucker.dm" #include "modular_splurt\code\modules\antagonists\bloodsucker\levelup.dm" #include "modular_splurt\code\modules\antagonists\brainwashing\brainwashing.dm" +#include "modular_splurt\code\modules\antagonists\dark_passenger\datum_dark_passenger.dm" #include "modular_splurt\code\modules\antagonists\ert_cleanup\ert_cleanup.dm" #include "modular_splurt\code\modules\antagonists\qareen\qareen.dm" #include "modular_splurt\code\modules\antagonists\qareen\qareen_abilities.dm" @@ -4680,6 +4682,7 @@ #include "modular_splurt\code\modules\clothing\glasses\_glasses.dm" #include "modular_splurt\code\modules\clothing\glasses\hud.dm" #include "modular_splurt\code\modules\clothing\gloves\_gloves.dm" +#include "modular_splurt\code\modules\clothing\gloves\miscellaneous.dm" #include "modular_splurt\code\modules\clothing\head\_head.dm" #include "modular_splurt\code\modules\clothing\head\hardhat.dm" #include "modular_splurt\code\modules\clothing\head\helmet.dm" diff --git a/tgui/package.json b/tgui/package.json index 9e79c9f78555..3bacb394eeda 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -20,44 +20,54 @@ "tgui:tsc": "tsc" }, "dependencies": { - "@babel/core": "^7.18.0", - "@babel/eslint-parser": "^7.17.0", - "@babel/plugin-proposal-class-properties": "^7.17.12", - "@babel/plugin-transform-jscript": "^7.17.12", - "@babel/preset-env": "^7.18.0", - "@babel/preset-typescript": "^7.17.12", - "@types/jest": "^27.5.1", - "@types/jsdom": "^16.2.14", - "@types/node": "^17.0.35", - "@types/webpack": "^5.28.0", - "@types/webpack-env": "^1.17.0", - "@typescript-eslint/parser": "^5.25.0", - "babel-jest": "^28.1.0", - "babel-loader": "^8.2.5", - "babel-plugin-inferno": "^6.4.0", + "@babel/code-frame": "^7.23.4", + "@babel/core": "^7.23.3", + "@babel/eslint-parser": "^7.23.3", + "@babel/generator": "^7.23.4", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.4", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-transform-jscript": "^7.23.3", + "@babel/preset-env": "^7.23.3", + "@babel/preset-typescript": "^7.23.3", + "@babel/types": "^7.23.4", + "@types/jest": "^27.5.2", + "@types/jsdom": "^16.2.15", + "@types/node": "^17.0.45", + "@types/webpack": "^5.28.5", + "@types/webpack-env": "^1.18.4", + "@typescript-eslint/parser": "^5.62.0", + "babel-jest": "^28.1.3", + "babel-loader": "^8.3.0", + "babel-plugin-inferno": "^6.7.0", "babel-plugin-transform-remove-console": "^6.9.4", "common": "workspace:*", - "css-loader": "^6.7.1", - "eslint": "^8.16.0", - "eslint-config-prettier": "^8.5.0", + "css-loader": "^6.8.1", + "debug": "^4.3.4", + "eslint": "^8.54.0", + "eslint-config-prettier": "^8.10.0", "eslint-plugin-radar": "^0.2.1", - "eslint-plugin-react": "^7.30.0", - "eslint-plugin-unused-imports": "^2.0.0", - "inferno": "^7.4.11", - "jest": "^28.1.0", - "jest-circus": "^28.1.0", - "jest-environment-jsdom": "^28.1.0", - "jsdom": "^19.0.0", - "katex": "^0.15.1", - "mini-css-extract-plugin": "^2.6.0", - "sass": "^1.52.1", - "sass-loader": "^13.0.0", - "style-loader": "^3.3.1", - "terser-webpack-plugin": "^5.3.1", - "typescript": "^4.6.4", + "eslint-plugin-react": "^7.33.2", + "eslint-plugin-unused-imports": "^3.0.0", + "globals": "^13.23.0", + "inferno": "^8.2.2", + "jest": "^28.1.3", + "jest-circus": "^28.1.3", + "jest-environment-jsdom": "^28.1.3", + "jsdom": "^22.1.0", + "katex": "^0.15.6", + "mini-css-extract-plugin": "^2.7.6", + "sass": "^1.69.5", + "sass-loader": "^13.3.2", + "style-loader": "^3.3.3", + "terser-webpack-plugin": "^5.3.9", + "typescript": "^4.9.5", "url-loader": "^4.1.1", - "webpack": "^5.76.0", - "webpack-bundle-analyzer": "^4.5.0", - "webpack-cli": "^4.9.2" + "webpack": "^5.89.0", + "webpack-bundle-analyzer": "^4.10.1", + "webpack-cli": "^4.10.0" } } diff --git a/tgui/packages/tgfont/package.json b/tgui/packages/tgfont/package.json index 920ea8681d80..90c38f82db9f 100644 --- a/tgui/packages/tgfont/package.json +++ b/tgui/packages/tgfont/package.json @@ -3,7 +3,7 @@ "name": "tgfont", "version": "1.0.0", "dependencies": { - "fantasticon": "^1.2.2" + "fantasticon": "^1.2.3" }, "scripts": { "build": "node mkdist.cjs && fantasticon --config config.cjs" diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index 8ee0e019ee0a..f3fb885bab56 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -4,10 +4,10 @@ "version": "4.3.0", "type": "module", "dependencies": { - "axios": "^0.21.1", - "glob": "^7.1.7", - "source-map": "^0.7.3", + "axios": "^1.6.2", + "glob": "^7.2.3", + "source-map": "^0.7.4", "stacktrace-parser": "^0.1.10", - "ws": "^7.5.3" + "ws": "^7.5.9" } } diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json index b627ec7015be..5610b34510c1 100644 --- a/tgui/packages/tgui-panel/package.json +++ b/tgui/packages/tgui-panel/package.json @@ -4,8 +4,8 @@ "version": "4.3.0", "dependencies": { "common": "workspace:*", - "dompurify": "^2.3.1", - "inferno": "^7.4.8", + "dompurify": "^2.4.7", + "inferno": "^7.4.11", "tgui": "workspace:*", "tgui-dev-server": "workspace:*", "tgui-polyfill": "workspace:*" diff --git a/tgui/packages/tgui-polyfill/package.json b/tgui/packages/tgui-polyfill/package.json index f972fb1f8d8c..a961caaa32e9 100644 --- a/tgui/packages/tgui-polyfill/package.json +++ b/tgui/packages/tgui-polyfill/package.json @@ -3,8 +3,8 @@ "name": "tgui-polyfill", "version": "4.3.0", "dependencies": { - "core-js": "^3.16.1", - "regenerator-runtime": "^0.13.9", - "unfetch": "^4.2.0" + "core-js": "^3.33.3", + "regenerator-runtime": "^0.13.11", + "unfetch": "^5.0.0" } } diff --git a/tgui/packages/tgui/components/LabeledList.tsx b/tgui/packages/tgui/components/LabeledList.tsx index 029724dd13ac..0417fefc8c0a 100644 --- a/tgui/packages/tgui/components/LabeledList.tsx +++ b/tgui/packages/tgui/components/LabeledList.tsx @@ -10,7 +10,7 @@ import { Box, unit } from './Box'; import { Divider } from './Divider'; type LabeledListProps = { - children?: any; + readonly children?: any; }; export const LabeledList = (props: LabeledListProps) => { @@ -25,15 +25,15 @@ export const LabeledList = (props: LabeledListProps) => { LabeledList.defaultHooks = pureComponentHooks; type LabeledListItemProps = { - className?: string | BooleanLike; - label?: string | BooleanLike; - labelColor?: string | BooleanLike; - color?: string | BooleanLike; - textAlign?: string | BooleanLike; - buttons?: InfernoNode, + readonly className?: string | BooleanLike; + readonly label?: string | BooleanLike; + readonly labelColor?: string | BooleanLike; + readonly color?: string | BooleanLike; + readonly textAlign?: string | BooleanLike; + readonly buttons?: InfernoNode, /** @deprecated */ - content?: any, - children?: InfernoNode; + readonly content?: any, + readonly children?: InfernoNode; }; const LabeledListItem = (props: LabeledListItemProps) => { @@ -86,7 +86,7 @@ const LabeledListItem = (props: LabeledListItemProps) => { LabeledListItem.defaultHooks = pureComponentHooks; type LabeledListDividerProps = { - size?: number; + readonly size?: number; }; const LabeledListDivider = (props: LabeledListDividerProps) => { diff --git a/tgui/packages/tgui/components/Popper.tsx b/tgui/packages/tgui/components/Popper.tsx index 5922e9a569ed..9d536700568e 100644 --- a/tgui/packages/tgui/components/Popper.tsx +++ b/tgui/packages/tgui/components/Popper.tsx @@ -2,9 +2,9 @@ import { createPopper, OptionsGeneric } from "@popperjs/core"; import { Component, findDOMfromVNode, InfernoNode, render } from "inferno"; type PopperProps = { - popperContent: InfernoNode; - options?: Partial>; - additionalStyles?: CSSProperties, + readonly popperContent: InfernoNode; + readonly options?: Partial>; + readonly additionalStyles?: CSSProperties, }; export class Popper extends Component { diff --git a/tgui/packages/tgui/components/Section.tsx b/tgui/packages/tgui/components/Section.tsx index dc226fad611d..77cf03a07639 100644 --- a/tgui/packages/tgui/components/Section.tsx +++ b/tgui/packages/tgui/components/Section.tsx @@ -10,16 +10,16 @@ import { addScrollableNode, removeScrollableNode } from '../events'; import { BoxProps, computeBoxClassName, computeBoxProps } from './Box'; interface SectionProps extends BoxProps { - className?: string; - title?: string; - buttons?: InfernoNode; - fill?: boolean; - fitted?: boolean; - scrollable?: boolean; + readonly className?: string; + readonly title?: string; + readonly buttons?: InfernoNode; + readonly fill?: boolean; + readonly fitted?: boolean; + readonly scrollable?: boolean; /** @deprecated This property no longer works, please remove it. */ - level?: boolean; + readonly level?: boolean; /** @deprecated Please use `scrollable` property */ - overflowY?: any; + readonly overflowY?: any; } export class Section extends Component { diff --git a/tgui/packages/tgui/components/Stack.tsx b/tgui/packages/tgui/components/Stack.tsx index 1801c3a145e6..e486a77c1ea5 100644 --- a/tgui/packages/tgui/components/Stack.tsx +++ b/tgui/packages/tgui/components/Stack.tsx @@ -8,8 +8,8 @@ import { classes } from 'common/react'; import { Flex, FlexItemProps, FlexProps } from './Flex'; interface StackProps extends FlexProps { - vertical?: boolean; - fill?: boolean; + readonly vertical?: boolean; + readonly fill?: boolean; } export const Stack = (props: StackProps) => { @@ -44,7 +44,7 @@ const StackItem = (props: FlexProps) => { Stack.Item = StackItem; interface StackDividerProps extends FlexItemProps { - hidden?: boolean; + readonly hidden?: boolean; } const StackDivider = (props: StackDividerProps) => { diff --git a/tgui/packages/tgui/components/Tooltip.tsx b/tgui/packages/tgui/components/Tooltip.tsx index 0629cb482f33..535a27bcde3e 100644 --- a/tgui/packages/tgui/components/Tooltip.tsx +++ b/tgui/packages/tgui/components/Tooltip.tsx @@ -3,9 +3,9 @@ import { createPopper, Placement, VirtualElement } from '@popperjs/core'; import { Component, findDOMfromVNode, InfernoNode, render } from 'inferno'; type TooltipProps = { - children?: InfernoNode; - content: InfernoNode; - position?: Placement, + readonly children?: InfernoNode; + readonly content: InfernoNode; + readonly position?: Placement, }; type TooltipState = { diff --git a/tgui/packages/tgui/interfaces/ComponentPrinter.tsx b/tgui/packages/tgui/interfaces/ComponentPrinter.tsx index 401865d82b95..3a0c0a876e86 100644 --- a/tgui/packages/tgui/interfaces/ComponentPrinter.tsx +++ b/tgui/packages/tgui/interfaces/ComponentPrinter.tsx @@ -43,7 +43,7 @@ const canProduce = ( }; const MaterialCost = (props: { - materials: Design["materials"], + readonly materials: Design["materials"], }) => { return ( diff --git a/tgui/packages/tgui/interfaces/DecalPainter.tsx b/tgui/packages/tgui/interfaces/DecalPainter.tsx index 1a211cfba4f0..8bb484b45867 100644 --- a/tgui/packages/tgui/interfaces/DecalPainter.tsx +++ b/tgui/packages/tgui/interfaces/DecalPainter.tsx @@ -129,11 +129,11 @@ export const DecalPainter = (props, context) => { }; type IconButtonParams = { - decal: string; - dir: number; - color: string; - label: string; - selected: boolean; + readonly decal: string; + readonly dir: number; + readonly color: string; + readonly label: string; + readonly selected: boolean; }; const IconButton = (props: IconButtonParams, context) => { diff --git a/tgui/packages/tgui/interfaces/ExodroneConsole.tsx b/tgui/packages/tgui/interfaces/ExodroneConsole.tsx index 172fded3ca5f..b70fc369200b 100644 --- a/tgui/packages/tgui/interfaces/ExodroneConsole.tsx +++ b/tgui/packages/tgui/interfaces/ExodroneConsole.tsx @@ -749,7 +749,7 @@ const EventScreen = (props, context) => { type AdventureScreenProps = { - hide_status?: boolean + readonly hide_status?: boolean } export const AdventureScreen = (props: AdventureScreenProps, context) => { diff --git a/tgui/packages/tgui/interfaces/RequestKiosk.js b/tgui/packages/tgui/interfaces/RequestKiosk.js index dca62059a3c4..ef5b8e8c4a9a 100644 --- a/tgui/packages/tgui/interfaces/RequestKiosk.js +++ b/tgui/packages/tgui/interfaces/RequestKiosk.js @@ -84,7 +84,7 @@ export const RequestKioskContent = (props, context) => { title="Request Applicants"> {applicants?.map(applicant => ( applicant.request_id === request.acc_number && ( - + { }; const CornerText = (props: { - align: "left" | "right"; - children: string; + readonly align: "left" | "right"; + readonly children: string; }): JSX.Element => { const { align, children } = props; diff --git a/tgui/packages/tgui/interfaces/common/InputButtons.tsx b/tgui/packages/tgui/interfaces/common/InputButtons.tsx index c5f79add6e9b..c5c55fadbc5a 100644 --- a/tgui/packages/tgui/interfaces/common/InputButtons.tsx +++ b/tgui/packages/tgui/interfaces/common/InputButtons.tsx @@ -7,8 +7,8 @@ type InputButtonsData = { }; type InputButtonsProps = { - input: string | number; - message?: string; + readonly input: string | number; + readonly message?: string; }; export const InputButtons = (props: InputButtonsProps, context) => { diff --git a/tgui/packages/tgui/interfaces/common/Materials.tsx b/tgui/packages/tgui/interfaces/common/Materials.tsx index 5501b18d6629..0d06c950914d 100644 --- a/tgui/packages/tgui/interfaces/common/Materials.tsx +++ b/tgui/packages/tgui/interfaces/common/Materials.tsx @@ -28,7 +28,7 @@ export type Material = { }; interface MaterialIconProps extends BoxProps { - material: keyof typeof MATERIAL_KEYS; + readonly material: keyof typeof MATERIAL_KEYS; } export const MaterialIcon = (props: MaterialIconProps) => { @@ -43,8 +43,8 @@ export const MaterialIcon = (props: MaterialIconProps) => { }; const EjectMaterial = (props: { - material: Material, - onEject: (amount: number) => void, + readonly material: Material, + readonly onEject: (amount: number) => void, }, context) => { const { name, @@ -82,8 +82,8 @@ const EjectMaterial = (props: { }; export const Materials = (props: { - materials: Material[], - onEject: (ref: string, amount: number) => void, + readonly materials: Material[], + readonly onEject: (ref: string, amount: number) => void, }) => { return ( @@ -111,11 +111,11 @@ export enum MaterialFormatting { } export const MaterialAmount = (props: { - name: keyof typeof MATERIAL_KEYS, - amount: number, - formatting?: MaterialFormatting, - color?: string, - style?: Record, + readonly name: keyof typeof MATERIAL_KEYS, + readonly amount: number, + readonly formatting?: MaterialFormatting, + readonly color?: string, + readonly style?: Record, }) => { const { name, diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json index a21c6dd89672..080f517ba136 100644 --- a/tgui/packages/tgui/package.json +++ b/tgui/packages/tgui/package.json @@ -3,15 +3,15 @@ "name": "tgui", "version": "4.3.0", "dependencies": { - "@popperjs/core": "^2.9.3", + "@popperjs/core": "^2.11.8", "common": "workspace:*", - "dateformat": "^4.5.1", - "dompurify": "^2.3.1", - "inferno": "^7.4.8", - "inferno-vnode-flags": "^7.4.8", + "dateformat": "^4.6.3", + "dompurify": "^2.4.7", + "inferno": "^7.4.11", + "inferno-vnode-flags": "^7.4.11", "js-yaml": "^4.1.0", - "katex": "^0.15.1", - "marked": "^4.0.10", + "katex": "^0.15.6", + "marked": "^4.3.0", "tgui-dev-server": "workspace:*", "tgui-polyfill": "workspace:*" } diff --git a/tgui/yarn.lock b/tgui/yarn.lock index 6a4aa7dd37f5..6d3fa91689f5 100644 --- a/tgui/yarn.lock +++ b/tgui/yarn.lock @@ -5,6 +5,13 @@ __metadata: version: 6 cacheKey: 8 +"@aashutoshrathi/word-wrap@npm:^1.2.3": + version: 1.2.6 + resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" + checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd + languageName: node + linkType: hard + "@ampproject/remapping@npm:^2.1.0": version: 2.2.0 resolution: "@ampproject/remapping@npm:2.2.0" @@ -15,6 +22,16 @@ __metadata: languageName: node linkType: hard +"@ampproject/remapping@npm:^2.2.0": + version: 2.2.1 + resolution: "@ampproject/remapping@npm:2.2.1" + dependencies: + "@jridgewell/gen-mapping": ^0.3.0 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 03c04fd526acc64a1f4df22651186f3e5ef0a9d6d6530ce4482ec9841269cf7a11dbb8af79237c282d721c5312024ff17529cd72cc4768c11e999b58e2302079 + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.18.6": version: 7.18.6 resolution: "@babel/code-frame@npm:7.18.6" @@ -33,14 +50,41 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.18.8": +"@babel/code-frame@npm:^7.22.13": + version: 7.22.13 + resolution: "@babel/code-frame@npm:7.22.13" + dependencies: + "@babel/highlight": ^7.22.13 + chalk: ^2.4.2 + checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058 + languageName: node + linkType: hard + +"@babel/code-frame@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/code-frame@npm:7.23.4" + dependencies: + "@babel/highlight": ^7.23.4 + chalk: ^2.4.2 + checksum: 29999d08c3dbd803f3c296dae7f4f40af1f9e381d6bbc76e5a75327c4b8b023bcb2e209843d292f5d71c3b5c845df1da959d415ed862d6a68e0ad6c5c9622d37 + languageName: node + linkType: hard + +"@babel/compat-data@npm:^7.18.8": version: 7.18.13 resolution: "@babel/compat-data@npm:7.18.13" checksum: 869a730dc3ec40d4d5141b832d50b16702a2ea7bf5b87dc2761e7dfaa8deeafa03b8809fc42ff713ac1d450748dcdb07e1eb21f4633e10b87fd47be0065573e6 languageName: node linkType: hard -"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.18.0": +"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/compat-data@npm:7.23.3" + checksum: 52fff649d4e25b10e29e8a9b1c9ef117f44d354273c17b5ef056555f8e5db2429b35df4c38bdfb6865d23133e0fba92e558d31be87bb8457db4ac688646fdbf1 + languageName: node + linkType: hard + +"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": version: 7.18.13 resolution: "@babel/core@npm:7.18.13" dependencies: @@ -63,28 +107,40 @@ __metadata: languageName: node linkType: hard -"@babel/eslint-parser@npm:^7.17.0": - version: 7.18.9 - resolution: "@babel/eslint-parser@npm:7.18.9" +"@babel/core@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/core@npm:7.23.3" dependencies: - eslint-scope: ^5.1.1 - eslint-visitor-keys: ^2.1.0 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ">=7.11.0" - eslint: ^7.5.0 || ^8.0.0 - checksum: ddbe0f9425c61a23069280948c0ad9cd4d6d46087cbc6386dd407a3ae6365c62e20f401ea42608aba21fcc2142b8d3d0878eb2f2192a7e5adbe355bdbc215aad + "@ampproject/remapping": ^2.2.0 + "@babel/code-frame": ^7.22.13 + "@babel/generator": ^7.23.3 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helpers": ^7.23.2 + "@babel/parser": ^7.23.3 + "@babel/template": ^7.22.15 + "@babel/traverse": ^7.23.3 + "@babel/types": ^7.23.3 + convert-source-map: ^2.0.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.3 + semver: ^6.3.1 + checksum: d306c1fa68972f4e085e9e7ad165aee80eb801ef331f6f07808c86309f03534d638b82ad00a3bc08f4d3de4860ccd38512b2790a39e6acc2caf9ea21e526afe7 languageName: node linkType: hard -"@babel/generator@npm:^7.15.0, @babel/generator@npm:^7.7.2": - version: 7.15.0 - resolution: "@babel/generator@npm:7.15.0" +"@babel/eslint-parser@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/eslint-parser@npm:7.23.3" dependencies: - "@babel/types": ^7.15.0 - jsesc: ^2.5.1 - source-map: ^0.5.0 - checksum: ef227c4c39ab810616b1d76cf9fa7b452b3a36ae1f26d52c2a7c68edcba29d6dd3cd3e88c58f6e3969a58dadee7b73016d3cabbd6f0040ff832f686db4679628 + "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1 + eslint-visitor-keys: ^2.1.0 + semver: ^6.3.1 + peerDependencies: + "@babel/core": ^7.11.0 + eslint: ^7.5.0 || ^8.0.0 + checksum: 9573daebe21af5123c302c307be80cacf1c2bf236a9497068a14726d3944ef55e1282519d0ccf51882dfc369359a3442299c98cb22a419e209924db39d4030fd languageName: node linkType: hard @@ -99,12 +155,26 @@ __metadata: languageName: node linkType: hard -"@babel/helper-annotate-as-pure@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/helper-annotate-as-pure@npm:7.14.5" +"@babel/generator@npm:^7.23.3, @babel/generator@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/generator@npm:7.23.4" dependencies: - "@babel/types": ^7.14.5 - checksum: 18cefedda60003c2551dabe0e4ad278ef0507682680892c60e9f7cb75ae1dc9a065cddb3ce9964da76f220bf972af5262619eeac4b84c2b8aba1b031961215cc + "@babel/types": ^7.23.4 + "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 + jsesc: ^2.5.1 + checksum: 7403717002584eaeb58559f4d0de19b79e924ef2735711278f7cb5206d081428bf3960578566d6fa4102b7b30800d44f70acffea5ecef83f0cb62361c2a23062 + languageName: node + linkType: hard + +"@babel/generator@npm:^7.7.2": + version: 7.15.0 + resolution: "@babel/generator@npm:7.15.0" + dependencies: + "@babel/types": ^7.15.0 + jsesc: ^2.5.1 + source-map: ^0.5.0 + checksum: ef227c4c39ab810616b1d76cf9fa7b452b3a36ae1f26d52c2a7c68edcba29d6dd3cd3e88c58f6e3969a58dadee7b73016d3cabbd6f0040ff832f686db4679628 languageName: node linkType: hard @@ -117,17 +187,25 @@ __metadata: languageName: node linkType: hard -"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.18.6": - version: 7.18.9 - resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.18.9" +"@babel/helper-annotate-as-pure@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" dependencies: - "@babel/helper-explode-assignable-expression": ^7.18.6 - "@babel/types": ^7.18.9 - checksum: b4bc214cb56329daff6cc18a7f7a26aeafb55a1242e5362f3d47fe3808421f8c7cd91fff95d6b9b7ccb67e14e5a67d944e49dbe026942bfcbfda19b1c72a8e72 + "@babel/types": ^7.22.5 + checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9": +"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15" + dependencies: + "@babel/types": ^7.22.15 + checksum: 639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a + languageName: node + linkType: hard + +"@babel/helper-compilation-targets@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-compilation-targets@npm:7.18.9" dependencies: @@ -141,7 +219,20 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.18.9": +"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6": + version: 7.22.15 + resolution: "@babel/helper-compilation-targets@npm:7.22.15" + dependencies: + "@babel/compat-data": ^7.22.9 + "@babel/helper-validator-option": ^7.22.15 + browserslist: ^4.21.9 + lru-cache: ^5.1.1 + semver: ^6.3.1 + checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980 + languageName: node + linkType: hard + +"@babel/helper-create-class-features-plugin@npm:^7.18.6": version: 7.18.13 resolution: "@babel/helper-create-class-features-plugin@npm:7.18.13" dependencies: @@ -158,15 +249,22 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-regexp-features-plugin@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/helper-create-regexp-features-plugin@npm:7.14.5" +"@babel/helper-create-class-features-plugin@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15" dependencies: - "@babel/helper-annotate-as-pure": ^7.14.5 - regexpu-core: ^4.7.1 + "@babel/helper-annotate-as-pure": ^7.22.5 + "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-function-name": ^7.22.5 + "@babel/helper-member-expression-to-functions": ^7.22.15 + "@babel/helper-optimise-call-expression": ^7.22.5 + "@babel/helper-replace-supers": ^7.22.9 + "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0 - checksum: c2636d0a6ea6d57eb3603ba9b223fd6ec273a3d8171eb8d84a357ff028cd747ab383b1d7cef84a4df5f9aebb321d43599895f562f3c8aa96314d4847aa59710e + checksum: 52c500d8d164abb3a360b1b7c4b8fff77bc4a5920d3a2b41ae6e1d30617b0dc0b972c1f5db35b1752007e04a748908b4a99bc872b73549ae837e87dcdde005a3 languageName: node linkType: hard @@ -182,19 +280,31 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.3.2": - version: 0.3.2 - resolution: "@babel/helper-define-polyfill-provider@npm:0.3.2" +"@babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5": + version: 7.22.15 + resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15" + dependencies: + "@babel/helper-annotate-as-pure": ^7.22.5 + regexpu-core: ^5.3.1 + semver: ^6.3.1 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 0243b8d4854f1dc8861b1029a46d3f6393ad72f366a5a08e36a4648aa682044f06da4c6e87a456260e1e1b33c999f898ba591a0760842c1387bcc93fbf2151a6 + languageName: node + linkType: hard + +"@babel/helper-define-polyfill-provider@npm:^0.4.3": + version: 0.4.3 + resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3" dependencies: - "@babel/helper-compilation-targets": ^7.17.7 - "@babel/helper-plugin-utils": ^7.16.7 + "@babel/helper-compilation-targets": ^7.22.6 + "@babel/helper-plugin-utils": ^7.22.5 debug: ^4.1.1 lodash.debounce: ^4.0.8 resolve: ^1.14.2 - semver: ^6.1.2 peerDependencies: - "@babel/core": ^7.4.0-0 - checksum: 8f693ab8e9d73873c2e547c7764c7d32d73c14f8dcefdd67fd3a038eb75527e2222aa53412ea673b9bfc01c32a8779a60e77a7381bbdd83452f05c9b7ef69c2c + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 5d21e3f47b320e4b5b644195ec405e7ebc3739e48e65899efc808c5fa9c3bf5b06ce0d8ff5246ca99d1411e368f4557bc66730196c5781a5c4e986ee703bee79 languageName: node linkType: hard @@ -205,23 +315,10 @@ __metadata: languageName: node linkType: hard -"@babel/helper-explode-assignable-expression@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-explode-assignable-expression@npm:7.18.6" - dependencies: - "@babel/types": ^7.18.6 - checksum: 225cfcc3376a8799023d15dc95000609e9d4e7547b29528c7f7111a0e05493ffb12c15d70d379a0bb32d42752f340233c4115bded6d299bc0c3ab7a12be3d30f - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/helper-function-name@npm:7.14.5" - dependencies: - "@babel/helper-get-function-arity": ^7.14.5 - "@babel/template": ^7.14.5 - "@babel/types": ^7.14.5 - checksum: fd8ffa82f7622b6e9a6294fb3b98b42e743ab2a8e3c329367667a960b5b98b48bc5ebf8be7308981f1985b9f3c69e1a3b4a91c8944ae97c31803240da92fb3c8 +"@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5": + version: 7.22.20 + resolution: "@babel/helper-environment-visitor@npm:7.22.20" + checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69 languageName: node linkType: hard @@ -235,21 +332,13 @@ __metadata: languageName: node linkType: hard -"@babel/helper-get-function-arity@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/helper-get-function-arity@npm:7.14.5" +"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0": + version: 7.23.0 + resolution: "@babel/helper-function-name@npm:7.23.0" dependencies: - "@babel/types": ^7.14.5 - checksum: a60779918b677a35e177bb4f46babfd54e9790587b6a4f076092a9eff2a940cbeacdeb10c94331b26abfe838769554d72293d16df897246cfccd1444e5e27cb7 - languageName: node - linkType: hard - -"@babel/helper-hoist-variables@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/helper-hoist-variables@npm:7.14.5" - dependencies: - "@babel/types": ^7.14.5 - checksum: 35af58eebffca10988de7003e044ce2d27212aea72ac6d2c4604137da7f1e193cc694d8d60805d0d0beaf3d990f6f2dcc2622c52e3d3148e37017a29cacf2e56 + "@babel/template": ^7.22.15 + "@babel/types": ^7.23.0 + checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10 languageName: node linkType: hard @@ -262,6 +351,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-hoist-variables@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-hoist-variables@npm:7.22.5" + dependencies: + "@babel/types": ^7.22.5 + checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc + languageName: node + linkType: hard + "@babel/helper-member-expression-to-functions@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-member-expression-to-functions@npm:7.18.9" @@ -271,6 +369,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-member-expression-to-functions@npm:^7.22.15": + version: 7.23.0 + resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0" + dependencies: + "@babel/types": ^7.23.0 + checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75 + languageName: node + linkType: hard + "@babel/helper-module-imports@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-module-imports@npm:7.18.6" @@ -280,7 +387,16 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.18.9": +"@babel/helper-module-imports@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-module-imports@npm:7.22.15" + dependencies: + "@babel/types": ^7.22.15 + checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702 + languageName: node + linkType: hard + +"@babel/helper-module-transforms@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-module-transforms@npm:7.18.9" dependencies: @@ -296,6 +412,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/helper-module-transforms@npm:7.23.3" + dependencies: + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-module-imports": ^7.22.15 + "@babel/helper-simple-access": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/helper-validator-identifier": ^7.22.20 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 5d0895cfba0e16ae16f3aa92fee108517023ad89a855289c4eb1d46f7aef4519adf8e6f971e1d55ac20c5461610e17213f1144097a8f932e768a9132e2278d71 + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" @@ -305,6 +436,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-optimise-call-expression@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-optimise-call-expression@npm:7.22.5" + dependencies: + "@babel/types": ^7.22.5 + checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c + languageName: node + linkType: hard + "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": version: 7.14.5 resolution: "@babel/helper-plugin-utils@npm:7.14.5" @@ -312,28 +452,34 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9": +"@babel/helper-plugin-utils@npm:^7.18.6": version: 7.18.9 resolution: "@babel/helper-plugin-utils@npm:7.18.9" checksum: ebae876cd60f1fe238c7210986093845fa5c4cad5feeda843ea4d780bf068256717650376d3af2a5e760f2ed6a35c065ae144f99c47da3e54aa6cba99d8804e0 languageName: node linkType: hard -"@babel/helper-remap-async-to-generator@npm:^7.18.6, @babel/helper-remap-async-to-generator@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-remap-async-to-generator@npm:7.18.9" +"@babel/helper-plugin-utils@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-plugin-utils@npm:7.22.5" + checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5 + languageName: node + linkType: hard + +"@babel/helper-remap-async-to-generator@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20" dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-wrap-function": ^7.18.9 - "@babel/types": ^7.18.9 + "@babel/helper-annotate-as-pure": ^7.22.5 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-wrap-function": ^7.22.20 peerDependencies: "@babel/core": ^7.0.0 - checksum: 4be6076192308671b046245899b703ba090dbe7ad03e0bea897bb2944ae5b88e5e85853c9d1f83f643474b54c578d8ac0800b80341a86e8538264a725fbbefec + checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7 languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.18.9": +"@babel/helper-replace-supers@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-replace-supers@npm:7.18.9" dependencies: @@ -346,6 +492,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-replace-supers@npm:^7.22.20, @babel/helper-replace-supers@npm:^7.22.9": + version: 7.22.20 + resolution: "@babel/helper-replace-supers@npm:7.22.20" + dependencies: + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-member-expression-to-functions": ^7.22.15 + "@babel/helper-optimise-call-expression": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: a0008332e24daedea2e9498733e3c39b389d6d4512637e000f96f62b797e702ee24a407ccbcd7a236a551590a38f31282829a8ef35c50a3c0457d88218cae639 + languageName: node + linkType: hard + "@babel/helper-simple-access@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-simple-access@npm:7.18.6" @@ -355,21 +514,21 @@ __metadata: languageName: node linkType: hard -"@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.18.9" +"@babel/helper-simple-access@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-simple-access@npm:7.22.5" dependencies: - "@babel/types": ^7.18.9 - checksum: 6e93ccd10248293082606a4b3e30eed32c6f796d378f6b662796c88f462f348aa368aadeb48eb410cfcc8250db93b2d6627c2e55662530f08fc25397e588d68a + "@babel/types": ^7.22.5 + checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2 languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/helper-split-export-declaration@npm:7.14.5" +"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5" dependencies: - "@babel/types": ^7.14.5 - checksum: 93437025a33747bfd37d6d5a9cdac8f4b6b3e5c0c53c0e24c5444575e731ea64fd5471a51a039fd74ff3378f916ea2d69d9f10274d253ed6f832952be2fd65f0 + "@babel/types": ^7.22.5 + checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244 languageName: node linkType: hard @@ -382,6 +541,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-split-export-declaration@npm:^7.22.6": + version: 7.22.6 + resolution: "@babel/helper-split-export-declaration@npm:7.22.6" + dependencies: + "@babel/types": ^7.22.5 + checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921 + languageName: node + linkType: hard + "@babel/helper-string-parser@npm:^7.18.10": version: 7.18.10 resolution: "@babel/helper-string-parser@npm:7.18.10" @@ -389,6 +557,20 @@ __metadata: languageName: node linkType: hard +"@babel/helper-string-parser@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-string-parser@npm:7.22.5" + checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467 + languageName: node + linkType: hard + +"@babel/helper-string-parser@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/helper-string-parser@npm:7.23.4" + checksum: c0641144cf1a7e7dc93f3d5f16d5327465b6cf5d036b48be61ecba41e1eece161b48f46b7f960951b67f8c3533ce506b16dece576baef4d8b3b49f8c65410f90 + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.14.5, @babel/helper-validator-identifier@npm:^7.14.9": version: 7.14.9 resolution: "@babel/helper-validator-identifier@npm:7.14.9" @@ -403,6 +585,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-validator-identifier@npm:7.22.20" + checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-validator-option@npm:7.18.6" @@ -410,15 +599,21 @@ __metadata: languageName: node linkType: hard -"@babel/helper-wrap-function@npm:^7.18.9": - version: 7.18.11 - resolution: "@babel/helper-wrap-function@npm:7.18.11" +"@babel/helper-validator-option@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-validator-option@npm:7.22.15" + checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d + languageName: node + linkType: hard + +"@babel/helper-wrap-function@npm:^7.22.20": + version: 7.22.20 + resolution: "@babel/helper-wrap-function@npm:7.22.20" dependencies: - "@babel/helper-function-name": ^7.18.9 - "@babel/template": ^7.18.10 - "@babel/traverse": ^7.18.11 - "@babel/types": ^7.18.10 - checksum: e2fb909cdeb5c8688513261202cdeab7c6a8ac1f30daa5a1e0111631f270c26118c2e6b27014fc9f5d2c0ee1182fc40a3db2d30e45425587067f49dcae737dc9 + "@babel/helper-function-name": ^7.22.5 + "@babel/template": ^7.22.15 + "@babel/types": ^7.22.19 + checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca languageName: node linkType: hard @@ -433,6 +628,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.23.2": + version: 7.23.4 + resolution: "@babel/helpers@npm:7.23.4" + dependencies: + "@babel/template": ^7.22.15 + "@babel/traverse": ^7.23.4 + "@babel/types": ^7.23.4 + checksum: 85677834f2698d0a468db59c062b011ebdd65fc12bab96eeaae64084d3ce3268427ce2dbc23c2db2ddb8a305c79ea223c2c9f7bbd1fb3f6d2fa5e978c0eb1cea + languageName: node + linkType: hard + "@babel/highlight@npm:^7.14.5": version: 7.14.5 resolution: "@babel/highlight@npm:7.14.5" @@ -455,7 +661,29 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.5, @babel/parser@npm:^7.15.0": +"@babel/highlight@npm:^7.22.13": + version: 7.22.20 + resolution: "@babel/highlight@npm:7.22.20" + dependencies: + "@babel/helper-validator-identifier": ^7.22.20 + chalk: ^2.4.2 + js-tokens: ^4.0.0 + checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134 + languageName: node + linkType: hard + +"@babel/highlight@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/highlight@npm:7.23.4" + dependencies: + "@babel/helper-validator-identifier": ^7.22.20 + chalk: ^2.4.2 + js-tokens: ^4.0.0 + checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89 + languageName: node + linkType: hard + +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.5": version: 7.15.3 resolution: "@babel/parser@npm:7.15.3" bin: @@ -473,45 +701,61 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6" +"@babel/parser@npm:^7.22.15": + version: 7.23.0 + resolution: "@babel/parser@npm:7.23.0" + bin: + parser: ./bin/babel-parser.js + checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354 + languageName: node + linkType: hard + +"@babel/parser@npm:^7.23.3, @babel/parser@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/parser@npm:7.23.4" + bin: + parser: ./bin/babel-parser.js + checksum: 1d90e17d966085b8ea12f357ffcc76568969364481254f0ae3e7ed579e9421d31c7fd3876ccb3b215a5b2ada48251b0c2d0f21ba225ee194f0e18295b49085f2 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0 - checksum: 845bd280c55a6a91d232cfa54eaf9708ec71e594676fe705794f494bb8b711d833b752b59d1a5c154695225880c23dbc9cab0e53af16fd57807976cd3ff41b8d + checksum: ddbaf2c396b7780f15e80ee01d6dd790db076985f3dfeb6527d1a8d4cacf370e49250396a3aa005b2c40233cac214a106232f83703d5e8491848bde273938232 languageName: node linkType: hard -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.18.9" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/helper-skip-transparent-expression-wrappers": ^7.18.9 - "@babel/plugin-proposal-optional-chaining": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 + "@babel/plugin-transform-optional-chaining": ^7.23.3 peerDependencies: "@babel/core": ^7.13.0 - checksum: 93abb5cb179a13db171bfc2cdf79489598f43c50cc174f97a2b7bb1d44d24ade7109665a20cf4e317ad6c1c730f036f06478f7c7e789b4240be1abdb60d6452f + checksum: 434b9d710ae856fa1a456678cc304fbc93915af86d581ee316e077af746a709a741ea39d7e1d4f5b98861b629cc7e87f002d3138f5e836775632466d4c74aef2 languageName: node linkType: hard -"@babel/plugin-proposal-async-generator-functions@npm:^7.18.10": - version: 7.18.10 - resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.18.10" +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.3" dependencies: - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/helper-remap-async-to-generator": ^7.18.9 - "@babel/plugin-syntax-async-generators": ^7.8.4 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 3a6c25085021053830f6c57780118d3337935ac3309eef7f09b11e413d189eed8119d50cbddeb4c8c02f42f8cc01e62a4667b869be6e158f40030bafb92a0629 + "@babel/core": ^7.0.0 + checksum: 4690123f0ef7c11d6bf1a9579e4f463ce363563b75ec3f6ca66cf68687e39d8d747a82c833847653962f79da367eca895d9095c60d8ebb224a1d4277003acc11 languageName: node linkType: hard -"@babel/plugin-proposal-class-properties@npm:^7.17.12, @babel/plugin-proposal-class-properties@npm:^7.18.6": +"@babel/plugin-proposal-class-properties@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6" dependencies: @@ -523,848 +767,894 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-class-static-block@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-class-static-block@npm:7.18.6" +"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2": + version: 7.21.0-placeholder-for-preset-env.2 + resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91 + languageName: node + linkType: hard + +"@babel/plugin-syntax-async-generators@npm:^7.8.4": + version: 7.8.4 + resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4" dependencies: - "@babel/helper-create-class-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-class-static-block": ^7.14.5 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: - "@babel/core": ^7.12.0 - checksum: b8d7ae99ed5ad784f39e7820e3ac03841f91d6ed60ab4a98c61d6112253da36013e12807bae4ffed0ef3cb318e47debac112ed614e03b403fb8b075b09a828ee + "@babel/core": ^7.0.0-0 + checksum: 7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367 languageName: node linkType: hard -"@babel/plugin-proposal-dynamic-import@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-dynamic-import@npm:7.18.6" +"@babel/plugin-syntax-bigint@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-bigint@npm:7.8.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-dynamic-import": ^7.8.3 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 96b1c8a8ad8171d39e9ab106be33bde37ae09b22fb2c449afee9a5edf3c537933d79d963dcdc2694d10677cb96da739cdf1b53454e6a5deab9801f28a818bb2f + checksum: 3a10849d83e47aec50f367a9e56a6b22d662ddce643334b087f9828f4c3dd73bdc5909aaeabe123fed78515767f9ca43498a0e621c438d1cd2802d7fae3c9648 languageName: node linkType: hard -"@babel/plugin-proposal-export-namespace-from@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.18.9" +"@babel/plugin-syntax-class-properties@npm:^7.12.13, @babel/plugin-syntax-class-properties@npm:^7.8.3": + version: 7.12.13 + resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/plugin-syntax-export-namespace-from": ^7.8.3 + "@babel/helper-plugin-utils": ^7.12.13 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 84ff22bacc5d30918a849bfb7e0e90ae4c5b8d8b65f2ac881803d1cf9068dffbe53bd657b0e4bc4c20b4db301b1c85f1e74183cf29a0dd31e964bd4e97c363ef + checksum: 24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc languageName: node linkType: hard -"@babel/plugin-proposal-json-strings@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-json-strings@npm:7.18.6" +"@babel/plugin-syntax-class-static-block@npm:^7.14.5": + version: 7.14.5 + resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-json-strings": ^7.8.3 + "@babel/helper-plugin-utils": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 25ba0e6b9d6115174f51f7c6787e96214c90dd4026e266976b248a2ed417fe50fddae72843ffb3cbe324014a18632ce5648dfac77f089da858022b49fd608cb3 + checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948 languageName: node linkType: hard -"@babel/plugin-proposal-logical-assignment-operators@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.18.9" +"@babel/plugin-syntax-dynamic-import@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: dd87fa4a48c6408c5e85dbd6405a65cc8fe909e3090030df46df90df64cdf3e74007381a58ed87608778ee597eff7395d215274009bb3f5d8964b2db5557754f + checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd languageName: node linkType: hard -"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6" +"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 + "@babel/helper-plugin-utils": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 949c9ddcdecdaec766ee610ef98f965f928ccc0361dd87cf9f88cf4896a6ccd62fce063d4494778e50da99dea63d270a1be574a62d6ab81cbe9d85884bf55a7d + checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a languageName: node linkType: hard -"@babel/plugin-proposal-numeric-separator@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-numeric-separator@npm:7.18.6" +"@babel/plugin-syntax-import-assertions@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-numeric-separator": ^7.10.4 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f370ea584c55bf4040e1f78c80b4eeb1ce2e6aaa74f87d1a48266493c33931d0b6222d8cee3a082383d6bb648ab8d6b7147a06f974d3296ef3bc39c7851683ec + checksum: 883e6b35b2da205138caab832d54505271a3fee3fc1e8dc0894502434fc2b5d517cbe93bbfbfef8068a0fb6ec48ebc9eef3f605200a489065ba43d8cddc1c9a7 languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.18.9" +"@babel/plugin-syntax-import-attributes@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-syntax-import-attributes@npm:7.23.3" dependencies: - "@babel/compat-data": ^7.18.8 - "@babel/helper-compilation-targets": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.18.8 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 66b9bae741d46edf1c96776d26dfe5d335981e57164ec2450583e3d20dfaa08a5137ffebb897e443913207789f9816bfec4ae845f38762c0196a60949eaffdba + checksum: 9aed7661ffb920ca75df9f494757466ca92744e43072e0848d87fa4aa61a3f2ee5a22198ac1959856c036434b5614a8f46f1fb70298835dbe28220cdd1d4c11e languageName: node linkType: hard -"@babel/plugin-proposal-optional-catch-binding@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.18.6" +"@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3": + version: 7.10.4 + resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 + "@babel/helper-plugin-utils": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7b5b39fb5d8d6d14faad6cb68ece5eeb2fd550fb66b5af7d7582402f974f5bc3684641f7c192a5a57e0f59acfae4aada6786be1eba030881ddc590666eff4d1e + checksum: 166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-proposal-optional-chaining@npm:7.18.9" +"@babel/plugin-syntax-json-strings@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/helper-skip-transparent-expression-wrappers": ^7.18.9 - "@babel/plugin-syntax-optional-chaining": ^7.8.3 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f2db40e26172f07c50b635cb61e1f36165de3ba868fcf608d967642f0d044b7c6beb0e7ecf17cbd421144b99e1eae7ad6031ded92925343bb0ed1d08707b514f + checksum: bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a languageName: node linkType: hard -"@babel/plugin-proposal-private-methods@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-private-methods@npm:7.18.6" +"@babel/plugin-syntax-jsx@npm:^7": + version: 7.12.13 + resolution: "@babel/plugin-syntax-jsx@npm:7.12.13" dependencies: - "@babel/helper-create-class-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.12.13 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 22d8502ee96bca99ad2c8393e8493e2b8d4507576dd054490fd8201a36824373440106f5b098b6d821b026c7e72b0424ff4aeca69ed5f42e48f029d3a156d5ad + checksum: 30697ad4607a9339b06c2648c2d128ce6865c3d2d14049b422c5ca060d6532978bb1008e086df402d365fda04fbafe9bd4ad9f62d78ef2e7a7063459b59645c0 languageName: node linkType: hard -"@babel/plugin-proposal-private-property-in-object@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.18.6" +"@babel/plugin-syntax-jsx@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-syntax-jsx@npm:7.23.3" dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-create-class-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/plugin-syntax-private-property-in-object": ^7.14.5 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c8e56a972930730345f39f2384916fd8e711b3f4b4eae2ca9740e99958980118120d5cc9b6ac150f0965a5a35f825910e2c3013d90be3e9993ab6111df444569 + checksum: 89037694314a74e7f0e7a9c8d3793af5bf6b23d80950c29b360db1c66859d67f60711ea437e70ad6b5b4b29affe17eababda841b6c01107c2b638e0493bafb4e languageName: node linkType: hard -"@babel/plugin-proposal-unicode-property-regex@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.18.6" +"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": + version: 7.10.4 + resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a8575ecb7ff24bf6c6e94808d5c84bb5a0c6dd7892b54f09f4646711ba0ee1e1668032b3c43e3e1dfec2c5716c302e851ac756c1645e15882d73df6ad21ae951 + checksum: aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886 languageName: node linkType: hard -"@babel/plugin-proposal-unicode-property-regex@npm:^7.4.4": - version: 7.14.5 - resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.14.5" +"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.14.5 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 58bd3277a972a33d101d29ab4f52e964b6e8ec218eb84f764b4ea67bf8ed362909760812d3f7451ee5e54dc273bd81bc5a00cd2c13e8fb64a47ec117cb69d51b + checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1 languageName: node linkType: hard -"@babel/plugin-syntax-async-generators@npm:^7.8.4": - version: 7.8.4 - resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4" +"@babel/plugin-syntax-numeric-separator@npm:^7.10.4, @babel/plugin-syntax-numeric-separator@npm:^7.8.3": + version: 7.10.4 + resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" + dependencies: + "@babel/helper-plugin-utils": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1 + languageName: node + linkType: hard + +"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" dependencies: "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367 + checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf languageName: node linkType: hard -"@babel/plugin-syntax-bigint@npm:^7.8.3": +"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3": version: 7.8.3 - resolution: "@babel/plugin-syntax-bigint@npm:7.8.3" + resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3" dependencies: "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 3a10849d83e47aec50f367a9e56a6b22d662ddce643334b087f9828f4c3dd73bdc5909aaeabe123fed78515767f9ca43498a0e621c438d1cd2802d7fae3c9648 + checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9 languageName: node linkType: hard -"@babel/plugin-syntax-class-properties@npm:^7.12.13, @babel/plugin-syntax-class-properties@npm:^7.8.3": - version: 7.12.13 - resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13" +"@babel/plugin-syntax-optional-chaining@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3" dependencies: - "@babel/helper-plugin-utils": ^7.12.13 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc + checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30 languageName: node linkType: hard -"@babel/plugin-syntax-class-static-block@npm:^7.14.5": +"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5": version: 7.14.5 - resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5" + resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5" dependencies: "@babel/helper-plugin-utils": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948 + checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda languageName: node linkType: hard -"@babel/plugin-syntax-dynamic-import@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" +"@babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3": + version: 7.14.5 + resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" dependencies: - "@babel/helper-plugin-utils": ^7.8.0 + "@babel/helper-plugin-utils": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd + checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e languageName: node linkType: hard -"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3" +"@babel/plugin-syntax-typescript@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-syntax-typescript@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.8.3 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a + checksum: abfad3a19290d258b028e285a1f34c9b8a0cbe46ef79eafed4ed7ffce11b5d0720b5e536c82f91cbd8442cde35a3dd8e861fa70366d87ff06fdc0d4756e30876 languageName: node linkType: hard -"@babel/plugin-syntax-import-assertions@npm:^7.18.6": +"@babel/plugin-syntax-typescript@npm:^7.7.2": + version: 7.14.5 + resolution: "@babel/plugin-syntax-typescript@npm:7.14.5" + dependencies: + "@babel/helper-plugin-utils": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 5447d13b31aeeeaa5c2b945e60a598642dedca480f11d3232b0927aeb6a6bb8201a0025f509bc23851da4bf126f69b0522790edbd58f4560f0a4984cabd0d126 + languageName: node + linkType: hard + +"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6": version: 7.18.6 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.18.6" + resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6" dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.18.6 "@babel/helper-plugin-utils": ^7.18.6 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 54918a05375325ba0c60bc81abfb261e6f118bed2de94e4c17dca9a2006fc25e13b1a8b5504b9a881238ea394fd2f098f60b2eb3a392585d6348874565445e7b + "@babel/core": ^7.0.0 + checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c languageName: node linkType: hard -"@babel/plugin-syntax-import-meta@npm:^7.8.3": - version: 7.10.4 - resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" +"@babel/plugin-transform-arrow-functions@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.10.4 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b + checksum: 1e99118176e5366c2636064d09477016ab5272b2a92e78b8edb571d20bc3eaa881789a905b20042942c3c2d04efc530726cf703f937226db5ebc495f5d067e66 languageName: node linkType: hard -"@babel/plugin-syntax-json-strings@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3" +"@babel/plugin-transform-async-generator-functions@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.8.0 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-remap-async-to-generator": ^7.22.20 + "@babel/plugin-syntax-async-generators": ^7.8.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a + checksum: e2fc132c9033711d55209f4781e1fc73f0f4da5e0ca80a2da73dec805166b73c92a6e83571a8994cd2c893a28302e24107e90856202b24781bab734f800102bb languageName: node linkType: hard -"@babel/plugin-syntax-jsx@npm:^7": - version: 7.12.13 - resolution: "@babel/plugin-syntax-jsx@npm:7.12.13" +"@babel/plugin-transform-async-to-generator@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-async-to-generator@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.12.13 + "@babel/helper-module-imports": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-remap-async-to-generator": ^7.22.20 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 30697ad4607a9339b06c2648c2d128ce6865c3d2d14049b422c5ca060d6532978bb1008e086df402d365fda04fbafe9bd4ad9f62d78ef2e7a7063459b59645c0 + checksum: 2e9d9795d4b3b3d8090332104e37061c677f29a1ce65bcbda4099a32d243e5d9520270a44bbabf0fb1fb40d463bd937685b1a1042e646979086c546d55319c3c languageName: node linkType: hard -"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": - version: 7.10.4 - resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" +"@babel/plugin-transform-block-scoped-functions@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.10.4 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886 + checksum: e63b16d94ee5f4d917e669da3db5ea53d1e7e79141a2ec873c1e644678cdafe98daa556d0d359963c827863d6b3665d23d4938a94a4c5053a1619c4ebd01d020 languageName: node linkType: hard -"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" +"@babel/plugin-transform-block-scoping@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.8.0 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1 + checksum: fc4b2100dd9f2c47d694b4b35ae8153214ccb4e24ef545c259a9db17211b18b6a430f22799b56db8f6844deaeaa201af45a03331d0c80cc28b0c4e3c814570e4 languageName: node linkType: hard -"@babel/plugin-syntax-numeric-separator@npm:^7.10.4, @babel/plugin-syntax-numeric-separator@npm:^7.8.3": - version: 7.10.4 - resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" +"@babel/plugin-transform-class-properties@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-class-properties@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.10.4 + "@babel/helper-create-class-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1 + checksum: 9c6f8366f667897541d360246de176dd29efc7a13d80a5b48361882f7173d9173be4646c3b7d9b003ccc0e01e25df122330308f33db921fa553aa17ad544b3fc languageName: node linkType: hard -"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" +"@babel/plugin-transform-class-static-block@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.8.0 + "@babel/helper-create-class-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-class-static-block": ^7.14.5 + peerDependencies: + "@babel/core": ^7.12.0 + checksum: c8bfaba19a674fc2eb54edad71e958647360474e3163e8226f1acd63e4e2dbec32a171a0af596c1dc5359aee402cc120fea7abd1fb0e0354b6527f0fc9e8aa1e + languageName: node + linkType: hard + +"@babel/plugin-transform-classes@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-classes@npm:7.23.3" + dependencies: + "@babel/helper-annotate-as-pure": ^7.22.5 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 + "@babel/helper-optimise-call-expression": ^7.22.5 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-replace-supers": ^7.22.20 + "@babel/helper-split-export-declaration": ^7.22.6 + globals: ^11.1.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf + checksum: 1b90b40d729d14466415a1de2d427ede6ec0e401e8dc00e84d309f2e6a1f09ef16d43983f378b51d34251f6c36f7275959477cb2e89b04afc7f248356642fc6d languageName: node linkType: hard -"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3" +"@babel/plugin-transform-computed-properties@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-computed-properties@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.8.0 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/template": ^7.22.15 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9 + checksum: 80452661dc25a0956f89fe98cb562e8637a9556fb6c00d312c57653ce7df8798f58d138603c7e1aad96614ee9ccd10c47e50ab9ded6b6eded5adeb230d2a982e languageName: node linkType: hard -"@babel/plugin-syntax-optional-chaining@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3" +"@babel/plugin-transform-destructuring@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-destructuring@npm:7.23.3" + dependencies: + "@babel/helper-plugin-utils": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9e015099877272501162419bfe781689aec5c462cd2aec752ee22288f209eec65969ff11b8fdadca2eaddea71d705d3bba5b9c60752fcc1be67874fcec687105 + languageName: node + linkType: hard + +"@babel/plugin-transform-dotall-regex@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-dotall-regex@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.8.0 + "@babel/helper-create-regexp-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30 + checksum: a2dbbf7f1ea16a97948c37df925cb364337668c41a3948b8d91453f140507bd8a3429030c7ce66d09c299987b27746c19a2dd18b6f17dcb474854b14fd9159a3 languageName: node linkType: hard -"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5" +"@babel/plugin-transform-duplicate-keys@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-duplicate-keys@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda + checksum: c2a21c34dc0839590cd945192cbc46fde541a27e140c48fe1808315934664cdbf18db64889e23c4eeb6bad9d3e049482efdca91d29de5734ffc887c4fbabaa16 languageName: node linkType: hard -"@babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3": - version: 7.14.5 - resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" +"@babel/plugin-transform-dynamic-import@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-dynamic-import": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e + checksum: 57a722604c430d9f3dacff22001a5f31250e34785d4969527a2ae9160fa86858d0892c5b9ff7a06a04076f8c76c9e6862e0541aadca9c057849961343aab0845 languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-syntax-typescript@npm:7.18.6" +"@babel/plugin-transform-exponentiation-operator@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2cde73725ec51118ebf410bf02d78781c03fa4d3185993fcc9d253b97443381b621c44810084c5dd68b92eb8bdfae0e5b163e91b32bebbb33852383d1815c05d + checksum: 00d05ab14ad0f299160fcf9d8f55a1cc1b740e012ab0b5ce30207d2365f091665115557af7d989cd6260d075a252d9e4283de5f2b247dfbbe0e42ae586e6bf66 languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.14.5 - resolution: "@babel/plugin-syntax-typescript@npm:7.14.5" +"@babel/plugin-transform-export-namespace-from@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-export-namespace-from": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 5447d13b31aeeeaa5c2b945e60a598642dedca480f11d3232b0927aeb6a6bb8201a0025f509bc23851da4bf126f69b0522790edbd58f4560f0a4984cabd0d126 + checksum: 9f770a81bfd03b48d6ba155d452946fd56d6ffe5b7d871e9ec2a0b15e0f424273b632f3ed61838b90015b25bbda988896b7a46c7d964fbf8f6feb5820b309f93 languageName: node linkType: hard -"@babel/plugin-transform-arrow-functions@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-arrow-functions@npm:7.18.6" +"@babel/plugin-transform-for-of@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-for-of@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 900f5c695755062b91eec74da6f9092f40b8fada099058b92576f1e23c55e9813ec437051893a9b3c05cefe39e8ac06303d4a91b384e1c03dd8dc1581ea11602 + checksum: a6288122a5091d96c744b9eb23dc1b2d4cce25f109ac1e26a0ea03c4ea60330e6f3cc58530b33ba7369fa07163b71001399a145238b7e92bff6270ef3b9c32a0 languageName: node linkType: hard -"@babel/plugin-transform-async-to-generator@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-async-to-generator@npm:7.18.6" +"@babel/plugin-transform-function-name@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-function-name@npm:7.23.3" dependencies: - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/helper-remap-async-to-generator": ^7.18.6 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-function-name": ^7.23.0 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c2cca47468cf1aeefdc7ec35d670e195c86cee4de28a1970648c46a88ce6bd1806ef0bab27251b9e7fb791bb28a64dcd543770efd899f28ee5f7854e64e873d3 + checksum: 355c6dbe07c919575ad42b2f7e020f320866d72f8b79181a16f8e0cd424a2c761d979f03f47d583d9471b55dcd68a8a9d829b58e1eebcd572145b934b48975a6 languageName: node linkType: hard -"@babel/plugin-transform-block-scoped-functions@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.18.6" +"@babel/plugin-transform-jscript@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-jscript@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0a0df61f94601e3666bf39f2cc26f5f7b22a94450fb93081edbed967bd752ce3f81d1227fefd3799f5ee2722171b5e28db61379234d1bb85b6ec689589f99d7e + checksum: 07d03d471376c3f86f5900990e787fab2b31940c67df525a36f97faa602742b82289144ec4bfabcbed8aaa7dcc9000a3f3886ed15229c72d74910e3c565f2e8b languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-block-scoping@npm:7.18.9" +"@babel/plugin-transform-json-strings@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-json-strings@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-json-strings": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f8064ea431eb7aa349dc5b6be87a650f912b48cd65afde917e8644f6f840d7f9d2ce4795f2aa3955aa5b23a73d4ad38abd03386ae109b4b8702b746c6d35bda3 + checksum: f9019820233cf8955d8ba346df709a0683c120fe86a24ed1c9f003f2db51197b979efc88f010d558a12e1491210fc195a43cd1c7fee5e23b92da38f793a875de languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-classes@npm:7.18.9" +"@babel/plugin-transform-literals@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-literals@npm:7.23.3" dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-function-name": ^7.18.9 - "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/helper-replace-supers": ^7.18.9 - "@babel/helper-split-export-declaration": ^7.18.6 - globals: ^11.1.0 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d7e953c0cf32af64e75db1277d2556c04635f32691ef462436897840be6f8021d4f85ee96134cb796a12dda549cf53346fedf96b671885f881bc4037c9d120ad + checksum: 519a544cd58586b9001c4c9b18da25a62f17d23c48600ff7a685d75ca9eb18d2c5e8f5476f067f0a8f1fea2a31107eff950b9864833061e6076dcc4bdc3e71ed languageName: node linkType: hard -"@babel/plugin-transform-computed-properties@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-computed-properties@npm:7.18.9" +"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a6bfbea207827d77592628973c0e8cc3319db636506bdc6e81e21582de2e767890e6975b382d0511e9ec3773b9f43691185df90832883bbf9251f688d27fbc1d + checksum: 2ae1dc9b4ff3bf61a990ff3accdecb2afe3a0ca649b3e74c010078d1cdf29ea490f50ac0a905306a2bcf9ac177889a39ac79bdcc3a0fdf220b3b75fac18d39b5 languageName: node linkType: hard -"@babel/plugin-transform-destructuring@npm:^7.18.9": - version: 7.18.13 - resolution: "@babel/plugin-transform-destructuring@npm:7.18.13" +"@babel/plugin-transform-member-expression-literals@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 83e44ec93a4cfbf69376db8836d00ec803820081bf0f8b6cea73a9b3cd320b8285768d5b385744af4a27edda4b6502245c52d3ed026ea61356faf57bfe78effb + checksum: 95cec13c36d447c5aa6b8e4c778b897eeba66dcb675edef01e0d2afcec9e8cb9726baf4f81b4bbae7a782595aed72e6a0d44ffb773272c3ca180fada99bf92db languageName: node linkType: hard -"@babel/plugin-transform-dotall-regex@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-dotall-regex@npm:7.18.6" +"@babel/plugin-transform-modules-amd@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-modules-amd@npm:7.23.3" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: cbe5d7063eb8f8cca24cd4827bc97f5641166509e58781a5f8aa47fb3d2d786ce4506a30fca2e01f61f18792783a5cb5d96bf5434c3dd1ad0de8c9cc625a53da + checksum: d163737b6a3d67ea579c9aa3b83d4df4b5c34d9dcdf25f415f027c0aa8cded7bac2750d2de5464081f67a042ad9e1c03930c2fab42acd79f9e57c00cf969ddff languageName: node linkType: hard -"@babel/plugin-transform-dotall-regex@npm:^7.4.4": - version: 7.14.5 - resolution: "@babel/plugin-transform-dotall-regex@npm:7.14.5" +"@babel/plugin-transform-modules-commonjs@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.14.5 - "@babel/helper-plugin-utils": ^7.14.5 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-simple-access": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 4da3dac9580823c1fe8aaedf6109d3a26d17ad7ef7d1b278ddbcd7c148e02c465cf49250794529a34bac0bda6b53db558ae08d185a96b76efaaa17a5da3911df + checksum: 720a231ceade4ae4d2632478db4e7fecf21987d444942b72d523487ac8d715ca97de6c8f415c71e939595e1a4776403e7dc24ed68fe9125ad4acf57753c9bff7 languageName: node linkType: hard -"@babel/plugin-transform-duplicate-keys@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-duplicate-keys@npm:7.18.9" +"@babel/plugin-transform-modules-systemjs@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.20 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 220bf4a9fec5c4d4a7b1de38810350260e8ea08481bf78332a464a21256a95f0df8cd56025f346238f09b04f8e86d4158fafc9f4af57abaef31637e3b58bd4fe + checksum: 0d2fdd993c785aecac9e0850cd5ed7f7d448f0fbb42992a950cc0590167144df25d82af5aac9a5c99ef913d2286782afa44e577af30c10901c5ee8984910fa1f languageName: node linkType: hard -"@babel/plugin-transform-exponentiation-operator@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.18.6" +"@babel/plugin-transform-modules-umd@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-modules-umd@npm:7.23.3" dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-module-transforms": ^7.23.3 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7f70222f6829c82a36005508d34ddbe6fd0974ae190683a8670dd6ff08669aaf51fef2209d7403f9bd543cb2d12b18458016c99a6ed0332ccedb3ea127b01229 + checksum: 586a7a2241e8b4e753a37af9466a9ffa8a67b4ba9aa756ad7500712c05d8fa9a8c1ed4f7bd25fae2a8265e6cf8fe781ec85a8ee885dd34cf50d8955ee65f12dc languageName: node linkType: hard -"@babel/plugin-transform-for-of@npm:^7.18.8": - version: 7.18.8 - resolution: "@babel/plugin-transform-for-of@npm:7.18.8" +"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-create-regexp-features-plugin": ^7.22.5 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ca64c623cf0c7a80ab6f07ebd3e6e4ade95e2ae806696f70b43eafe6394fa8ce21f2b1ffdd15df2067f7363d2ecfe26472a97c6c774403d2163fa05f50c98f17 + "@babel/core": ^7.0.0 + checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623 languageName: node linkType: hard -"@babel/plugin-transform-function-name@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-function-name@npm:7.18.9" +"@babel/plugin-transform-new-target@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-new-target@npm:7.23.3" dependencies: - "@babel/helper-compilation-targets": ^7.18.9 - "@babel/helper-function-name": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 62dd9c6cdc9714704efe15545e782ee52d74dc73916bf954b4d3bee088fb0ec9e3c8f52e751252433656c09f744b27b757fc06ed99bcde28e8a21600a1d8e597 + checksum: e5053389316fce73ad5201b7777437164f333e24787fbcda4ae489cd2580dbbbdfb5694a7237bad91fabb46b591d771975d69beb1c740b82cb4761625379f00b languageName: node linkType: hard -"@babel/plugin-transform-jscript@npm:^7.17.12": - version: 7.18.9 - resolution: "@babel/plugin-transform-jscript@npm:7.18.9" +"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: fc55c00e5a94ad3d1c4b688d32b33e3b9671905373549202ce57f968bc53b979405f7744eb540517a294367d61de805e4349287c5aba1f132f5b19ef0a192fee + checksum: a27d73ea134d3d9560a6b2e26ab60012fba15f1db95865aa0153c18f5ec82cfef6a7b3d8df74e3c2fca81534fa5efeb6cacaf7b08bdb7d123e3dafdd079886a3 languageName: node linkType: hard -"@babel/plugin-transform-literals@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-literals@npm:7.18.9" +"@babel/plugin-transform-numeric-separator@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-numeric-separator": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 3458dd2f1a47ac51d9d607aa18f3d321cbfa8560a985199185bed5a906bb0c61ba85575d386460bac9aed43fdd98940041fae5a67dff286f6f967707cff489f8 + checksum: 6ba0e5db3c620a3ec81f9e94507c821f483c15f196868df13fa454cbac719a5449baf73840f5b6eb7d77311b24a2cf8e45db53700d41727f693d46f7caf3eec3 languageName: node linkType: hard -"@babel/plugin-transform-member-expression-literals@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-member-expression-literals@npm:7.18.6" +"@babel/plugin-transform-object-rest-spread@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/compat-data": ^7.23.3 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-transform-parameters": ^7.23.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 35a3d04f6693bc6b298c05453d85ee6e41cc806538acb6928427e0e97ae06059f97d2f07d21495fcf5f70d3c13a242e2ecbd09d5c1fcb1b1a73ff528dcb0b695 + checksum: 73fec495e327ca3959c1c03d07a621be09df00036c69fff0455af9a008291677ee9d368eec48adacdc6feac703269a649747568b4af4c4e9f134aa71cc5b378d languageName: node linkType: hard -"@babel/plugin-transform-modules-amd@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-modules-amd@npm:7.18.6" +"@babel/plugin-transform-object-super@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-object-super@npm:7.23.3" dependencies: - "@babel/helper-module-transforms": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - babel-plugin-dynamic-import-node: ^2.3.3 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-replace-supers": ^7.22.20 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f60c4c4e0eaec41e42c003cbab44305da7a8e05b2c9bdfc2b3fe0f9e1d7441c959ff5248aa03e350abe530e354028cbf3aa20bf07067b11510997dad8dd39be0 + checksum: e495497186f621fa79026e183b4f1fbb172fd9df812cbd2d7f02c05b08adbe58012b1a6eb6dd58d11a30343f6ec80d0f4074f9b501d70aa1c94df76d59164c53 languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.18.6" +"@babel/plugin-transform-optional-catch-binding@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4" dependencies: - "@babel/helper-module-transforms": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/helper-simple-access": ^7.18.6 - babel-plugin-dynamic-import-node: ^2.3.3 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7e356e3df8a6a8542cced7491ec5b1cc1093a88d216a59e63a5d2b9fe9d193cbea864f680a41429e41a4f9ecec930aa5b0b8f57e2b17b3b4d27923bb12ba5d14 + checksum: d50b5ee142cdb088d8b5de1ccf7cea85b18b85d85b52f86618f6e45226372f01ad4cdb29abd4fd35ea99a71fefb37009e0107db7a787dcc21d4d402f97470faf languageName: node linkType: hard -"@babel/plugin-transform-modules-systemjs@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-modules-systemjs@npm:7.18.9" +"@babel/plugin-transform-optional-chaining@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4" dependencies: - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-module-transforms": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/helper-validator-identifier": ^7.18.6 - babel-plugin-dynamic-import-node: ^2.3.3 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 + "@babel/plugin-syntax-optional-chaining": ^7.8.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 6122d9901ed5dc56d9db843efc9249fe20d769a11989bbbf5a806ed4f086def949185198aa767888481babf70fc52b6b3e297a991e2b02b4f34ffb03d998d1e3 + checksum: e7a4c08038288057b7a08d68c4d55396ada9278095509ca51ed8dfb72a7f13f26bdd7c5185de21079fe0a9d60d22c227cb32e300d266c1bda40f70eee9f4bc1e languageName: node linkType: hard -"@babel/plugin-transform-modules-umd@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-modules-umd@npm:7.18.6" +"@babel/plugin-transform-parameters@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-parameters@npm:7.23.3" dependencies: - "@babel/helper-module-transforms": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c3b6796c6f4579f1ba5ab0cdcc73910c1e9c8e1e773c507c8bb4da33072b3ae5df73c6d68f9126dab6e99c24ea8571e1563f8710d7c421fac1cde1e434c20153 + checksum: a735b3e85316d17ec102e3d3d1b6993b429bdb3b494651c9d754e3b7d270462ee1f1a126ccd5e3d871af5e683727e9ef98c9d34d4a42204fffaabff91052ed16 languageName: node linkType: hard -"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.18.6" +"@babel/plugin-transform-private-methods@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-private-methods@npm:7.23.3" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-create-class-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: - "@babel/core": ^7.0.0 - checksum: 6ef64aa3dad68df139eeaa7b6e9bb626be8f738ed5ed4db765d516944b1456d513b6bad3bb60fff22babe73de26436fd814a4228705b2d3d2fdb272c31da35e2 + "@babel/core": ^7.0.0-0 + checksum: cedc1285c49b5a6d9a3d0e5e413b756ac40b3ac2f8f68bdfc3ae268bc8d27b00abd8bb0861c72756ff5dd8bf1eb77211b7feb5baf4fdae2ebbaabe49b9adc1d0 languageName: node linkType: hard -"@babel/plugin-transform-new-target@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-new-target@npm:7.18.6" +"@babel/plugin-transform-private-property-in-object@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-annotate-as-pure": ^7.22.5 + "@babel/helper-create-class-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-private-property-in-object": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: bd780e14f46af55d0ae8503b3cb81ca86dcc73ed782f177e74f498fff934754f9e9911df1f8f3bd123777eed7c1c1af4d66abab87c8daae5403e7719a6b845d1 + checksum: fb7adfe94ea97542f250a70de32bddbc3e0b802381c92be947fec83ebffda57e68533c4d0697152719a3496fdd3ebf3798d451c024cd4ac848fc15ac26b70aa7 languageName: node linkType: hard -"@babel/plugin-transform-object-super@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-object-super@npm:7.18.6" +"@babel/plugin-transform-property-literals@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-property-literals@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/helper-replace-supers": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0fcb04e15deea96ae047c21cb403607d49f06b23b4589055993365ebd7a7d7541334f06bf9642e90075e66efce6ebaf1eb0ef066fbbab802d21d714f1aac3aef + checksum: 16b048c8e87f25095f6d53634ab7912992f78e6997a6ff549edc3cf519db4fca01c7b4e0798530d7f6a05228ceee479251245cdd850a5531c6e6f404104d6cc9 languageName: node linkType: hard -"@babel/plugin-transform-parameters@npm:^7.18.8": - version: 7.18.8 - resolution: "@babel/plugin-transform-parameters@npm:7.18.8" +"@babel/plugin-transform-regenerator@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-regenerator@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 + regenerator-transform: ^0.15.2 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2b5863300da60face8a250d91da16294333bd5626e9721b13a3ba2078bd2a5a190e32c6e7a1323d5f547f579aeb2804ff49a62a55fcad2b1d099e55a55b788ea + checksum: 7fdacc7b40008883871b519c9e5cdea493f75495118ccc56ac104b874983569a24edd024f0f5894ba1875c54ee2b442f295d6241c3280e61c725d0dd3317c8e6 languageName: node linkType: hard -"@babel/plugin-transform-property-literals@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-property-literals@npm:7.18.6" +"@babel/plugin-transform-reserved-words@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-reserved-words@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 1c16e64de554703f4b547541de2edda6c01346dd3031d4d29e881aa7733785cd26d53611a4ccf5353f4d3e69097bb0111c0a93ace9e683edd94fea28c4484144 + checksum: 298c4440ddc136784ff920127cea137168e068404e635dc946ddb5d7b2a27b66f1dd4c4acb01f7184478ff7d5c3e7177a127279479926519042948fb7fa0fa48 languageName: node linkType: hard -"@babel/plugin-transform-regenerator@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-regenerator@npm:7.18.6" +"@babel/plugin-transform-shorthand-properties@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - regenerator-transform: ^0.15.0 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 60bd482cb0343c714f85c3e19a13b3b5fa05ee336c079974091c0b35e263307f4e661f4555dff90707a87d5efe19b1d51835db44455405444ac1813e268ad750 + checksum: 5d677a03676f9fff969b0246c423d64d77502e90a832665dc872a5a5e05e5708161ce1effd56bb3c0f2c20a1112fca874be57c8a759d8b08152755519281f326 languageName: node linkType: hard -"@babel/plugin-transform-reserved-words@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-reserved-words@npm:7.18.6" +"@babel/plugin-transform-spread@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-spread@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0738cdc30abdae07c8ec4b233b30c31f68b3ff0eaa40eddb45ae607c066127f5fa99ddad3c0177d8e2832e3a7d3ad115775c62b431ebd6189c40a951b867a80c + checksum: 8fd5cac201e77a0b4825745f4e07a25f923842f282f006b3a79223c00f61075c8868d12eafec86b2642cd0b32077cdd32314e27bcb75ee5e6a68c0144140dcf2 languageName: node linkType: hard -"@babel/plugin-transform-shorthand-properties@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-shorthand-properties@npm:7.18.6" +"@babel/plugin-transform-sticky-regex@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-sticky-regex@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b8e4e8acc2700d1e0d7d5dbfd4fdfb935651913de6be36e6afb7e739d8f9ca539a5150075a0f9b79c88be25ddf45abb912fe7abf525f0b80f5b9d9860de685d7 + checksum: 53e55eb2575b7abfdb4af7e503a2bf7ef5faf8bf6b92d2cd2de0700bdd19e934e5517b23e6dfed94ba50ae516b62f3f916773ef7d9bc81f01503f585051e2949 languageName: node linkType: hard -"@babel/plugin-transform-spread@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-spread@npm:7.18.9" +"@babel/plugin-transform-template-literals@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-template-literals@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/helper-skip-transparent-expression-wrappers": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 59489dd6212bd21debdf77746d9fa02dfe36f7062dc08742b8841d04312a26ea37bc0d71c71a6e37c3ab81dce744faa7f23fa94b0915593458f6adc35c087766 + checksum: b16c5cb0b8796be0118e9c144d15bdc0d20a7f3f59009c6303a6e9a8b74c146eceb3f05186f5b97afcba7cfa87e34c1585a22186e3d5b22f2fd3d27d959d92b2 languageName: node linkType: hard -"@babel/plugin-transform-sticky-regex@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-sticky-regex@npm:7.18.6" +"@babel/plugin-transform-typeof-symbol@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 68ea18884ae9723443ffa975eb736c8c0d751265859cd3955691253f7fee37d7a0f7efea96c8a062876af49a257a18ea0ed5fea0d95a7b3611ce40f7ee23aee3 + checksum: 0af7184379d43afac7614fc89b1bdecce4e174d52f4efaeee8ec1a4f2c764356c6dba3525c0685231f1cbf435b6dd4ee9e738d7417f3b10ce8bbe869c32f4384 languageName: node linkType: hard -"@babel/plugin-transform-template-literals@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-template-literals@npm:7.18.9" +"@babel/plugin-transform-typescript@npm:^7.23.3": + version: 7.23.4 + resolution: "@babel/plugin-transform-typescript@npm:7.23.4" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-annotate-as-pure": ^7.22.5 + "@babel/helper-create-class-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/plugin-syntax-typescript": ^7.23.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 3d2fcd79b7c345917f69b92a85bdc3ddd68ce2c87dc70c7d61a8373546ccd1f5cb8adc8540b49dfba08e1b82bb7b3bbe23a19efdb2b9c994db2db42906ca9fb2 + checksum: 1cd8426763296d27547924022d6aa35ae9c6b93e4f3110af6123d03eec7b7fa319a6965165e13215ba30ac37ef2cca67dadbe15d1f1508b3d1a06423a0592d3a languageName: node linkType: hard -"@babel/plugin-transform-typeof-symbol@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/plugin-transform-typeof-symbol@npm:7.18.9" +"@babel/plugin-transform-unicode-escapes@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-unicode-escapes@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e754e0d8b8a028c52e10c148088606e3f7a9942c57bd648fc0438e5b4868db73c386a5ed47ab6d6f0594aae29ee5ffc2ffc0f7ebee7fae560a066d6dea811cd4 + checksum: 561c429183a54b9e4751519a3dfba6014431e9cdc1484fad03bdaf96582dfc72c76a4f8661df2aeeae7c34efd0fa4d02d3b83a2f63763ecf71ecc925f9cc1f60 languageName: node linkType: hard -"@babel/plugin-transform-typescript@npm:^7.18.6": - version: 7.18.12 - resolution: "@babel/plugin-transform-typescript@npm:7.18.12" +"@babel/plugin-transform-unicode-property-regex@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.23.3" dependencies: - "@babel/helper-create-class-features-plugin": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/plugin-syntax-typescript": ^7.18.6 + "@babel/helper-create-regexp-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 87e9b783ef712697a9d3bd72d0345ea4ea71b4676f9b88da0a30fe4b8a81f453a5badee788bb4dc849616af84d674d728a6ec4248f14a75bfb0b4de5bcce7431 + checksum: 2298461a194758086d17c23c26c7de37aa533af910f9ebf31ebd0893d4aa317468043d23f73edc782ec21151d3c46cf0ff8098a83b725c49a59de28a1d4d6225 languageName: node linkType: hard -"@babel/plugin-transform-unicode-escapes@npm:^7.18.10": - version: 7.18.10 - resolution: "@babel/plugin-transform-unicode-escapes@npm:7.18.10" +"@babel/plugin-transform-unicode-regex@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-unicode-regex@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.9 + "@babel/helper-create-regexp-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f5baca55cb3c11bc08ec589f5f522d85c1ab509b4d11492437e45027d64ae0b22f0907bd1381e8d7f2a436384bb1f9ad89d19277314242c5c2671a0f91d0f9cd + checksum: c5f835d17483ba899787f92e313dfa5b0055e3deab332f1d254078a2bba27ede47574b6599fcf34d3763f0c048ae0779dc21d2d8db09295edb4057478dc80a9a languageName: node linkType: hard -"@babel/plugin-transform-unicode-regex@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-transform-unicode-regex@npm:7.18.6" +"@babel/plugin-transform-unicode-sets-regex@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.23.3" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-create-regexp-features-plugin": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: d9e18d57536a2d317fb0b7c04f8f55347f3cfacb75e636b4c6fa2080ab13a3542771b5120e726b598b815891fc606d1472ac02b749c69fd527b03847f22dc25e + "@babel/core": ^7.0.0 + checksum: 79d0b4c951955ca68235c87b91ab2b393c96285f8aeaa34d6db416d2ddac90000c9bd6e8c4d82b60a2b484da69930507245035f28ba63c6cae341cf3ba68fdef languageName: node linkType: hard -"@babel/preset-env@npm:^7.18.0": - version: 7.18.10 - resolution: "@babel/preset-env@npm:7.18.10" +"@babel/preset-env@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/preset-env@npm:7.23.3" dependencies: - "@babel/compat-data": ^7.18.8 - "@babel/helper-compilation-targets": ^7.18.9 - "@babel/helper-plugin-utils": ^7.18.9 - "@babel/helper-validator-option": ^7.18.6 - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6 - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9 - "@babel/plugin-proposal-async-generator-functions": ^7.18.10 - "@babel/plugin-proposal-class-properties": ^7.18.6 - "@babel/plugin-proposal-class-static-block": ^7.18.6 - "@babel/plugin-proposal-dynamic-import": ^7.18.6 - "@babel/plugin-proposal-export-namespace-from": ^7.18.9 - "@babel/plugin-proposal-json-strings": ^7.18.6 - "@babel/plugin-proposal-logical-assignment-operators": ^7.18.9 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6 - "@babel/plugin-proposal-numeric-separator": ^7.18.6 - "@babel/plugin-proposal-object-rest-spread": ^7.18.9 - "@babel/plugin-proposal-optional-catch-binding": ^7.18.6 - "@babel/plugin-proposal-optional-chaining": ^7.18.9 - "@babel/plugin-proposal-private-methods": ^7.18.6 - "@babel/plugin-proposal-private-property-in-object": ^7.18.6 - "@babel/plugin-proposal-unicode-property-regex": ^7.18.6 + "@babel/compat-data": ^7.23.3 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-validator-option": ^7.22.15 + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.23.3 + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.23.3 + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.23.3 + "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2 "@babel/plugin-syntax-async-generators": ^7.8.4 "@babel/plugin-syntax-class-properties": ^7.12.13 "@babel/plugin-syntax-class-static-block": ^7.14.5 "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-export-namespace-from": ^7.8.3 - "@babel/plugin-syntax-import-assertions": ^7.18.6 + "@babel/plugin-syntax-import-assertions": ^7.23.3 + "@babel/plugin-syntax-import-attributes": ^7.23.3 + "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/plugin-syntax-json-strings": ^7.8.3 "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 @@ -1374,76 +1664,99 @@ __metadata: "@babel/plugin-syntax-optional-chaining": ^7.8.3 "@babel/plugin-syntax-private-property-in-object": ^7.14.5 "@babel/plugin-syntax-top-level-await": ^7.14.5 - "@babel/plugin-transform-arrow-functions": ^7.18.6 - "@babel/plugin-transform-async-to-generator": ^7.18.6 - "@babel/plugin-transform-block-scoped-functions": ^7.18.6 - "@babel/plugin-transform-block-scoping": ^7.18.9 - "@babel/plugin-transform-classes": ^7.18.9 - "@babel/plugin-transform-computed-properties": ^7.18.9 - "@babel/plugin-transform-destructuring": ^7.18.9 - "@babel/plugin-transform-dotall-regex": ^7.18.6 - "@babel/plugin-transform-duplicate-keys": ^7.18.9 - "@babel/plugin-transform-exponentiation-operator": ^7.18.6 - "@babel/plugin-transform-for-of": ^7.18.8 - "@babel/plugin-transform-function-name": ^7.18.9 - "@babel/plugin-transform-literals": ^7.18.9 - "@babel/plugin-transform-member-expression-literals": ^7.18.6 - "@babel/plugin-transform-modules-amd": ^7.18.6 - "@babel/plugin-transform-modules-commonjs": ^7.18.6 - "@babel/plugin-transform-modules-systemjs": ^7.18.9 - "@babel/plugin-transform-modules-umd": ^7.18.6 - "@babel/plugin-transform-named-capturing-groups-regex": ^7.18.6 - "@babel/plugin-transform-new-target": ^7.18.6 - "@babel/plugin-transform-object-super": ^7.18.6 - "@babel/plugin-transform-parameters": ^7.18.8 - "@babel/plugin-transform-property-literals": ^7.18.6 - "@babel/plugin-transform-regenerator": ^7.18.6 - "@babel/plugin-transform-reserved-words": ^7.18.6 - "@babel/plugin-transform-shorthand-properties": ^7.18.6 - "@babel/plugin-transform-spread": ^7.18.9 - "@babel/plugin-transform-sticky-regex": ^7.18.6 - "@babel/plugin-transform-template-literals": ^7.18.9 - "@babel/plugin-transform-typeof-symbol": ^7.18.9 - "@babel/plugin-transform-unicode-escapes": ^7.18.10 - "@babel/plugin-transform-unicode-regex": ^7.18.6 - "@babel/preset-modules": ^0.1.5 - "@babel/types": ^7.18.10 - babel-plugin-polyfill-corejs2: ^0.3.2 - babel-plugin-polyfill-corejs3: ^0.5.3 - babel-plugin-polyfill-regenerator: ^0.4.0 - core-js-compat: ^3.22.1 - semver: ^6.3.0 + "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6 + "@babel/plugin-transform-arrow-functions": ^7.23.3 + "@babel/plugin-transform-async-generator-functions": ^7.23.3 + "@babel/plugin-transform-async-to-generator": ^7.23.3 + "@babel/plugin-transform-block-scoped-functions": ^7.23.3 + "@babel/plugin-transform-block-scoping": ^7.23.3 + "@babel/plugin-transform-class-properties": ^7.23.3 + "@babel/plugin-transform-class-static-block": ^7.23.3 + "@babel/plugin-transform-classes": ^7.23.3 + "@babel/plugin-transform-computed-properties": ^7.23.3 + "@babel/plugin-transform-destructuring": ^7.23.3 + "@babel/plugin-transform-dotall-regex": ^7.23.3 + "@babel/plugin-transform-duplicate-keys": ^7.23.3 + "@babel/plugin-transform-dynamic-import": ^7.23.3 + "@babel/plugin-transform-exponentiation-operator": ^7.23.3 + "@babel/plugin-transform-export-namespace-from": ^7.23.3 + "@babel/plugin-transform-for-of": ^7.23.3 + "@babel/plugin-transform-function-name": ^7.23.3 + "@babel/plugin-transform-json-strings": ^7.23.3 + "@babel/plugin-transform-literals": ^7.23.3 + "@babel/plugin-transform-logical-assignment-operators": ^7.23.3 + "@babel/plugin-transform-member-expression-literals": ^7.23.3 + "@babel/plugin-transform-modules-amd": ^7.23.3 + "@babel/plugin-transform-modules-commonjs": ^7.23.3 + "@babel/plugin-transform-modules-systemjs": ^7.23.3 + "@babel/plugin-transform-modules-umd": ^7.23.3 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5 + "@babel/plugin-transform-new-target": ^7.23.3 + "@babel/plugin-transform-nullish-coalescing-operator": ^7.23.3 + "@babel/plugin-transform-numeric-separator": ^7.23.3 + "@babel/plugin-transform-object-rest-spread": ^7.23.3 + "@babel/plugin-transform-object-super": ^7.23.3 + "@babel/plugin-transform-optional-catch-binding": ^7.23.3 + "@babel/plugin-transform-optional-chaining": ^7.23.3 + "@babel/plugin-transform-parameters": ^7.23.3 + "@babel/plugin-transform-private-methods": ^7.23.3 + "@babel/plugin-transform-private-property-in-object": ^7.23.3 + "@babel/plugin-transform-property-literals": ^7.23.3 + "@babel/plugin-transform-regenerator": ^7.23.3 + "@babel/plugin-transform-reserved-words": ^7.23.3 + "@babel/plugin-transform-shorthand-properties": ^7.23.3 + "@babel/plugin-transform-spread": ^7.23.3 + "@babel/plugin-transform-sticky-regex": ^7.23.3 + "@babel/plugin-transform-template-literals": ^7.23.3 + "@babel/plugin-transform-typeof-symbol": ^7.23.3 + "@babel/plugin-transform-unicode-escapes": ^7.23.3 + "@babel/plugin-transform-unicode-property-regex": ^7.23.3 + "@babel/plugin-transform-unicode-regex": ^7.23.3 + "@babel/plugin-transform-unicode-sets-regex": ^7.23.3 + "@babel/preset-modules": 0.1.6-no-external-plugins + babel-plugin-polyfill-corejs2: ^0.4.6 + babel-plugin-polyfill-corejs3: ^0.8.5 + babel-plugin-polyfill-regenerator: ^0.5.3 + core-js-compat: ^3.31.0 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 36eeb7157021091c8047703833b7a28e4963865d16968a5b9dbffe1eb05e44307a8d29ad45d81fd23817f68290b52921c42f513a93996c7083d23d5e2cea0c6b + checksum: a16780b7d7deeccf70796cd8467e4aa6ad86b33fc86f67e23a606ae6bd6f2f26a952ccd17cf3f6ffb72584ac70d6cd6a936910ee31dbe4ac9622583ad5c2ae30 languageName: node linkType: hard -"@babel/preset-modules@npm:^0.1.5": - version: 0.1.5 - resolution: "@babel/preset-modules@npm:0.1.5" +"@babel/preset-modules@npm:0.1.6-no-external-plugins": + version: 0.1.6-no-external-plugins + resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins" dependencies: "@babel/helper-plugin-utils": ^7.0.0 - "@babel/plugin-proposal-unicode-property-regex": ^7.4.4 - "@babel/plugin-transform-dotall-regex": ^7.4.4 "@babel/types": ^7.4.4 esutils: ^2.0.2 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10 + "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0 + checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375 languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.17.12": - version: 7.18.6 - resolution: "@babel/preset-typescript@npm:7.18.6" +"@babel/preset-typescript@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/preset-typescript@npm:7.23.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 - "@babel/helper-validator-option": ^7.18.6 - "@babel/plugin-transform-typescript": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-validator-option": ^7.22.15 + "@babel/plugin-syntax-jsx": ^7.23.3 + "@babel/plugin-transform-modules-commonjs": ^7.23.3 + "@babel/plugin-transform-typescript": ^7.23.3 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7fe0da5103eb72d3cf39cf3e138a794c8cdd19c0b38e3e101507eef519c46a87a0d6d0e8bc9e28a13ea2364001ebe7430b9d75758aab4c3c3a8db9a487b9dc7c + checksum: 105a2d39bbc464da0f7e1ad7f535c77c5f62d6b410219355b20e552e7d29933567a5c55339b5d0aec1a5c7a0a7dfdf1b54aae601a4fe15a157d54dcbfcb3e854 + languageName: node + linkType: hard + +"@babel/regjsgen@npm:^0.8.0": + version: 0.8.0 + resolution: "@babel/regjsgen@npm:0.8.0" + checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730 languageName: node linkType: hard @@ -1456,17 +1769,6 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.14.5, @babel/template@npm:^7.3.3": - version: 7.14.5 - resolution: "@babel/template@npm:7.14.5" - dependencies: - "@babel/code-frame": ^7.14.5 - "@babel/parser": ^7.14.5 - "@babel/types": ^7.14.5 - checksum: 4939199c5b1ca8940e14c87f30f4fab5f35c909bef88447131075349027546927b4e3e08e50db5c2db2024f2c6585a4fe571c739c835ac980f7a4ada2dd8a623 - languageName: node - linkType: hard - "@babel/template@npm:^7.18.10, @babel/template@npm:^7.18.6": version: 7.18.10 resolution: "@babel/template@npm:7.18.10" @@ -1478,7 +1780,29 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.18.13, @babel/traverse@npm:^7.18.9": +"@babel/template@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/template@npm:7.22.15" + dependencies: + "@babel/code-frame": ^7.22.13 + "@babel/parser": ^7.22.15 + "@babel/types": ^7.22.15 + checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd + languageName: node + linkType: hard + +"@babel/template@npm:^7.3.3": + version: 7.14.5 + resolution: "@babel/template@npm:7.14.5" + dependencies: + "@babel/code-frame": ^7.14.5 + "@babel/parser": ^7.14.5 + "@babel/types": ^7.14.5 + checksum: 4939199c5b1ca8940e14c87f30f4fab5f35c909bef88447131075349027546927b4e3e08e50db5c2db2024f2c6585a4fe571c739c835ac980f7a4ada2dd8a623 + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.18.13, @babel/traverse@npm:^7.18.9": version: 7.18.13 resolution: "@babel/traverse@npm:7.18.13" dependencies: @@ -1496,19 +1820,31 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.23.3, @babel/traverse@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/traverse@npm:7.23.4" + dependencies: + "@babel/code-frame": ^7.23.4 + "@babel/generator": ^7.23.4 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/parser": ^7.23.4 + "@babel/types": ^7.23.4 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: e8c9cd92cfd6fec9cf3969604edea5a58c2d55275b88b9de06f0d94de43b64b04d57168554b617159d62c840a8700e6d4c7954d2e6ed69cfb918202ac01561e9 + languageName: node + linkType: hard + "@babel/traverse@npm:^7.7.2": version: 7.15.0 resolution: "@babel/traverse@npm:7.15.0" dependencies: - "@babel/code-frame": ^7.14.5 - "@babel/generator": ^7.15.0 - "@babel/helper-function-name": ^7.14.5 - "@babel/helper-hoist-variables": ^7.14.5 - "@babel/helper-split-export-declaration": ^7.14.5 - "@babel/parser": ^7.15.0 - "@babel/types": ^7.15.0 - debug: ^4.1.0 - globals: ^11.1.0 + "@babel/code-frame": ^7.22.13 + "@babel/parser": ^7.22.15 + "@babel/types": ^7.22.15 checksum: e13056690a2a4a4dd699e241b89d4f7cf701ceef2f4ee0efc32a8cc4e07e1bbd397423868ecfec8aa98a769486f7d08778420d48f981b4f5dbb1b2f211daf656 languageName: node linkType: hard @@ -1534,6 +1870,28 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.22.15": + version: 7.23.0 + resolution: "@babel/types@npm:7.23.0" + dependencies: + "@babel/helper-string-parser": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.20 + to-fast-properties: ^2.0.0 + checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604 + languageName: node + linkType: hard + +"@babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3, @babel/types@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/types@npm:7.23.4" + dependencies: + "@babel/helper-string-parser": ^7.23.4 + "@babel/helper-validator-identifier": ^7.22.20 + to-fast-properties: ^2.0.0 + checksum: 8a1ab20da663d202b1c090fdef4b157d3c7d8cb1cf60ea548f887d7b674935371409804d6cba52f870c22ced7685fcb41b0578d3edde720990de00cbb328da54 + languageName: node + linkType: hard + "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -1541,6 +1899,13 @@ __metadata: languageName: node linkType: hard +"@discoveryjs/json-ext@npm:0.5.7": + version: 0.5.7 + resolution: "@discoveryjs/json-ext@npm:0.5.7" + checksum: 2176d301cc258ea5c2324402997cf8134ebb212469c0d397591636cea8d3c02f2b3cf9fd58dcb748c7a0dade77ebdc1b10284fa63e608c033a1db52fddc69918 + languageName: node + linkType: hard + "@discoveryjs/json-ext@npm:^0.5.0": version: 0.5.2 resolution: "@discoveryjs/json-ext@npm:0.5.2" @@ -1548,38 +1913,56 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^1.3.1": - version: 1.3.1 - resolution: "@eslint/eslintrc@npm:1.3.1" +"@eslint-community/eslint-utils@npm:^4.2.0": + version: 4.4.0 + resolution: "@eslint-community/eslint-utils@npm:4.4.0" + dependencies: + eslint-visitor-keys: ^3.3.0 + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22 + languageName: node + linkType: hard + +"@eslint-community/regexpp@npm:^4.6.1": + version: 4.10.0 + resolution: "@eslint-community/regexpp@npm:4.10.0" + checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^2.1.3": + version: 2.1.3 + resolution: "@eslint/eslintrc@npm:2.1.3" dependencies: ajv: ^6.12.4 debug: ^4.3.2 - espree: ^9.4.0 - globals: ^13.15.0 + espree: ^9.6.0 + globals: ^13.19.0 ignore: ^5.2.0 import-fresh: ^3.2.1 js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: 9844dcc58a44399649926d5a17a2d53d529b80d3e8c3e9d0964ae198bac77ee6bb1cf44940f30cd9c2e300f7568ec82500be42ace6cacefb08aebf9905fe208e + checksum: 5c6c3878192fe0ddffa9aff08b4e2f3bcc8f1c10d6449b7295a5f58b662019896deabfc19890455ffd7e60a5bd28d25d0eaefb2f78b2d230aae3879af92b89e5 languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.10.4": - version: 0.10.4 - resolution: "@humanwhocodes/config-array@npm:0.10.4" - dependencies: - "@humanwhocodes/object-schema": ^1.2.1 - debug: ^4.1.1 - minimatch: ^3.0.4 - checksum: d480e5d57e6d787565b6cff78e27c3d1b380692d4ffb0ada7d7f5957a56c9032f034da05a3e443065dbd0671ebf4d859036ced34e96b325bbc1badbae3c05300 +"@eslint/js@npm:8.54.0": + version: 8.54.0 + resolution: "@eslint/js@npm:8.54.0" + checksum: 6d88a6f711ef0133566b5340e3178a178fbb297585766460f195d0a9db85688f1e5cf8559fd5748aeb3131e2096c66595b323d8edab22df015acda68f1ebde92 languageName: node linkType: hard -"@humanwhocodes/gitignore-to-minimatch@npm:^1.0.2": - version: 1.0.2 - resolution: "@humanwhocodes/gitignore-to-minimatch@npm:1.0.2" - checksum: aba5c40c9e3770ed73a558b0bfb53323842abfc2ce58c91d7e8b1073995598e6374456d38767be24ab6176915f0a8d8b23eaae5c85e2b488c0dccca6d795e2ad +"@humanwhocodes/config-array@npm:^0.11.13": + version: 0.11.13 + resolution: "@humanwhocodes/config-array@npm:0.11.13" + dependencies: + "@humanwhocodes/object-schema": ^2.0.1 + debug: ^4.1.1 + minimatch: ^3.0.5 + checksum: f8ea57b0d7ed7f2d64cd3944654976829d9da91c04d9c860e18804729a33f7681f78166ef4c761850b8c324d362f7d53f14c5c44907a6b38b32c703ff85e4805 languageName: node linkType: hard @@ -1590,10 +1973,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.1": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 +"@humanwhocodes/object-schema@npm:^2.0.1": + version: 2.0.1 + resolution: "@humanwhocodes/object-schema@npm:2.0.1" + checksum: 24929487b1ed48795d2f08346a0116cc5ee4634848bce64161fb947109352c562310fd159fc64dda0e8b853307f5794605191a9547f7341158559ca3c8262a45 languageName: node linkType: hard @@ -1871,7 +2254,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": +"@jridgewell/gen-mapping@npm:^0.3.0": version: 0.3.2 resolution: "@jridgewell/gen-mapping@npm:0.3.2" dependencies: @@ -1882,6 +2265,17 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.2": + version: 0.3.3 + resolution: "@jridgewell/gen-mapping@npm:0.3.3" + dependencies: + "@jridgewell/set-array": ^1.0.1 + "@jridgewell/sourcemap-codec": ^1.4.10 + "@jridgewell/trace-mapping": ^0.3.9 + checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab + languageName: node + linkType: hard + "@jridgewell/resolve-uri@npm:3.1.0": version: 3.1.0 resolution: "@jridgewell/resolve-uri@npm:3.1.0" @@ -1896,16 +2290,6 @@ __metadata: languageName: node linkType: hard -"@jridgewell/source-map@npm:^0.3.2": - version: 0.3.2 - resolution: "@jridgewell/source-map@npm:0.3.2" - dependencies: - "@jridgewell/gen-mapping": ^0.3.0 - "@jridgewell/trace-mapping": ^0.3.9 - checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482 - languageName: node - linkType: hard - "@jridgewell/source-map@npm:^0.3.3": version: 0.3.5 resolution: "@jridgewell/source-map@npm:0.3.5" @@ -1923,7 +2307,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.13, @jridgewell/trace-mapping@npm:^0.3.14, @jridgewell/trace-mapping@npm:^0.3.9": +"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.13, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.17 resolution: "@jridgewell/trace-mapping@npm:0.3.17" dependencies: @@ -1943,6 +2327,15 @@ __metadata: languageName: node linkType: hard +"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1": + version: 5.1.1-v1 + resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1" + dependencies: + eslint-scope: 5.1.1 + checksum: f2e3b2d6a6e2d9f163ca22105910c9f850dc4897af0aea3ef0a5886b63d8e1ba6505b71c99cb78a3bba24a09557d601eb21c8dede3f3213753fcfef364eb0e57 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.4": version: 2.1.4 resolution: "@nodelib/fs.scandir@npm:2.1.4" @@ -1953,6 +2346,16 @@ __metadata: languageName: node linkType: hard +"@nodelib/fs.scandir@npm:2.1.5": + version: 2.1.5 + resolution: "@nodelib/fs.scandir@npm:2.1.5" + dependencies: + "@nodelib/fs.stat": 2.0.5 + run-parallel: ^1.1.9 + checksum: a970d595bd23c66c880e0ef1817791432dbb7acbb8d44b7e7d0e7a22f4521260d4a83f7f9fd61d44fda4610105577f8f58a60718105fb38352baed612fd79e59 + languageName: node + linkType: hard + "@nodelib/fs.stat@npm:2.0.4, @nodelib/fs.stat@npm:^2.0.2": version: 2.0.4 resolution: "@nodelib/fs.stat@npm:2.0.4" @@ -1960,6 +2363,13 @@ __metadata: languageName: node linkType: hard +"@nodelib/fs.stat@npm:2.0.5": + version: 2.0.5 + resolution: "@nodelib/fs.stat@npm:2.0.5" + checksum: 012480b5ca9d97bff9261571dbbec7bbc6033f69cc92908bc1ecfad0792361a5a1994bc48674b9ef76419d056a03efadfce5a6cf6dbc0a36559571a7a483f6f0 + languageName: node + linkType: hard + "@nodelib/fs.walk@npm:^1.2.3": version: 1.2.6 resolution: "@nodelib/fs.walk@npm:1.2.6" @@ -1970,6 +2380,16 @@ __metadata: languageName: node linkType: hard +"@nodelib/fs.walk@npm:^1.2.8": + version: 1.2.8 + resolution: "@nodelib/fs.walk@npm:1.2.8" + dependencies: + "@nodelib/fs.scandir": 2.1.5 + fastq: ^1.6.0 + checksum: 190c643f156d8f8f277bf2a6078af1ffde1fd43f498f187c2db24d35b4b4b5785c02c7dc52e356497b9a1b65b13edc996de08de0b961c32844364da02986dc53 + languageName: node + linkType: hard + "@npmcli/move-file@npm:^1.0.1": version: 1.1.2 resolution: "@npmcli/move-file@npm:1.1.2" @@ -1980,17 +2400,17 @@ __metadata: languageName: node linkType: hard -"@polka/url@npm:^1.0.0-next.9": - version: 1.0.0-next.11 - resolution: "@polka/url@npm:1.0.0-next.11" - checksum: db1626fb6d7167ce2de6223c95f0a5ff8e1e7c56b2e8709f904f219d8fcc7b075de842ea8bf0ed7af9f5bc350b166b286b241636982f10d0f02964f34215a0e0 +"@polka/url@npm:^1.0.0-next.20": + version: 1.0.0-next.23 + resolution: "@polka/url@npm:1.0.0-next.23" + checksum: 4b0330de1ceecd1002c7e7449094d0c41f2ed0e21765f4835ccc7b003f2f024ac557d503b9ffdf0918cf50b80d5b8c99dfc5a91927e7b3c468b09c6bb42a3c41 languageName: node linkType: hard -"@popperjs/core@npm:^2.9.3": - version: 2.10.2 - resolution: "@popperjs/core@npm:2.10.2" - checksum: 43c189e3eb6d032433512d94761b54fc7cae15957ca5528008813f887a67b5760b949f30a5141b476be2ba5a6c677c91def150f603d2d3e30b5e97a5ae51474e +"@popperjs/core@npm:^2.11.8": + version: 2.11.8 + resolution: "@popperjs/core@npm:2.11.8" + checksum: e5c69fdebf52a4012f6a1f14817ca8e9599cb1be73dd1387e1785e2ed5e5f0862ff817f420a87c7fc532add1f88a12e25aeb010ffcbdc98eace3d55ce2139cf0 languageName: node linkType: hard @@ -2094,7 +2514,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^0.0.51": +"@types/estree@npm:*": version: 0.0.51 resolution: "@types/estree@npm:0.0.51" checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189 @@ -2142,7 +2562,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^27.5.1": +"@types/jest@npm:^27.5.2": version: 27.5.2 resolution: "@types/jest@npm:27.5.2" dependencies: @@ -2152,7 +2572,7 @@ __metadata: languageName: node linkType: hard -"@types/jsdom@npm:^16.2.14, @types/jsdom@npm:^16.2.4": +"@types/jsdom@npm:^16.2.15, @types/jsdom@npm:^16.2.4": version: 16.2.15 resolution: "@types/jsdom@npm:16.2.15" dependencies: @@ -2184,7 +2604,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^17.0.35": +"@types/node@npm:^17.0.45": version: 17.0.45 resolution: "@types/node@npm:17.0.45" checksum: aa04366b9103b7d6cfd6b2ef64182e0eaa7d4462c3f817618486ea0422984c51fc69fd0d436eae6c9e696ddfdbec9ccaa27a917f7c2e8c75c5d57827fe3d95e8 @@ -2219,21 +2639,21 @@ __metadata: languageName: node linkType: hard -"@types/webpack-env@npm:^1.17.0": - version: 1.18.0 - resolution: "@types/webpack-env@npm:1.18.0" - checksum: ecf4daa31cb37d474ac0ce058d83a3cadeb9881ca8107ae93c2299eaa9954943aae09b43e143c62ccbe4288a14db00c918c9debd707afe17c3998f873eaabc59 +"@types/webpack-env@npm:^1.18.4": + version: 1.18.4 + resolution: "@types/webpack-env@npm:1.18.4" + checksum: f195b3ae974ac3b631477b57737dad7b6c44ecca86770cf3c29f284e02961c9f2dfc619e3e253d8c23966864cb052b1e8437e9834ede32ac97972e6e2235bb51 languageName: node linkType: hard -"@types/webpack@npm:^5.28.0": - version: 5.28.0 - resolution: "@types/webpack@npm:5.28.0" +"@types/webpack@npm:^5.28.5": + version: 5.28.5 + resolution: "@types/webpack@npm:5.28.5" dependencies: "@types/node": "*" tapable: ^2.2.0 webpack: ^5 - checksum: a038d7e12dd109c6a8d2eb744fd32070ef94f1655e730fb1443b370db98864c3a0e408638b02d12ba08269b9c012b3be8b801117ced2d1102e7676203fd663ed + checksum: 14359d9ccecef7ef1ea271c00baec5337213c7fda63a34c61b9e519505b3928d0807cdbb5b1172d1994e1179920b89c57eaf2cbf64599958b67cd70720ac2a9b languageName: node linkType: hard @@ -2262,46 +2682,46 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.25.0": - version: 5.36.1 - resolution: "@typescript-eslint/parser@npm:5.36.1" +"@typescript-eslint/parser@npm:^5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/parser@npm:5.62.0" dependencies: - "@typescript-eslint/scope-manager": 5.36.1 - "@typescript-eslint/types": 5.36.1 - "@typescript-eslint/typescript-estree": 5.36.1 + "@typescript-eslint/scope-manager": 5.62.0 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/typescript-estree": 5.62.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 0f0f94e56ae1d55b6e7223ce5a2b0c93e5cc082ef2951a2b24ae4b22bb8ffbeb90d2d16682bfa8bc972ba2c7fb4703aedd79b7dbd09bcee397e1ab90d11506d9 + checksum: d168f4c7f21a7a63f47002e2d319bcbb6173597af5c60c1cf2de046b46c76b4930a093619e69faf2d30214c29ab27b54dcf1efc7046a6a6bd6f37f59a990e752 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/scope-manager@npm:5.36.1" +"@typescript-eslint/scope-manager@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/scope-manager@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.36.1 - "@typescript-eslint/visitor-keys": 5.36.1 - checksum: c46497226af75baed7458838ec0bfbddf19f8084115d78b915b46a8ceb4c05619ac61da127dfd3c8ee11bc916896d57bf8b9f936b0306ce69658160f910e3ad0 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/visitor-keys": 5.62.0 + checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/types@npm:5.36.1" - checksum: 10c8965c64e16bc6920dc0c62aae2b139062aca945d03df2ad6fe7c299d2faa684621d571f8d9807a67643d4e9fa5217c69d5f538f9936fc757f9df5ded57623 +"@typescript-eslint/types@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/types@npm:5.62.0" + checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.36.1" +"@typescript-eslint/typescript-estree@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.36.1 - "@typescript-eslint/visitor-keys": 5.36.1 + "@typescript-eslint/types": 5.62.0 + "@typescript-eslint/visitor-keys": 5.62.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -2310,27 +2730,24 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: acaf2938001673918dbbe690a353cf92e2cfabc79f74cd5946e303a8c24eb9c08ae2053dd261810ed0c9c471ebe879f386564c1b01dd2504dc84f4ce5f4dc696 + checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.36.1" +"@typescript-eslint/visitor-keys@npm:5.62.0": + version: 5.62.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" dependencies: - "@typescript-eslint/types": 5.36.1 + "@typescript-eslint/types": 5.62.0 eslint-visitor-keys: ^3.3.0 - checksum: 45ab7c2fd455a8e4beff418bed6c9e7e1f9f66bcaad3bfaed868f97a3f8cfec1fa4faa45948af1a1c32ce573a7b1c6d10427119c257622445b06b488fefd8b49 + checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35 languageName: node linkType: hard -"@webassemblyjs/ast@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/ast@npm:1.11.1" - dependencies: - "@webassemblyjs/helper-numbers": 1.11.1 - "@webassemblyjs/helper-wasm-bytecode": 1.11.1 - checksum: 1eee1534adebeece635362f8e834ae03e389281972611408d64be7895fc49f48f98fddbbb5339bf8a72cb101bcb066e8bca3ca1bf1ef47dadf89def0395a8d87 +"@ungap/structured-clone@npm:^1.2.0": + version: 1.2.0 + resolution: "@ungap/structured-clone@npm:1.2.0" + checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524 languageName: node linkType: hard @@ -2344,13 +2761,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/floating-point-hex-parser@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.1" - checksum: b8efc6fa08e4787b7f8e682182d84dfdf8da9d9c77cae5d293818bc4a55c1f419a87fa265ab85252b3e6c1fd323d799efea68d825d341a7c365c64bc14750e97 - languageName: node - linkType: hard - "@webassemblyjs/floating-point-hex-parser@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6" @@ -2358,13 +2768,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/helper-api-error@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/helper-api-error@npm:1.11.1" - checksum: 0792813f0ed4a0e5ee0750e8b5d0c631f08e927f4bdfdd9fe9105dc410c786850b8c61bff7f9f515fdfb149903bec3c976a1310573a4c6866a94d49bc7271959 - languageName: node - linkType: hard - "@webassemblyjs/helper-api-error@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/helper-api-error@npm:1.11.6" @@ -2372,13 +2775,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/helper-buffer@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/helper-buffer@npm:1.11.1" - checksum: a337ee44b45590c3a30db5a8b7b68a717526cf967ada9f10253995294dbd70a58b2da2165222e0b9830cd4fc6e4c833bf441a721128d1fe2e9a7ab26b36003ce - languageName: node - linkType: hard - "@webassemblyjs/helper-buffer@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/helper-buffer@npm:1.11.6" @@ -2386,17 +2782,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/helper-numbers@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/helper-numbers@npm:1.11.1" - dependencies: - "@webassemblyjs/floating-point-hex-parser": 1.11.1 - "@webassemblyjs/helper-api-error": 1.11.1 - "@xtuc/long": 4.2.2 - checksum: 44d2905dac2f14d1e9b5765cf1063a0fa3d57295c6d8930f6c59a36462afecc6e763e8a110b97b342a0f13376166c5d41aa928e6ced92e2f06b071fd0db59d3a - languageName: node - linkType: hard - "@webassemblyjs/helper-numbers@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/helper-numbers@npm:1.11.6" @@ -2408,13 +2793,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/helper-wasm-bytecode@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1" - checksum: eac400113127832c88f5826bcc3ad1c0db9b3dbd4c51a723cfdb16af6bfcbceb608170fdaac0ab7731a7e18b291be7af68a47fcdb41cfe0260c10857e7413d97 - languageName: node - linkType: hard - "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6" @@ -2422,18 +2800,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/helper-wasm-section@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.1" - dependencies: - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/helper-buffer": 1.11.1 - "@webassemblyjs/helper-wasm-bytecode": 1.11.1 - "@webassemblyjs/wasm-gen": 1.11.1 - checksum: 617696cfe8ecaf0532763162aaf748eb69096fb27950219bb87686c6b2e66e11cd0614d95d319d0ab1904bc14ebe4e29068b12c3e7c5e020281379741fe4bedf - languageName: node - linkType: hard - "@webassemblyjs/helper-wasm-section@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6" @@ -2446,30 +2812,12 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/ieee754@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/ieee754@npm:1.11.1" - dependencies: - "@xtuc/ieee754": ^1.2.0 - checksum: 23a0ac02a50f244471631802798a816524df17e56b1ef929f0c73e3cde70eaf105a24130105c60aff9d64a24ce3b640dad443d6f86e5967f922943a7115022ec - languageName: node - linkType: hard - "@webassemblyjs/ieee754@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/ieee754@npm:1.11.6" dependencies: - "@xtuc/ieee754": ^1.2.0 - checksum: 13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de - languageName: node - linkType: hard - -"@webassemblyjs/leb128@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/leb128@npm:1.11.1" - dependencies: - "@xtuc/long": 4.2.2 - checksum: 33ccc4ade2f24de07bf31690844d0b1ad224304ee2062b0e464a610b0209c79e0b3009ac190efe0e6bd568b0d1578d7c3047fc1f9d0197c92fc061f56224ff4a + "@xtuc/ieee754": ^1.2.0 + checksum: 13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de languageName: node linkType: hard @@ -2482,13 +2830,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/utf8@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/utf8@npm:1.11.1" - checksum: 972c5cfc769d7af79313a6bfb96517253a270a4bf0c33ba486aa43cac43917184fb35e51dfc9e6b5601548cd5931479a42e42c89a13bb591ffabebf30c8a6a0b - languageName: node - linkType: hard - "@webassemblyjs/utf8@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/utf8@npm:1.11.6" @@ -2496,22 +2837,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/wasm-edit@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/wasm-edit@npm:1.11.1" - dependencies: - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/helper-buffer": 1.11.1 - "@webassemblyjs/helper-wasm-bytecode": 1.11.1 - "@webassemblyjs/helper-wasm-section": 1.11.1 - "@webassemblyjs/wasm-gen": 1.11.1 - "@webassemblyjs/wasm-opt": 1.11.1 - "@webassemblyjs/wasm-parser": 1.11.1 - "@webassemblyjs/wast-printer": 1.11.1 - checksum: 6d7d9efaec1227e7ef7585a5d7ff0be5f329f7c1c6b6c0e906b18ed2e9a28792a5635e450aca2d136770d0207225f204eff70a4b8fd879d3ac79e1dcc26dbeb9 - languageName: node - linkType: hard - "@webassemblyjs/wasm-edit@npm:^1.11.5": version: 1.11.6 resolution: "@webassemblyjs/wasm-edit@npm:1.11.6" @@ -2528,19 +2853,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/wasm-gen@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/wasm-gen@npm:1.11.1" - dependencies: - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/helper-wasm-bytecode": 1.11.1 - "@webassemblyjs/ieee754": 1.11.1 - "@webassemblyjs/leb128": 1.11.1 - "@webassemblyjs/utf8": 1.11.1 - checksum: 1f6921e640293bf99fb16b21e09acb59b340a79f986c8f979853a0ae9f0b58557534b81e02ea2b4ef11e929d946708533fd0693c7f3712924128fdafd6465f5b - languageName: node - linkType: hard - "@webassemblyjs/wasm-gen@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/wasm-gen@npm:1.11.6" @@ -2554,18 +2866,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/wasm-opt@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/wasm-opt@npm:1.11.1" - dependencies: - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/helper-buffer": 1.11.1 - "@webassemblyjs/wasm-gen": 1.11.1 - "@webassemblyjs/wasm-parser": 1.11.1 - checksum: 21586883a20009e2b20feb67bdc451bbc6942252e038aae4c3a08e6f67b6bae0f5f88f20bfc7bd0452db5000bacaf5ab42b98cf9aa034a6c70e9fc616142e1db - languageName: node - linkType: hard - "@webassemblyjs/wasm-opt@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/wasm-opt@npm:1.11.6" @@ -2578,20 +2878,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/wasm-parser@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/wasm-parser@npm:1.11.1" - dependencies: - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/helper-api-error": 1.11.1 - "@webassemblyjs/helper-wasm-bytecode": 1.11.1 - "@webassemblyjs/ieee754": 1.11.1 - "@webassemblyjs/leb128": 1.11.1 - "@webassemblyjs/utf8": 1.11.1 - checksum: 1521644065c360e7b27fad9f4bb2df1802d134dd62937fa1f601a1975cde56bc31a57b6e26408b9ee0228626ff3ba1131ae6f74ffb7d718415b6528c5a6dbfc2 - languageName: node - linkType: hard - "@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5": version: 1.11.6 resolution: "@webassemblyjs/wasm-parser@npm:1.11.6" @@ -2606,16 +2892,6 @@ __metadata: languageName: node linkType: hard -"@webassemblyjs/wast-printer@npm:1.11.1": - version: 1.11.1 - resolution: "@webassemblyjs/wast-printer@npm:1.11.1" - dependencies: - "@webassemblyjs/ast": 1.11.1 - "@xtuc/long": 4.2.2 - checksum: f15ae4c2441b979a3b4fce78f3d83472fb22350c6dc3fd34bfe7c3da108e0b2360718734d961bba20e7716cb8578e964b870da55b035e209e50ec9db0378a3f7 - languageName: node - linkType: hard - "@webassemblyjs/wast-printer@npm:1.11.6": version: 1.11.6 resolution: "@webassemblyjs/wast-printer@npm:1.11.6" @@ -2711,15 +2987,6 @@ __metadata: languageName: node linkType: hard -"acorn-import-assertions@npm:^1.7.6": - version: 1.7.6 - resolution: "acorn-import-assertions@npm:1.7.6" - peerDependencies: - acorn: ^8 - checksum: bc8a1585abd70ebfb3a6b3112f5e3974fee3ac598230f916a3857f0ad4fa7e72197be532c49d1feeb83678ef264f34bee9bf1934dfb2f276d88468134a51fa9f - languageName: node - linkType: hard - "acorn-import-assertions@npm:^1.9.0": version: 1.9.0 resolution: "acorn-import-assertions@npm:1.9.0" @@ -2761,7 +3028,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0": +"acorn@npm:^8.0.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1": version: 8.8.2 resolution: "acorn@npm:8.8.2" bin: @@ -2779,6 +3046,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.9.0": + version: 8.11.2 + resolution: "acorn@npm:8.11.2" + bin: + acorn: bin/acorn + checksum: 818450408684da89423e3daae24e4dc9b68692db8ab49ea4569c7c5abb7a3f23669438bf129cc81dfdada95e1c9b944ee1bfca2c57a05a4dc73834a612fbf6a7 + languageName: node + linkType: hard + "agent-base@npm:6, agent-base@npm:^6.0.2": version: 6.0.2 resolution: "agent-base@npm:6.0.2" @@ -2843,7 +3119,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.10.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5": +"ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -2972,6 +3248,16 @@ __metadata: languageName: node linkType: hard +"array-buffer-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "array-buffer-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + is-array-buffer: ^3.0.1 + checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3 + languageName: node + linkType: hard + "array-includes@npm:^3.1.2": version: 3.1.3 resolution: "array-includes@npm:3.1.3" @@ -2985,16 +3271,16 @@ __metadata: languageName: node linkType: hard -"array-includes@npm:^3.1.5": - version: 3.1.5 - resolution: "array-includes@npm:3.1.5" +"array-includes@npm:^3.1.6": + version: 3.1.7 + resolution: "array-includes@npm:3.1.7" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.19.5 - get-intrinsic: ^1.1.1 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 is-string: ^1.0.7 - checksum: f6f24d834179604656b7bec3e047251d5cc87e9e87fab7c175c61af48e80e75acd296017abcde21fb52292ab6a2a449ab2ee37213ee48c8709f004d75983f9c5 + checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc languageName: node linkType: hard @@ -3005,15 +3291,43 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.0": - version: 1.3.0 - resolution: "array.prototype.flatmap@npm:1.3.0" +"array.prototype.flatmap@npm:^1.3.1": + version: 1.3.2 + resolution: "array.prototype.flatmap@npm:1.3.2" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + es-shim-unscopables: ^1.0.0 + checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3 + languageName: node + linkType: hard + +"array.prototype.tosorted@npm:^1.1.1": + version: 1.1.2 + resolution: "array.prototype.tosorted@npm:1.1.2" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 es-shim-unscopables: ^1.0.0 - checksum: 818538f39409c4045d874be85df0dbd195e1446b14d22f95bdcfefea44ae77db44e42dcd89a559254ec5a7c8b338cfc986cc6d641e3472f9a5326b21eb2976a2 + get-intrinsic: ^1.2.1 + checksum: 3607a7d6b117f0ffa6f4012457b7af0d47d38cf05e01d50e09682fd2fb782a66093a5e5fbbdbad77c8c824794a9d892a51844041641f719ad41e3a974f0764de + languageName: node + linkType: hard + +"arraybuffer.prototype.slice@npm:^1.0.2": + version: 1.0.2 + resolution: "arraybuffer.prototype.slice@npm:1.0.2" + dependencies: + array-buffer-byte-length: ^1.0.0 + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 + is-array-buffer: ^3.0.2 + is-shared-array-buffer: ^1.0.2 + checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3 languageName: node linkType: hard @@ -3033,6 +3347,15 @@ __metadata: languageName: node linkType: hard +"asynciterator.prototype@npm:^1.0.0": + version: 1.0.0 + resolution: "asynciterator.prototype@npm:1.0.0" + dependencies: + has-symbols: ^1.0.3 + checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3 + languageName: node + linkType: hard + "asynckit@npm:^0.4.0": version: 0.4.0 resolution: "asynckit@npm:0.4.0" @@ -3040,6 +3363,13 @@ __metadata: languageName: node linkType: hard +"available-typed-arrays@npm:^1.0.5": + version: 1.0.5 + resolution: "available-typed-arrays@npm:1.0.5" + checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a + languageName: node + linkType: hard + "aws-sign2@npm:~0.7.0": version: 0.7.0 resolution: "aws-sign2@npm:0.7.0" @@ -3054,16 +3384,18 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.1": - version: 0.21.1 - resolution: "axios@npm:0.21.1" +"axios@npm:^1.6.2": + version: 1.6.2 + resolution: "axios@npm:1.6.2" dependencies: - follow-redirects: ^1.10.0 - checksum: c87915fa0b18c15c63350112b6b3563a3e2ae524d7707de0a73d2e065e0d30c5d3da8563037bc29d4cc1b7424b5a350cb7274fa52525c6c04a615fe561c6ab11 + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8 languageName: node linkType: hard -"babel-jest@npm:^28.1.0, babel-jest@npm:^28.1.3": +"babel-jest@npm:^28.1.3": version: 28.1.3 resolution: "babel-jest@npm:28.1.3" dependencies: @@ -3080,9 +3412,9 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:^8.2.5": - version: 8.2.5 - resolution: "babel-loader@npm:8.2.5" +"babel-loader@npm:^8.3.0": + version: 8.3.0 + resolution: "babel-loader@npm:8.3.0" dependencies: find-cache-dir: ^3.3.1 loader-utils: ^2.0.0 @@ -3091,26 +3423,17 @@ __metadata: peerDependencies: "@babel/core": ^7.0.0 webpack: ">=2" - checksum: a6605557885eabbc3250412405f2c63ca87287a95a439c643fdb47d5ea3d5326f72e43ab97be070316998cb685d5dfbc70927ce1abe8be7a6a4f5919287773fb - languageName: node - linkType: hard - -"babel-plugin-dynamic-import-node@npm:^2.3.3": - version: 2.3.3 - resolution: "babel-plugin-dynamic-import-node@npm:2.3.3" - dependencies: - object.assign: ^4.1.0 - checksum: c9d24415bcc608d0db7d4c8540d8002ac2f94e2573d2eadced137a29d9eab7e25d2cbb4bc6b9db65cf6ee7430f7dd011d19c911a9a778f0533b4a05ce8292c9b + checksum: d48bcf9e030e598656ad3ff5fb85967db2eaaf38af5b4a4b99d25618a2057f9f100e6b231af2a46c1913206db506115ca7a8cbdf52c9c73d767070dae4352ab5 languageName: node linkType: hard -"babel-plugin-inferno@npm:^6.4.0": - version: 6.5.0 - resolution: "babel-plugin-inferno@npm:6.5.0" +"babel-plugin-inferno@npm:^6.7.0": + version: 6.7.0 + resolution: "babel-plugin-inferno@npm:6.7.0" dependencies: "@babel/plugin-syntax-jsx": ^7 "@babel/types": ^7 - checksum: abe6d16632f997d9c9e4c4a4f0a502b4fc04e76c4dab5fc53eb1db6f50baf0ddf429e9a50d22c2a334da6c7a88648b3f305da83aa4b0d5b1c27394314cb8d878 + checksum: 37b04f04ca326a41e5717a0dbc419d264b05fed57daff8300bd6988608517946f419014b96e546595dbd093e16db136844d7dc95897db0a8b7e2b870d020a00c languageName: node linkType: hard @@ -3139,39 +3462,39 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs2@npm:^0.3.2": - version: 0.3.2 - resolution: "babel-plugin-polyfill-corejs2@npm:0.3.2" +"babel-plugin-polyfill-corejs2@npm:^0.4.6": + version: 0.4.6 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6" dependencies: - "@babel/compat-data": ^7.17.7 - "@babel/helper-define-polyfill-provider": ^0.3.2 - semver: ^6.1.1 + "@babel/compat-data": ^7.22.6 + "@babel/helper-define-polyfill-provider": ^0.4.3 + semver: ^6.3.1 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: a76e7bb1a5cc0a4507baa523c23f9efd75764069a25845beba92290386e5e48ed85b894005ece3b527e13c3d2d9c6589cc0a23befb72ea6fc7aa8711f231bb4d + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 08896811df31530be6a9bcdd630cb9fd4b5ae5181039d18db3796efbc54e38d57a42af460845c10a04434e1bc45c0d47743c7e6c860383cc6b141083cde22030 languageName: node linkType: hard -"babel-plugin-polyfill-corejs3@npm:^0.5.3": - version: 0.5.3 - resolution: "babel-plugin-polyfill-corejs3@npm:0.5.3" +"babel-plugin-polyfill-corejs3@npm:^0.8.5": + version: 0.8.6 + resolution: "babel-plugin-polyfill-corejs3@npm:0.8.6" dependencies: - "@babel/helper-define-polyfill-provider": ^0.3.2 - core-js-compat: ^3.21.0 + "@babel/helper-define-polyfill-provider": ^0.4.3 + core-js-compat: ^3.33.1 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 9c6644a1b0afbe59e402827fdafc6f44994ff92c5b2f258659cbbfd228f7075dea49e95114af10e66d70f36cbde12ff1d81263eb67be749b3ef0e2c18cf3c16d + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 36951c2edac42ac0f05b200502e90d77bf66ccee5b52e2937d23496c6ef2372cce31b8c64144da374b77bd3eb65e2721703a52eac56cad16a152326c092cbf77 languageName: node linkType: hard -"babel-plugin-polyfill-regenerator@npm:^0.4.0": - version: 0.4.0 - resolution: "babel-plugin-polyfill-regenerator@npm:0.4.0" +"babel-plugin-polyfill-regenerator@npm:^0.5.3": + version: 0.5.3 + resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3" dependencies: - "@babel/helper-define-polyfill-provider": ^0.3.2 + "@babel/helper-define-polyfill-provider": ^0.4.3 peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 699aa9c0dc5a2259d7fa52b26613fa1e782439eee54cd98506991f87fddf0c00eec6c5b1917edf586c170731d9e318903bc41210225a691e7bb8087652bbda94 + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 2bb546582cda1870d19e646a7183baeb2cccd56e0ef3e4eaeabd28e120daf17cb87399194a9ccdcf32506bcaa68d23e73440fc8ab990a7a0f8c5a77c12d5d4bc languageName: node linkType: hard @@ -3296,7 +3619,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.20.2, browserslist@npm:^4.21.3": +"browserslist@npm:^4.20.2": version: 4.21.3 resolution: "browserslist@npm:4.21.3" dependencies: @@ -3310,6 +3633,20 @@ __metadata: languageName: node linkType: hard +"browserslist@npm:^4.21.9, browserslist@npm:^4.22.1": + version: 4.22.1 + resolution: "browserslist@npm:4.22.1" + dependencies: + caniuse-lite: ^1.0.30001541 + electron-to-chromium: ^1.4.535 + node-releases: ^2.0.13 + update-browserslist-db: ^1.0.13 + bin: + browserslist: cli.js + checksum: 7e6b10c53f7dd5d83fd2b95b00518889096382539fed6403829d447e05df4744088de46a571071afb447046abc3c66ad06fbc790e70234ec2517452e32ffd862 + languageName: node + linkType: hard + "bser@npm:2.1.1": version: 2.1.1 resolution: "bser@npm:2.1.1" @@ -3370,6 +3707,17 @@ __metadata: languageName: node linkType: hard +"call-bind@npm:^1.0.4, call-bind@npm:^1.0.5": + version: 1.0.5 + resolution: "call-bind@npm:1.0.5" + dependencies: + function-bind: ^1.1.2 + get-intrinsic: ^1.2.1 + set-function-length: ^1.1.1 + checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5 + languageName: node + linkType: hard + "callsites@npm:^3.0.0": version: 3.1.0 resolution: "callsites@npm:3.1.0" @@ -3408,6 +3756,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001541": + version: 1.0.30001564 + resolution: "caniuse-lite@npm:1.0.30001564" + checksum: 5b53749a2e9057e74c5a129fc214fa4434d3f0c3faadbec176efa03b44e40f9c1ef8ceec979f0dd186f7a142476713129df9263e012a178351ba7807217f157a + languageName: node + linkType: hard + "capital-case@npm:^1.0.4": version: 1.0.4 resolution: "capital-case@npm:1.0.4" @@ -3426,7 +3781,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^2.0.0": +"chalk@npm:^2.0.0, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -3437,7 +3792,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^4.0.0, chalk@npm:^4.1.0": +"chalk@npm:^4.0.0": version: 4.1.0 resolution: "chalk@npm:4.1.0" dependencies: @@ -3710,20 +4065,26 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.21.0, core-js-compat@npm:^3.22.1": - version: 3.25.0 - resolution: "core-js-compat@npm:3.25.0" +"convert-source-map@npm:^2.0.0": + version: 2.0.0 + resolution: "convert-source-map@npm:2.0.0" + checksum: 63ae9933be5a2b8d4509daca5124e20c14d023c820258e484e32dc324d34c2754e71297c94a05784064ad27615037ef677e3f0c00469fb55f409d2bb21261035 + languageName: node + linkType: hard + +"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1": + version: 3.33.3 + resolution: "core-js-compat@npm:3.33.3" dependencies: - browserslist: ^4.21.3 - semver: 7.0.0 - checksum: a40e072a67e65f34cb4b3a85bfdbbfcb0f3e1e2e171718763b13da4da897b5b6228603468027a0920096f0ee7e2c3906de95e26c9b6fe8f9595552bf2bc8f852 + browserslist: ^4.22.1 + checksum: cb121e83f0f5f18b2b75428cdfb19524936a18459f1e0358f9124c8ff8b75d6a5901495cb996560cfde3a416103973f78eb5947777bb8b2fd877cdf84471465d languageName: node linkType: hard -"core-js@npm:^3.16.1": - version: 3.19.0 - resolution: "core-js@npm:3.19.0" - checksum: 9f03e72f01d9eeafb2724ee5787ab8d6e7dcf0e3b44c4dec23e6a0cfc9e2e0a76460b77ce7d1d0be09db918618b11595fad6838978ff97f2684270738898c5a2 +"core-js@npm:^3.33.3": + version: 3.33.3 + resolution: "core-js@npm:3.33.3" + checksum: 070b9c696f5a9b22bab0208daf9fcdffbc3b4f4c89ed2be512b7d99d4be363accfbb26fa6eec7261055d89e8ea0a5bcfccad5923fe43f1f2eafca9f568cc5596 languageName: node linkType: hard @@ -3745,21 +4106,21 @@ __metadata: languageName: node linkType: hard -"css-loader@npm:^6.7.1": - version: 6.7.1 - resolution: "css-loader@npm:6.7.1" +"css-loader@npm:^6.8.1": + version: 6.8.1 + resolution: "css-loader@npm:6.8.1" dependencies: icss-utils: ^5.1.0 - postcss: ^8.4.7 + postcss: ^8.4.21 postcss-modules-extract-imports: ^3.0.0 - postcss-modules-local-by-default: ^4.0.0 + postcss-modules-local-by-default: ^4.0.3 postcss-modules-scope: ^3.0.0 postcss-modules-values: ^4.0.0 postcss-value-parser: ^4.2.0 - semver: ^7.3.5 + semver: ^7.3.8 peerDependencies: webpack: ^5.0.0 - checksum: 170fdbc630a05a43679ef60fa97694766b568dbde37adccc0faafa964fc675f08b976bc68837bb73b61d60240e8d2cbcbf51540fe94ebc9dafc56e7c46ba5527 + checksum: 7c1784247bdbe76dc5c55fb1ac84f1d4177a74c47259942c9cfdb7a8e6baef11967a0bc85ac285f26bd26d5059decb848af8154a03fdb4f4894f41212f45eef3 languageName: node linkType: hard @@ -3795,6 +4156,22 @@ __metadata: languageName: node linkType: hard +"cssstyle@npm:^3.0.0": + version: 3.0.0 + resolution: "cssstyle@npm:3.0.0" + dependencies: + rrweb-cssom: ^0.6.0 + checksum: 31f694dfed9998ed93570fe539610837b878193dd8487c33cb12db8004333c53c2a3904166288bbec68388c72fb01014d46d3243ddfb02fe845989d852c06f27 + languageName: node + linkType: hard + +"csstype@npm:^3.1.2": + version: 3.1.2 + resolution: "csstype@npm:3.1.2" + checksum: e1a52e6c25c1314d6beef5168da704ab29c5186b877c07d822bd0806717d9a265e8493a2e35ca7e68d0f5d472d43fac1cdce70fd79fd0853dff81f3028d857b5 + languageName: node + linkType: hard + "cubic2quad@npm:^1.2.1": version: 1.2.1 resolution: "cubic2quad@npm:1.2.1" @@ -3832,13 +4209,31 @@ __metadata: languageName: node linkType: hard -"dateformat@npm:^4.5.1": +"data-urls@npm:^4.0.0": + version: 4.0.0 + resolution: "data-urls@npm:4.0.0" + dependencies: + abab: ^2.0.6 + whatwg-mimetype: ^3.0.0 + whatwg-url: ^12.0.0 + checksum: 006e869b5bf079647949a3e9b1dd69d84b2d5d26e6b01c265485699bc96e83817d4b5aae758b2910a4c58c0601913f3a0034121c1ca2da268e9a244c57515b15 + languageName: node + linkType: hard + +"dateformat@npm:^4.6.3": version: 4.6.3 resolution: "dateformat@npm:4.6.3" checksum: c3aa0617c0a5b30595122bc8d1bee6276a9221e4d392087b41cbbdf175d9662ae0e50d0d6dcdf45caeac5153c4b5b0844265f8cd2b2245451e3da19e39e3b65d languageName: node linkType: hard +"debounce@npm:^1.2.1": + version: 1.2.1 + resolution: "debounce@npm:1.2.1" + checksum: 682a89506d9e54fb109526f4da255c5546102fbb8e3ae75eef3b04effaf5d4853756aee97475cd4650641869794e44f410eeb20ace2b18ea592287ab2038519e + languageName: node + linkType: hard + "debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1": version: 4.3.2 resolution: "debug@npm:4.3.2" @@ -3870,6 +4265,13 @@ __metadata: languageName: node linkType: hard +"decimal.js@npm:^10.4.3": + version: 10.4.3 + resolution: "decimal.js@npm:10.4.3" + checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae + languageName: node + linkType: hard + "dedent@npm:^0.7.0": version: 0.7.0 resolution: "dedent@npm:0.7.0" @@ -3891,6 +4293,17 @@ __metadata: languageName: node linkType: hard +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1": + version: 1.1.1 + resolution: "define-data-property@npm:1.1.1" + dependencies: + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d + languageName: node + linkType: hard + "define-properties@npm:^1.1.3": version: 1.1.3 resolution: "define-properties@npm:1.1.3" @@ -3910,6 +4323,17 @@ __metadata: languageName: node linkType: hard +"define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": + version: 1.2.1 + resolution: "define-properties@npm:1.2.1" + dependencies: + define-data-property: ^1.0.1 + has-property-descriptors: ^1.0.0 + object-keys: ^1.1.1 + checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12 + languageName: node + linkType: hard + "delayed-stream@npm:~1.0.0": version: 1.0.0 resolution: "delayed-stream@npm:1.0.0" @@ -3988,10 +4412,10 @@ __metadata: languageName: node linkType: hard -"dompurify@npm:^2.3.1": - version: 2.3.3 - resolution: "dompurify@npm:2.3.3" - checksum: 947e3661681bd183aae1cd08f991b14c6aa41fd188f6c801c5e916c2dc4575bbefbaa121ed06dbe0cb0f595545527d588a44b53bfc35d1cbb898c214dc0d7930 +"dompurify@npm:^2.4.7": + version: 2.4.7 + resolution: "dompurify@npm:2.4.7" + checksum: 13c047e772a1998348191554dda403950d45ef2ec75fa0b9915cc179ccea0a39ef780d283109bd72cf83a2a085af6c77664281d4d0106a737bc5f39906364efe languageName: node linkType: hard @@ -4036,6 +4460,13 @@ __metadata: languageName: node linkType: hard +"electron-to-chromium@npm:^1.4.535": + version: 1.4.593 + resolution: "electron-to-chromium@npm:1.4.593" + checksum: 8b53c78a77501338635576bccda6852c74d388b6f547f3c0c63c19abdc8cfc0b3dae3b8a4ab438a37c0c53972ba673a5578438f880a8ed45a345e81eae016a1e + languageName: node + linkType: hard + "emittery@npm:^0.10.2": version: 0.10.2 resolution: "emittery@npm:0.10.2" @@ -4066,16 +4497,6 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.10.0": - version: 5.12.0 - resolution: "enhanced-resolve@npm:5.12.0" - dependencies: - graceful-fs: ^4.2.4 - tapable: ^2.2.0 - checksum: bf3f787facaf4ce3439bef59d148646344e372bef5557f0d37ea8aa02c51f50a925cd1f07b8d338f18992c29f544ec235a8c64bcdb56030196c48832a5494174 - languageName: node - linkType: hard - "enhanced-resolve@npm:^5.15.0": version: 5.15.0 resolution: "enhanced-resolve@npm:5.15.0" @@ -4086,6 +4507,13 @@ __metadata: languageName: node linkType: hard +"entities@npm:^4.4.0": + version: 4.5.0 + resolution: "entities@npm:4.5.0" + checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7 + languageName: node + linkType: hard + "env-paths@npm:^2.2.0": version: 2.2.0 resolution: "env-paths@npm:2.2.0" @@ -4143,7 +4571,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.5": +"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.5": version: 1.20.1 resolution: "es-abstract@npm:1.20.1" dependencies: @@ -4174,10 +4602,72 @@ __metadata: languageName: node linkType: hard -"es-module-lexer@npm:^0.9.0": - version: 0.9.3 - resolution: "es-module-lexer@npm:0.9.3" - checksum: 84bbab23c396281db2c906c766af58b1ae2a1a2599844a504df10b9e8dc77ec800b3211fdaa133ff700f5703d791198807bba25d9667392d27a5e9feda344da8 +"es-abstract@npm:^1.22.1": + version: 1.22.3 + resolution: "es-abstract@npm:1.22.3" + dependencies: + array-buffer-byte-length: ^1.0.0 + arraybuffer.prototype.slice: ^1.0.2 + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.5 + es-set-tostringtag: ^2.0.1 + es-to-primitive: ^1.2.1 + function.prototype.name: ^1.1.6 + get-intrinsic: ^1.2.2 + get-symbol-description: ^1.0.0 + globalthis: ^1.0.3 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + hasown: ^2.0.0 + internal-slot: ^1.0.5 + is-array-buffer: ^3.0.2 + is-callable: ^1.2.7 + is-negative-zero: ^2.0.2 + is-regex: ^1.1.4 + is-shared-array-buffer: ^1.0.2 + is-string: ^1.0.7 + is-typed-array: ^1.1.12 + is-weakref: ^1.0.2 + object-inspect: ^1.13.1 + object-keys: ^1.1.1 + object.assign: ^4.1.4 + regexp.prototype.flags: ^1.5.1 + safe-array-concat: ^1.0.1 + safe-regex-test: ^1.0.0 + string.prototype.trim: ^1.2.8 + string.prototype.trimend: ^1.0.7 + string.prototype.trimstart: ^1.0.7 + typed-array-buffer: ^1.0.0 + typed-array-byte-length: ^1.0.0 + typed-array-byte-offset: ^1.0.0 + typed-array-length: ^1.0.4 + unbox-primitive: ^1.0.2 + which-typed-array: ^1.1.13 + checksum: b1bdc962856836f6e72be10b58dc128282bdf33771c7a38ae90419d920fc3b36cc5d2b70a222ad8016e3fc322c367bf4e9e89fc2bc79b7e933c05b218e83d79a + languageName: node + linkType: hard + +"es-iterator-helpers@npm:^1.0.12": + version: 1.0.15 + resolution: "es-iterator-helpers@npm:1.0.15" + dependencies: + asynciterator.prototype: ^1.0.0 + call-bind: ^1.0.2 + define-properties: ^1.2.1 + es-abstract: ^1.22.1 + es-set-tostringtag: ^2.0.1 + function-bind: ^1.1.1 + get-intrinsic: ^1.2.1 + globalthis: ^1.0.3 + has-property-descriptors: ^1.0.0 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + internal-slot: ^1.0.5 + iterator.prototype: ^1.1.2 + safe-array-concat: ^1.0.1 + checksum: 50081ae5c549efe62e5c1d244df0194b40b075f7897fc2116b7e1aa437eb3c41f946d2afda18c33f9b31266ec544765932542765af839f76fa6d7b7855d1e0e1 languageName: node linkType: hard @@ -4188,6 +4678,17 @@ __metadata: languageName: node linkType: hard +"es-set-tostringtag@npm:^2.0.1": + version: 2.0.2 + resolution: "es-set-tostringtag@npm:2.0.2" + dependencies: + get-intrinsic: ^1.2.2 + has-tostringtag: ^1.0.0 + hasown: ^2.0.0 + checksum: afcec3a4c9890ae14d7ec606204858441c801ff84f312538e1d1ccf1e5493c8b17bd672235df785f803756472cb4f2d49b87bde5237aef33411e74c22f194e07 + languageName: node + linkType: hard + "es-shim-unscopables@npm:^1.0.0": version: 1.0.0 resolution: "es-shim-unscopables@npm:1.0.0" @@ -4299,14 +4800,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^8.5.0": - version: 8.5.0 - resolution: "eslint-config-prettier@npm:8.5.0" +"eslint-config-prettier@npm:^8.10.0": + version: 8.10.0 + resolution: "eslint-config-prettier@npm:8.10.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 0d0f5c32e7a0ad91249467ce71ca92394ccd343178277d318baf32063b79ea90216f4c81d1065d60f96366fdc60f151d4d68ae7811a58bd37228b84c2083f893 + checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8 languageName: node linkType: hard @@ -4319,42 +4820,44 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:^7.30.0": - version: 7.31.1 - resolution: "eslint-plugin-react@npm:7.31.1" +"eslint-plugin-react@npm:^7.33.2": + version: 7.33.2 + resolution: "eslint-plugin-react@npm:7.33.2" dependencies: - array-includes: ^3.1.5 - array.prototype.flatmap: ^1.3.0 + array-includes: ^3.1.6 + array.prototype.flatmap: ^1.3.1 + array.prototype.tosorted: ^1.1.1 doctrine: ^2.1.0 + es-iterator-helpers: ^1.0.12 estraverse: ^5.3.0 jsx-ast-utils: ^2.4.1 || ^3.0.0 minimatch: ^3.1.2 - object.entries: ^1.1.5 - object.fromentries: ^2.0.5 - object.hasown: ^1.1.1 - object.values: ^1.1.5 + object.entries: ^1.1.6 + object.fromentries: ^2.0.6 + object.hasown: ^1.1.2 + object.values: ^1.1.6 prop-types: ^15.8.1 - resolve: ^2.0.0-next.3 - semver: ^6.3.0 - string.prototype.matchall: ^4.0.7 + resolve: ^2.0.0-next.4 + semver: ^6.3.1 + string.prototype.matchall: ^4.0.8 peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 6217d4c4e36c8fea24facd0cdcf22b2fd38a3603db94ec7c0a6f430046c8564b6c6884e0a9d4a4b8766201f66e8b18af594002210421bf9b6623b1fc32e15a3a + checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610 languageName: node linkType: hard -"eslint-plugin-unused-imports@npm:^2.0.0": - version: 2.0.0 - resolution: "eslint-plugin-unused-imports@npm:2.0.0" +"eslint-plugin-unused-imports@npm:^3.0.0": + version: 3.0.0 + resolution: "eslint-plugin-unused-imports@npm:3.0.0" dependencies: eslint-rule-composer: ^0.3.0 peerDependencies: - "@typescript-eslint/eslint-plugin": ^5.0.0 + "@typescript-eslint/eslint-plugin": ^6.0.0 eslint: ^8.0.0 peerDependenciesMeta: "@typescript-eslint/eslint-plugin": optional: true - checksum: 8aa1e03e75da2a62a354065e0cb8fe370118c6f8d9720a32fe8c1da937de6adb81a4fed7d0d391d115ac9453b49029fb19f970d180a2cf3dba451fd4c20f0dc4 + checksum: 51666f62cc8dccba2895ced83f3c1e0b78b68c357e17360e156c4db548bfdeda34cbd8725192fb4903f22d5069400fb22ded6039631df01ee82fd618dc307247 languageName: node linkType: hard @@ -4365,7 +4868,7 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1": +"eslint-scope@npm:5.1.1": version: 5.1.1 resolution: "eslint-scope@npm:5.1.1" dependencies: @@ -4375,28 +4878,17 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^7.1.1": - version: 7.1.1 - resolution: "eslint-scope@npm:7.1.1" +"eslint-scope@npm:^7.2.2": + version: 7.2.2 + resolution: "eslint-scope@npm:7.2.2" dependencies: esrecurse: ^4.3.0 estraverse: ^5.2.0 - checksum: 9f6e974ab2db641ca8ab13508c405b7b859e72afe9f254e8131ff154d2f40c99ad4545ce326fd9fde3212ff29707102562a4834f1c48617b35d98c71a97fbf3e - languageName: node - linkType: hard - -"eslint-utils@npm:^3.0.0": - version: 3.0.0 - resolution: "eslint-utils@npm:3.0.0" - dependencies: - eslint-visitor-keys: ^2.0.0 - peerDependencies: - eslint: ">=5" - checksum: 0668fe02f5adab2e5a367eee5089f4c39033af20499df88fe4e6aba2015c20720404d8c3d6349b6f716b08fdf91b9da4e5d5481f265049278099c4c836ccb619 + checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e languageName: node linkType: hard -"eslint-visitor-keys@npm:^2.0.0, eslint-visitor-keys@npm:^2.1.0": +"eslint-visitor-keys@npm:^2.1.0": version: 2.1.0 resolution: "eslint-visitor-keys@npm:2.1.0" checksum: e3081d7dd2611a35f0388bbdc2f5da60b3a3c5b8b6e928daffff7391146b434d691577aa95064c8b7faad0b8a680266bcda0a42439c18c717b80e6718d7e267d @@ -4410,63 +4902,69 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.16.0": - version: 8.23.0 - resolution: "eslint@npm:8.23.0" +"eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60 + languageName: node + linkType: hard + +"eslint@npm:^8.54.0": + version: 8.54.0 + resolution: "eslint@npm:8.54.0" dependencies: - "@eslint/eslintrc": ^1.3.1 - "@humanwhocodes/config-array": ^0.10.4 - "@humanwhocodes/gitignore-to-minimatch": ^1.0.2 + "@eslint-community/eslint-utils": ^4.2.0 + "@eslint-community/regexpp": ^4.6.1 + "@eslint/eslintrc": ^2.1.3 + "@eslint/js": 8.54.0 + "@humanwhocodes/config-array": ^0.11.13 "@humanwhocodes/module-importer": ^1.0.1 - ajv: ^6.10.0 + "@nodelib/fs.walk": ^1.2.8 + "@ungap/structured-clone": ^1.2.0 + ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 debug: ^4.3.2 doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 - eslint-scope: ^7.1.1 - eslint-utils: ^3.0.0 - eslint-visitor-keys: ^3.3.0 - espree: ^9.4.0 - esquery: ^1.4.0 + eslint-scope: ^7.2.2 + eslint-visitor-keys: ^3.4.3 + espree: ^9.6.1 + esquery: ^1.4.2 esutils: ^2.0.2 fast-deep-equal: ^3.1.3 file-entry-cache: ^6.0.1 find-up: ^5.0.0 - functional-red-black-tree: ^1.0.1 - glob-parent: ^6.0.1 - globals: ^13.15.0 - globby: ^11.1.0 - grapheme-splitter: ^1.0.4 + glob-parent: ^6.0.2 + globals: ^13.19.0 + graphemer: ^1.4.0 ignore: ^5.2.0 - import-fresh: ^3.0.0 imurmurhash: ^0.1.4 is-glob: ^4.0.0 + is-path-inside: ^3.0.3 js-yaml: ^4.1.0 json-stable-stringify-without-jsonify: ^1.0.1 levn: ^0.4.1 lodash.merge: ^4.6.2 minimatch: ^3.1.2 natural-compare: ^1.4.0 - optionator: ^0.9.1 - regexpp: ^3.2.0 + optionator: ^0.9.3 strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: ff6075daa28d817a7ac4508f31bc108a04d9ab5056608c8651b5bf9cfea5d708ca16dea6cdab2c3c0ae99b0bf0e726af8504eaa8e17c8e12e242cb68237ead64 + checksum: 7e876e9da2a18a017271cf3733d05a3dfbbe469272d75753408c6ea5b1646c71c6bb18cb91e10ca930144c32c1ce3701e222f1ae6784a3975a69f8f8aa68e49f languageName: node linkType: hard -"espree@npm:^9.4.0": - version: 9.4.0 - resolution: "espree@npm:9.4.0" +"espree@npm:^9.6.0, espree@npm:^9.6.1": + version: 9.6.1 + resolution: "espree@npm:9.6.1" dependencies: - acorn: ^8.8.0 + acorn: ^8.9.0 acorn-jsx: ^5.3.2 - eslint-visitor-keys: ^3.3.0 - checksum: 2e3020dde67892d2ba3632413b44d0dc31d92c29ce72267d7ec24216a562f0a6494d3696e2fa39a3ec8c0e0088d773947ab2925fbb716801a11eb8dd313ac89c + eslint-visitor-keys: ^3.4.1 + checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9 languageName: node linkType: hard @@ -4480,12 +4978,12 @@ __metadata: languageName: node linkType: hard -"esquery@npm:^1.4.0": - version: 1.4.0 - resolution: "esquery@npm:1.4.0" +"esquery@npm:^1.4.2": + version: 1.5.0 + resolution: "esquery@npm:1.5.0" dependencies: estraverse: ^5.1.0 - checksum: a0807e17abd7fbe5fbd4fab673038d6d8a50675cdae6b04fbaa520c34581be0c5fa24582990e8acd8854f671dd291c78bb2efb9e0ed5b62f33bac4f9cf820210 + checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900 languageName: node linkType: hard @@ -4610,7 +5108,7 @@ __metadata: languageName: node linkType: hard -"fantasticon@npm:^1.2.2": +"fantasticon@npm:^1.2.3": version: 1.2.3 resolution: "fantasticon@npm:1.2.3" dependencies: @@ -4763,13 +5261,22 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.10.0": - version: 1.15.2 - resolution: "follow-redirects@npm:1.15.2" +"follow-redirects@npm:^1.15.0": + version: 1.15.3 + resolution: "follow-redirects@npm:1.15.3" peerDependenciesMeta: debug: optional: true - checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190 + checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231 + languageName: node + linkType: hard + +"for-each@npm:^0.3.3": + version: 0.3.3 + resolution: "for-each@npm:0.3.3" + dependencies: + is-callable: ^1.1.3 + checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28 languageName: node linkType: hard @@ -4844,6 +5351,13 @@ __metadata: languageName: node linkType: hard +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1 + languageName: node + linkType: hard + "function.prototype.name@npm:^1.1.5": version: 1.1.5 resolution: "function.prototype.name@npm:1.1.5" @@ -4856,14 +5370,19 @@ __metadata: languageName: node linkType: hard -"functional-red-black-tree@npm:^1.0.1": - version: 1.0.1 - resolution: "functional-red-black-tree@npm:1.0.1" - checksum: ca6c170f37640e2d94297da8bb4bf27a1d12bea3e00e6a3e007fd7aa32e37e000f5772acf941b4e4f3cf1c95c3752033d0c509af157ad8f526e7f00723b9eb9f +"function.prototype.name@npm:^1.1.6": + version: 1.1.6 + resolution: "function.prototype.name@npm:1.1.6" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + functions-have-names: ^1.2.3 + checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479 languageName: node linkType: hard -"functions-have-names@npm:^1.2.2": +"functions-have-names@npm:^1.2.2, functions-have-names@npm:^1.2.3": version: 1.2.3 resolution: "functions-have-names@npm:1.2.3" checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5 @@ -4918,6 +5437,18 @@ __metadata: languageName: node linkType: hard +"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2": + version: 1.2.2 + resolution: "get-intrinsic@npm:1.2.2" + dependencies: + function-bind: ^1.1.2 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + hasown: ^2.0.0 + checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417 + languageName: node + linkType: hard + "get-package-type@npm:^0.1.0": version: 0.1.0 resolution: "get-package-type@npm:0.1.0" @@ -4960,7 +5491,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^6.0.1": +"glob-parent@npm:^6.0.2": version: 6.0.2 resolution: "glob-parent@npm:6.0.2" dependencies: @@ -4976,7 +5507,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7, glob@npm:^7.2.0": +"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.0 resolution: "glob@npm:7.2.0" dependencies: @@ -4990,6 +5521,20 @@ __metadata: languageName: node linkType: hard +"glob@npm:^7.2.3": + version: 7.2.3 + resolution: "glob@npm:7.2.3" + dependencies: + fs.realpath: ^1.0.0 + inflight: ^1.0.4 + inherits: 2 + minimatch: ^3.1.1 + once: ^1.3.0 + path-is-absolute: ^1.0.0 + checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133 + languageName: node + linkType: hard + "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -4997,12 +5542,21 @@ __metadata: languageName: node linkType: hard -"globals@npm:^13.15.0": - version: 13.17.0 - resolution: "globals@npm:13.17.0" +"globals@npm:^13.19.0, globals@npm:^13.23.0": + version: 13.23.0 + resolution: "globals@npm:13.23.0" dependencies: type-fest: ^0.20.2 - checksum: fbaf4112e59b92c9f5575e85ce65e9e17c0b82711196ec5f58beb08599bbd92fd72703d6dfc9b080381fd35b644e1b11dcf25b38cc2341ec21df942594cbc8ce + checksum: 194c97cf8d1ef6ba59417234c2386549c4103b6e5f24b1ff1952de61a4753e5d2069435ba629de711a6480b1b1d114a98e2ab27f85e966d5a10c319c3bbd3dc3 + languageName: node + linkType: hard + +"globalthis@npm:^1.0.3": + version: 1.0.3 + resolution: "globalthis@npm:1.0.3" + dependencies: + define-properties: ^1.1.3 + checksum: fbd7d760dc464c886d0196166d92e5ffb4c84d0730846d6621a39fbbc068aeeb9c8d1421ad330e94b7bca4bb4ea092f5f21f3d36077812af5d098b4dc006c998 languageName: node linkType: hard @@ -5020,6 +5574,15 @@ __metadata: languageName: node linkType: hard +"gopd@npm:^1.0.1": + version: 1.0.1 + resolution: "gopd@npm:1.0.1" + dependencies: + get-intrinsic: ^1.1.3 + checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6 + languageName: node + linkType: hard + "graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" @@ -5027,10 +5590,10 @@ __metadata: languageName: node linkType: hard -"grapheme-splitter@npm:^1.0.4": - version: 1.0.4 - resolution: "grapheme-splitter@npm:1.0.4" - checksum: 0c22ec54dee1b05cd480f78cf14f732cb5b108edc073572c4ec205df4cd63f30f8db8025afc5debc8835a8ddeacf648a1c7992fe3dcd6ad38f9a476d84906620 +"graphemer@npm:^1.4.0": + version: 1.4.0 + resolution: "graphemer@npm:1.4.0" + checksum: bab8f0be9b568857c7bec9fda95a89f87b783546d02951c40c33f84d05bb7da3fd10f863a9beb901463669b6583173a8c8cc6d6b306ea2b9b9d5d3d943c3a673 languageName: node linkType: hard @@ -5115,6 +5678,13 @@ __metadata: languageName: node linkType: hard +"has-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "has-proto@npm:1.0.1" + checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e + languageName: node + linkType: hard + "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2": version: 1.0.2 resolution: "has-symbols@npm:1.0.2" @@ -5154,6 +5724,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.0": + version: 2.0.0 + resolution: "hasown@npm:2.0.0" + dependencies: + function-bind: ^1.1.2 + checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176 + languageName: node + linkType: hard + "header-case@npm:^2.0.4": version: 2.0.4 resolution: "header-case@npm:2.0.4" @@ -5173,7 +5752,7 @@ __metadata: languageName: node linkType: hard -"html-escaper@npm:^2.0.0": +"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2": version: 2.0.2 resolution: "html-escaper@npm:2.0.2" checksum: d2df2da3ad40ca9ee3a39c5cc6475ef67c8f83c234475f24d8e9ce0dc80a2c82df8e1d6fa78ddd1e9022a586ea1bd247a615e80a5cd9273d90111ddda7d9e974 @@ -5181,9 +5760,9 @@ __metadata: linkType: hard "http-cache-semantics@npm:^4.1.0": - version: 4.1.0 - resolution: "http-cache-semantics@npm:4.1.0" - checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42 + version: 4.1.1 + resolution: "http-cache-semantics@npm:4.1.1" + checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236 languageName: node linkType: hard @@ -5226,7 +5805,17 @@ __metadata: dependencies: agent-base: 6 debug: 4 - checksum: 165bfb090bd26d47693597661298006841ab733d0c7383a8cb2f17373387a94c903a3ac687090aa739de05e379ab6f868bae84ab4eac288ad85c328cd1ec9e53 + checksum: 165bfb090bd26d47693597661298006841ab733d0c7383a8cb2f17373387a94c903a3ac687090aa739de05e379ab6f868bae84ab4eac288ad85c328cd1ec9e53 + languageName: node + linkType: hard + +"https-proxy-agent@npm:^5.0.1": + version: 5.0.1 + resolution: "https-proxy-agent@npm:5.0.1" + dependencies: + agent-base: 6 + debug: 4 + checksum: 571fccdf38184f05943e12d37d6ce38197becdd69e58d03f43637f7fa1269cf303a7d228aa27e5b27bbd3af8f09fd938e1c91dcfefff2df7ba77c20ed8dfc765 languageName: node linkType: hard @@ -5278,7 +5867,7 @@ __metadata: languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1": +"import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -5335,24 +5924,17 @@ __metadata: languageName: node linkType: hard -"inferno-shared@npm:7.4.8": - version: 7.4.8 - resolution: "inferno-shared@npm:7.4.8" - checksum: d9a3204ce75ee2133d2efb5f4f247d82c087631f900ab088a0c87a0259d4cd4719ace583e1dd88b4bc32cacac975995ee3cc16f6603a620f7cd061e2f7d3d650 - languageName: node - linkType: hard - -"inferno-vnode-flags@npm:7.4.11": +"inferno-vnode-flags@npm:7.4.11, inferno-vnode-flags@npm:^7.4.11": version: 7.4.11 resolution: "inferno-vnode-flags@npm:7.4.11" checksum: 8a2f1d8d546b99c14c31a25a88ac45f076be9ac630202f898c49140aa420cf2c96d871fcc3f8e5813d5176d569a40c3fd1727198edf46306de3a989fe85176ab languageName: node linkType: hard -"inferno-vnode-flags@npm:7.4.8, inferno-vnode-flags@npm:^7.4.8": - version: 7.4.8 - resolution: "inferno-vnode-flags@npm:7.4.8" - checksum: 72f26ebb361482a3312a30c89606c1eee85d7c7a790b2614d0d8567291d6cd7079b7536285b749dbfd5ead77e1546a2f4a676692e3fb08eb90eef009cbabbce0 +"inferno-vnode-flags@npm:8.2.2": + version: 8.2.2 + resolution: "inferno-vnode-flags@npm:8.2.2" + checksum: 2b4688c0e1606af3ed16e39d6eb4703505ede787786a3637d38eea9b0c75920fdcf1de8f7e27787fdc5e1e19c3ee4a713c07ab7e6c5b5eaf5696ab9464a8de05 languageName: node linkType: hard @@ -5367,14 +5949,14 @@ __metadata: languageName: node linkType: hard -"inferno@npm:^7.4.8": - version: 7.4.8 - resolution: "inferno@npm:7.4.8" +"inferno@npm:^8.2.2": + version: 8.2.2 + resolution: "inferno@npm:8.2.2" dependencies: - inferno-shared: 7.4.8 - inferno-vnode-flags: 7.4.8 + csstype: ^3.1.2 + inferno-vnode-flags: 8.2.2 opencollective-postinstall: ^2.0.3 - checksum: fa814fcb5f7e865ec29ceee00e6e6d7688cd0dcc9db57ab9619d62de08076ee823ee81c4e47ff3fa6632e896817bda1b45ac8a30b60357197ffcc9a1ef9e0ac0 + checksum: 6667d0800279b197180151d371e3d974fb83533e61dfd5369eb71082d95bf5375332f43c9dee6185aac3ae9044434cc1aba59e18f9b56ee93f72d752cf638abc languageName: node linkType: hard @@ -5406,6 +5988,17 @@ __metadata: languageName: node linkType: hard +"internal-slot@npm:^1.0.5": + version: 1.0.6 + resolution: "internal-slot@npm:1.0.6" + dependencies: + get-intrinsic: ^1.2.2 + hasown: ^2.0.0 + side-channel: ^1.0.4 + checksum: 7872454888047553ce97a3fa1da7cc054a28ec5400a9c2e9f4dbe4fe7c1d041cb8e8301467614b80d4246d50377aad2fb58860b294ed74d6700cc346b6f89549 + languageName: node + linkType: hard + "interpret@npm:^2.2.0": version: 2.2.0 resolution: "interpret@npm:2.2.0" @@ -5420,6 +6013,17 @@ __metadata: languageName: node linkType: hard +"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2": + version: 3.0.2 + resolution: "is-array-buffer@npm:3.0.2" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.0 + is-typed-array: ^1.1.10 + checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14 + languageName: node + linkType: hard + "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -5427,6 +6031,15 @@ __metadata: languageName: node linkType: hard +"is-async-function@npm:^2.0.0": + version: 2.0.0 + resolution: "is-async-function@npm:2.0.0" + dependencies: + has-tostringtag: ^1.0.0 + checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd + languageName: node + linkType: hard + "is-bigint@npm:^1.0.1": version: 1.0.4 resolution: "is-bigint@npm:1.0.4" @@ -5455,6 +6068,13 @@ __metadata: languageName: node linkType: hard +"is-callable@npm:^1.1.3, is-callable@npm:^1.2.7": + version: 1.2.7 + resolution: "is-callable@npm:1.2.7" + checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac + languageName: node + linkType: hard + "is-callable@npm:^1.1.4, is-callable@npm:^1.2.3, is-callable@npm:^1.2.4": version: 1.2.4 resolution: "is-callable@npm:1.2.4" @@ -5462,6 +6082,15 @@ __metadata: languageName: node linkType: hard +"is-core-module@npm:^2.13.0": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" + dependencies: + hasown: ^2.0.0 + checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c + languageName: node + linkType: hard + "is-core-module@npm:^2.2.0": version: 2.2.0 resolution: "is-core-module@npm:2.2.0" @@ -5478,6 +6107,15 @@ __metadata: languageName: node linkType: hard +"is-date-object@npm:^1.0.5": + version: 1.0.5 + resolution: "is-date-object@npm:1.0.5" + dependencies: + has-tostringtag: ^1.0.0 + checksum: baa9077cdf15eb7b58c79398604ca57379b2fc4cf9aa7a9b9e295278648f628c9b201400c01c5e0f7afae56507d741185730307cbe7cad3b9f90a77e5ee342fc + languageName: node + linkType: hard + "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -5485,6 +6123,15 @@ __metadata: languageName: node linkType: hard +"is-finalizationregistry@npm:^1.0.2": + version: 1.0.2 + resolution: "is-finalizationregistry@npm:1.0.2" + dependencies: + call-bind: ^1.0.2 + checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d + languageName: node + linkType: hard + "is-fullwidth-code-point@npm:^1.0.0": version: 1.0.0 resolution: "is-fullwidth-code-point@npm:1.0.0" @@ -5515,6 +6162,15 @@ __metadata: languageName: node linkType: hard +"is-generator-function@npm:^1.0.10": + version: 1.0.10 + resolution: "is-generator-function@npm:1.0.10" + dependencies: + has-tostringtag: ^1.0.0 + checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b + languageName: node + linkType: hard + "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:~4.0.1": version: 4.0.1 resolution: "is-glob@npm:4.0.1" @@ -5540,6 +6196,13 @@ __metadata: languageName: node linkType: hard +"is-map@npm:^2.0.1": + version: 2.0.2 + resolution: "is-map@npm:2.0.2" + checksum: ace3d0ecd667bbdefdb1852de601268f67f2db725624b1958f279316e13fecb8fa7df91fd60f690d7417b4ec180712f5a7ee967008e27c65cfd475cc84337728 + languageName: node + linkType: hard + "is-negative-zero@npm:^2.0.1": version: 2.0.1 resolution: "is-negative-zero@npm:2.0.1" @@ -5570,6 +6233,13 @@ __metadata: languageName: node linkType: hard +"is-path-inside@npm:^3.0.3": + version: 3.0.3 + resolution: "is-path-inside@npm:3.0.3" + checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 + languageName: node + linkType: hard + "is-plain-object@npm:^2.0.4": version: 2.0.4 resolution: "is-plain-object@npm:2.0.4" @@ -5579,6 +6249,13 @@ __metadata: languageName: node linkType: hard +"is-plain-object@npm:^5.0.0": + version: 5.0.0 + resolution: "is-plain-object@npm:5.0.0" + checksum: e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c + languageName: node + linkType: hard + "is-potential-custom-element-name@npm:^1.0.1": version: 1.0.1 resolution: "is-potential-custom-element-name@npm:1.0.1" @@ -5603,6 +6280,13 @@ __metadata: languageName: node linkType: hard +"is-set@npm:^2.0.1": + version: 2.0.2 + resolution: "is-set@npm:2.0.2" + checksum: b64343faf45e9387b97a6fd32be632ee7b269bd8183701f3b3f5b71a7cf00d04450ed8669d0bd08753e08b968beda96fca73a10fd0ff56a32603f64deba55a57 + languageName: node + linkType: hard + "is-shared-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "is-shared-array-buffer@npm:1.0.2" @@ -5637,6 +6321,15 @@ __metadata: languageName: node linkType: hard +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9": + version: 1.1.12 + resolution: "is-typed-array@npm:1.1.12" + dependencies: + which-typed-array: ^1.1.11 + checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796 + languageName: node + linkType: hard + "is-typedarray@npm:~1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" @@ -5644,6 +6337,13 @@ __metadata: languageName: node linkType: hard +"is-weakmap@npm:^2.0.1": + version: 2.0.1 + resolution: "is-weakmap@npm:2.0.1" + checksum: 1222bb7e90c32bdb949226e66d26cb7bce12e1e28e3e1b40bfa6b390ba3e08192a8664a703dff2a00a84825f4e022f9cd58c4599ff9981ab72b1d69479f4f7f6 + languageName: node + linkType: hard + "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -5653,6 +6353,16 @@ __metadata: languageName: node linkType: hard +"is-weakset@npm:^2.0.1": + version: 2.0.2 + resolution: "is-weakset@npm:2.0.2" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.1.1 + checksum: 5d8698d1fa599a0635d7ca85be9c26d547b317ed8fd83fc75f03efbe75d50001b5eececb1e9971de85fcde84f69ae6f8346bc92d20d55d46201d328e4c74a367 + languageName: node + linkType: hard + "isarray@npm:0.0.1": version: 0.0.1 resolution: "isarray@npm:0.0.1" @@ -5660,6 +6370,13 @@ __metadata: languageName: node linkType: hard +"isarray@npm:^2.0.5": + version: 2.0.5 + resolution: "isarray@npm:2.0.5" + checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a + languageName: node + linkType: hard + "isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -5747,6 +6464,19 @@ __metadata: languageName: node linkType: hard +"iterator.prototype@npm:^1.1.2": + version: 1.1.2 + resolution: "iterator.prototype@npm:1.1.2" + dependencies: + define-properties: ^1.2.1 + get-intrinsic: ^1.2.1 + has-symbols: ^1.0.3 + reflect.getprototypeof: ^1.0.4 + set-function-name: ^2.0.1 + checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168 + languageName: node + linkType: hard + "jest-changed-files@npm:^28.1.3": version: 28.1.3 resolution: "jest-changed-files@npm:28.1.3" @@ -5757,7 +6487,7 @@ __metadata: languageName: node linkType: hard -"jest-circus@npm:^28.1.0, jest-circus@npm:^28.1.3": +"jest-circus@npm:^28.1.3": version: 28.1.3 resolution: "jest-circus@npm:28.1.3" dependencies: @@ -5895,7 +6625,7 @@ __metadata: languageName: node linkType: hard -"jest-environment-jsdom@npm:^28.1.0": +"jest-environment-jsdom@npm:^28.1.3": version: 28.1.3 resolution: "jest-environment-jsdom@npm:28.1.3" dependencies: @@ -6203,17 +6933,6 @@ __metadata: languageName: node linkType: hard -"jest-worker@npm:^27.0.2": - version: 27.0.6 - resolution: "jest-worker@npm:27.0.6" - dependencies: - "@types/node": "*" - merge-stream: ^2.0.0 - supports-color: ^8.0.0 - checksum: cef42e551033839940ed26c121b7d19ff85316fb5e4b815e1fca28744c884173bb3a6be64729bc95c281902db5142685700fc0922628b646151b0f5dcabbeb37 - languageName: node - linkType: hard - "jest-worker@npm:^27.4.5": version: 27.5.1 resolution: "jest-worker@npm:27.5.1" @@ -6236,7 +6955,7 @@ __metadata: languageName: node linkType: hard -"jest@npm:^28.1.0": +"jest@npm:^28.1.3": version: 28.1.3 resolution: "jest@npm:28.1.3" dependencies: @@ -6332,6 +7051,42 @@ __metadata: languageName: node linkType: hard +"jsdom@npm:^22.1.0": + version: 22.1.0 + resolution: "jsdom@npm:22.1.0" + dependencies: + abab: ^2.0.6 + cssstyle: ^3.0.0 + data-urls: ^4.0.0 + decimal.js: ^10.4.3 + domexception: ^4.0.0 + form-data: ^4.0.0 + html-encoding-sniffer: ^3.0.0 + http-proxy-agent: ^5.0.0 + https-proxy-agent: ^5.0.1 + is-potential-custom-element-name: ^1.0.1 + nwsapi: ^2.2.4 + parse5: ^7.1.2 + rrweb-cssom: ^0.6.0 + saxes: ^6.0.0 + symbol-tree: ^3.2.4 + tough-cookie: ^4.1.2 + w3c-xmlserializer: ^4.0.0 + webidl-conversions: ^7.0.0 + whatwg-encoding: ^2.0.0 + whatwg-mimetype: ^3.0.0 + whatwg-url: ^12.0.1 + ws: ^8.13.0 + xml-name-validator: ^4.0.0 + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + checksum: d955ab83a6dad3e6af444098d30647c719bbb4cf97de053aa5751c03c8d6f3283d8c4d7fc2774c181f1d432fb0250e7332bc159e6b466424f4e337d73adcbf30 + languageName: node + linkType: hard + "jsesc@npm:^2.5.1": version: 2.5.2 resolution: "jsesc@npm:2.5.2" @@ -6412,6 +7167,15 @@ __metadata: languageName: node linkType: hard +"json5@npm:^2.2.3": + version: 2.2.3 + resolution: "json5@npm:2.2.3" + bin: + json5: lib/cli.js + checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349 + languageName: node + linkType: hard + "jsprim@npm:^1.2.2": version: 1.4.1 resolution: "jsprim@npm:1.4.1" @@ -6434,14 +7198,14 @@ __metadata: languageName: node linkType: hard -"katex@npm:^0.15.1": - version: 0.15.1 - resolution: "katex@npm:0.15.1" +"katex@npm:^0.15.6": + version: 0.15.6 + resolution: "katex@npm:0.15.6" dependencies: commander: ^8.0.0 bin: katex: cli.js - checksum: eab97bbe292cc60b15fec264cba86d110e5e089045de084cd3a0f27b21ef65857a4d296c418ec3b397ff987671a20c6a9a1fd30f1862b86a0e6b7dbe3fb893f6 + checksum: 2da808bbd1d3be27715006cd86767dd3fcce3e317fb3bbd64d407328d2d90de17b5d83062b2cfd0e0d0de32e340efbac214862bc96892a5d1492462e553728d4 languageName: node linkType: hard @@ -6459,13 +7223,6 @@ __metadata: languageName: node linkType: hard -"klona@npm:^2.0.4": - version: 2.0.4 - resolution: "klona@npm:2.0.4" - checksum: abc6690882e0e6f5cf70451b79a6de95a27be56ced283d1d6d7e610db7d824e5da1f142f8073466dfbcfa887ee001b98f6dcfbcf02759828ba356b90202a74c5 - languageName: node - linkType: hard - "leven@npm:^3.1.0": version: 3.1.0 resolution: "leven@npm:3.1.0" @@ -6550,7 +7307,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.17.10, lodash@npm:^4.17.20": +"lodash@npm:^4.17.10": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -6577,6 +7334,15 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^5.1.1": + version: 5.1.1 + resolution: "lru-cache@npm:5.1.1" + dependencies: + yallist: ^3.0.2 + checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb + languageName: node + linkType: hard + "lru-cache@npm:^6.0.0": version: 6.0.0 resolution: "lru-cache@npm:6.0.0" @@ -6636,12 +7402,12 @@ __metadata: languageName: node linkType: hard -"marked@npm:^4.0.10": - version: 4.0.12 - resolution: "marked@npm:4.0.12" +"marked@npm:^4.3.0": + version: 4.3.0 + resolution: "marked@npm:4.3.0" bin: marked: bin/marked.js - checksum: 7575117f85a8986652f3ac8b8a7b95056c4c5fce01a1fc76dc4c7960412cb4c9bd9da8133487159b6b3ff84f52b543dfe9a36f826a5f358892b5ec4b6824f192 + checksum: 0db6817893952c3ec710eb9ceafb8468bf5ae38cb0f92b7b083baa13d70b19774674be04db5b817681fa7c5c6a088f61300815e4dd75a59696f4716ad69f6260 languageName: node linkType: hard @@ -6708,15 +7474,6 @@ __metadata: languageName: node linkType: hard -"mime@npm:^2.3.1": - version: 2.5.2 - resolution: "mime@npm:2.5.2" - bin: - mime: cli.js - checksum: dd3c93d433d41a09f6a1cfa969b653b769899f3bd573e7bfcea33bdc8b0cc4eba57daa2f95937369c2bd2b6d39d62389b11a4309fe40d1d3a1b736afdedad0ff - languageName: node - linkType: hard - "mimic-fn@npm:^2.1.0": version: 2.1.0 resolution: "mimic-fn@npm:2.1.0" @@ -6724,18 +7481,18 @@ __metadata: languageName: node linkType: hard -"mini-css-extract-plugin@npm:^2.6.0": - version: 2.6.1 - resolution: "mini-css-extract-plugin@npm:2.6.1" +"mini-css-extract-plugin@npm:^2.7.6": + version: 2.7.6 + resolution: "mini-css-extract-plugin@npm:2.7.6" dependencies: schema-utils: ^4.0.0 peerDependencies: webpack: ^5.0.0 - checksum: df60840404878c4832b4104799fd29c5a89b06b1e377956c8d4a5729efe0ef301a52e5087d6f383871df5e69a8445922a0ae635c11abf412d7645a7096d0e973 + checksum: be6f7cefc6275168eb0a6b8fe977083a18c743c9612c9f00e6c1a62c3393ca7960e93fba1a7ebb09b75f36a0204ad087d772c1ef574bc29c90c0e8175a3c0b83 languageName: node linkType: hard -"minimatch@npm:^3.0.4, minimatch@npm:^3.1.2": +"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -6811,6 +7568,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^5.0.0": + version: 5.0.0 + resolution: "minipass@npm:5.0.0" + checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea + languageName: node + linkType: hard + "minizlib@npm:^2.0.0, minizlib@npm:^2.1.1": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -6830,6 +7594,13 @@ __metadata: languageName: node linkType: hard +"mrmime@npm:^1.0.0": + version: 1.0.1 + resolution: "mrmime@npm:1.0.1" + checksum: cc979da44bbbffebaa8eaf7a45117e851f2d4cb46a3ada6ceb78130466a04c15a0de9a9ce1c8b8ba6f6e1b8618866b1352992bf1757d241c0ddca558b9f28a77 + languageName: node + linkType: hard + "ms@npm:2.1.2": version: 2.1.2 resolution: "ms@npm:2.1.2" @@ -6853,12 +7624,12 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.3.4": - version: 3.3.4 - resolution: "nanoid@npm:3.3.4" +"nanoid@npm:^3.3.6": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" bin: nanoid: bin/nanoid.cjs - checksum: 2fddd6dee994b7676f008d3ffa4ab16035a754f4bb586c61df5a22cf8c8c94017aadd360368f47d653829e0569a92b129979152ff97af23a558331e47e37cd9c + checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2 languageName: node linkType: hard @@ -6963,6 +7734,13 @@ __metadata: languageName: node linkType: hard +"node-releases@npm:^2.0.13": + version: 2.0.13 + resolution: "node-releases@npm:2.0.13" + checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3 + languageName: node + linkType: hard + "node-releases@npm:^2.0.6": version: 2.0.6 resolution: "node-releases@npm:2.0.6" @@ -7023,6 +7801,13 @@ __metadata: languageName: node linkType: hard +"nwsapi@npm:^2.2.4": + version: 2.2.7 + resolution: "nwsapi@npm:2.2.7" + checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e + languageName: node + linkType: hard + "oauth-sign@npm:~0.9.0": version: 0.9.0 resolution: "oauth-sign@npm:0.9.0" @@ -7051,6 +7836,13 @@ __metadata: languageName: node linkType: hard +"object-inspect@npm:^1.13.1": + version: 1.13.1 + resolution: "object-inspect@npm:1.13.1" + checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f + languageName: node + linkType: hard + "object-keys@npm:^1.0.12, object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" @@ -7058,7 +7850,7 @@ __metadata: languageName: node linkType: hard -"object.assign@npm:^4.1.0, object.assign@npm:^4.1.2": +"object.assign@npm:^4.1.2": version: 4.1.2 resolution: "object.assign@npm:4.1.2" dependencies: @@ -7070,46 +7862,58 @@ __metadata: languageName: node linkType: hard -"object.entries@npm:^1.1.5": - version: 1.1.5 - resolution: "object.entries@npm:1.1.5" +"object.assign@npm:^4.1.4": + version: 4.1.4 + resolution: "object.assign@npm:4.1.4" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: d658696f74fd222060d8428d2a9fda2ce736b700cb06f6bdf4a16a1892d145afb746f453502b2fa55d1dca8ead6f14ddbcf66c545df45adadea757a6c4cd86c7 + define-properties: ^1.1.4 + has-symbols: ^1.0.3 + object-keys: ^1.1.1 + checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864 languageName: node linkType: hard -"object.fromentries@npm:^2.0.5": - version: 2.0.5 - resolution: "object.fromentries@npm:2.0.5" +"object.entries@npm:^1.1.6": + version: 1.1.7 + resolution: "object.entries@npm:1.1.7" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: 61a0b565ded97b76df9e30b569729866e1824cce902f98e90bb106e84f378aea20163366f66dc75c9000e2aad2ed0caf65c6f530cb2abc4c0c0f6c982102db4b + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: da287d434e7e32989586cd734382364ba826a2527f2bc82e6acbf9f9bfafa35d51018b66ec02543ffdfa2a5ba4af2b6f1ca6e588c65030cb4fd9c67d6ced594c languageName: node linkType: hard -"object.hasown@npm:^1.1.1": - version: 1.1.1 - resolution: "object.hasown@npm:1.1.1" +"object.fromentries@npm:^2.0.6": + version: 2.0.7 + resolution: "object.fromentries@npm:2.0.7" dependencies: - define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: d8ed4907ce57f48b93e3b53c418fd6787bf226a51e8d698c91e39b78e80fe5b124cb6282f6a9d5be21cf9e2c7829ab10206dcc6112b7748860eefe641880c793 + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065 languageName: node linkType: hard -"object.values@npm:^1.1.5": - version: 1.1.5 - resolution: "object.values@npm:1.1.5" +"object.hasown@npm:^1.1.2": + version: 1.1.3 + resolution: "object.hasown@npm:1.1.3" + dependencies: + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 76bc17356f6124542fb47e5d0e78d531eafa4bba3fc2d6fc4b1a8ce8b6878912366c0d99f37ce5c84ada8fd79df7aa6ea1214fddf721f43e093ad2df51f27da1 + languageName: node + linkType: hard + +"object.values@npm:^1.1.6": + version: 1.1.7 + resolution: "object.values@npm:1.1.7" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: 0f17e99741ebfbd0fa55ce942f6184743d3070c61bd39221afc929c8422c4907618c8da694c6915bc04a83ab3224260c779ba37fc07bb668bdc5f33b66a902a4 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777 languageName: node linkType: hard @@ -7163,17 +7967,17 @@ __metadata: languageName: node linkType: hard -"optionator@npm:^0.9.1": - version: 0.9.1 - resolution: "optionator@npm:0.9.1" +"optionator@npm:^0.9.3": + version: 0.9.3 + resolution: "optionator@npm:0.9.3" dependencies: + "@aashutoshrathi/word-wrap": ^1.2.3 deep-is: ^0.1.3 fast-levenshtein: ^2.0.6 levn: ^0.4.1 prelude-ls: ^1.2.1 type-check: ^0.4.0 - word-wrap: ^1.2.3 - checksum: dbc6fa065604b24ea57d734261914e697bd73b69eff7f18e967e8912aa2a40a19a9f599a507fa805be6c13c24c4eae8c71306c239d517d42d4c041c942f508a0 + checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a languageName: node linkType: hard @@ -7274,6 +8078,15 @@ __metadata: languageName: node linkType: hard +"parse5@npm:^7.1.2": + version: 7.1.2 + resolution: "parse5@npm:7.1.2" + dependencies: + entities: ^4.4.0 + checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713 + languageName: node + linkType: hard + "pascal-case@npm:^3.1.2": version: 3.1.2 resolution: "pascal-case@npm:3.1.2" @@ -7315,10 +8128,10 @@ __metadata: languageName: node linkType: hard -"path-parse@npm:^1.0.6": - version: 1.0.6 - resolution: "path-parse@npm:1.0.6" - checksum: 962a85dd384d68d469ec5ba4010df8f8f9b7e936ce603bbe3211476c5615feb3c2b1ca61211a78445fadc833f0b1a86ea6484c861035ec4ac93011ba9aff9a11 +"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7": + version: 1.0.7 + resolution: "path-parse@npm:1.0.7" + checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a languageName: node linkType: hard @@ -7375,16 +8188,16 @@ __metadata: languageName: node linkType: hard -"postcss-modules-local-by-default@npm:^4.0.0": - version: 4.0.0 - resolution: "postcss-modules-local-by-default@npm:4.0.0" +"postcss-modules-local-by-default@npm:^4.0.3": + version: 4.0.3 + resolution: "postcss-modules-local-by-default@npm:4.0.3" dependencies: icss-utils: ^5.0.0 postcss-selector-parser: ^6.0.2 postcss-value-parser: ^4.1.0 peerDependencies: postcss: ^8.1.0 - checksum: 6cf570badc7bc26c265e073f3ff9596b69bb954bc6ac9c5c1b8cba2995b80834226b60e0a3cbb87d5f399dbb52e6466bba8aa1d244f6218f99d834aec431a69d + checksum: 2f8083687f3d6067885f8863dd32dbbb4f779cfcc7e52c17abede9311d84faf6d3ed8760e7c54c6380281732ae1f78e5e56a28baf3c271b33f450a11c9e30485 languageName: node linkType: hard @@ -7436,14 +8249,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.7": - version: 8.4.16 - resolution: "postcss@npm:8.4.16" +"postcss@npm:^8.4.21": + version: 8.4.31 + resolution: "postcss@npm:8.4.31" dependencies: - nanoid: ^3.3.4 + nanoid: ^3.3.6 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: 10eee25efd77868036403858577da0cefaf2e0905feeaba5770d5438ccdddba3d01cba8063e96b8aac4c6daa0ed413dd5ae0554a433a3c4db38df1d134cffc1f + checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea languageName: node linkType: hard @@ -7541,6 +8354,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "psl@npm:^1.1.28, psl@npm:^1.1.33": version: 1.8.0 resolution: "psl@npm:1.8.0" @@ -7555,6 +8375,13 @@ __metadata: languageName: node linkType: hard +"punycode@npm:^2.3.0": + version: 2.3.1 + resolution: "punycode@npm:2.3.1" + checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2 + languageName: node + linkType: hard + "qs@npm:~6.5.2": version: 6.5.3 resolution: "qs@npm:6.5.3" @@ -7562,6 +8389,13 @@ __metadata: languageName: node linkType: hard +"querystringify@npm:^2.1.1": + version: 2.2.0 + resolution: "querystringify@npm:2.2.0" + checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15 + languageName: node + linkType: hard + "queue-microtask@npm:^1.2.2": version: 1.2.2 resolution: "queue-microtask@npm:1.2.2" @@ -7655,6 +8489,20 @@ __metadata: languageName: node linkType: hard +"reflect.getprototypeof@npm:^1.0.4": + version: 1.0.4 + resolution: "reflect.getprototypeof@npm:1.0.4" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 + globalthis: ^1.0.3 + which-builtin-type: ^1.1.3 + checksum: 16e2361988dbdd23274b53fb2b1b9cefeab876c3941a2543b4cadac6f989e3db3957b07a44aac46cfceb3e06e2871785ec2aac992d824f76292f3b5ee87f66f2 + languageName: node + linkType: hard + "regenerate-unicode-properties@npm:^10.0.1": version: 10.0.1 resolution: "regenerate-unicode-properties@npm:10.0.1" @@ -7664,39 +8512,46 @@ __metadata: languageName: node linkType: hard -"regenerate-unicode-properties@npm:^8.2.0": - version: 8.2.0 - resolution: "regenerate-unicode-properties@npm:8.2.0" +"regenerate-unicode-properties@npm:^10.1.0": + version: 10.1.1 + resolution: "regenerate-unicode-properties@npm:10.1.1" dependencies: - regenerate: ^1.4.0 - checksum: ee7db70ab25b95f2e3f39537089fc3eddba0b39fc9b982d6602f127996ce873d8c55584d5428486ca00dc0a85d174d943354943cd4a745cda475c8fe314b4f8a + regenerate: ^1.4.2 + checksum: b80958ef40f125275824c2c47d5081dfaefebd80bff26c76761e9236767c748a4a95a69c053fe29d2df881177f2ca85df4a71fe70a82360388b31159ef19adcf languageName: node linkType: hard -"regenerate@npm:^1.4.0, regenerate@npm:^1.4.2": +"regenerate@npm:^1.4.2": version: 1.4.2 resolution: "regenerate@npm:1.4.2" checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0 languageName: node linkType: hard -"regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.9": +"regenerator-runtime@npm:^0.13.11": + version: 0.13.11 + resolution: "regenerator-runtime@npm:0.13.11" + checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4 + languageName: node + linkType: hard + +"regenerator-runtime@npm:^0.13.4": version: 0.13.9 resolution: "regenerator-runtime@npm:0.13.9" checksum: 65ed455fe5afd799e2897baf691ca21c2772e1a969d19bb0c4695757c2d96249eb74ee3553ea34a91062b2a676beedf630b4c1551cc6299afb937be1426ec55e languageName: node linkType: hard -"regenerator-transform@npm:^0.15.0": - version: 0.15.0 - resolution: "regenerator-transform@npm:0.15.0" +"regenerator-transform@npm:^0.15.2": + version: 0.15.2 + resolution: "regenerator-transform@npm:0.15.2" dependencies: "@babel/runtime": ^7.8.4 - checksum: 86e54849ab1167618d28bb56d214c52a983daf29b0d115c976d79840511420049b6b42c9ebdf187defa8e7129bdd74b6dd266420d0d3868c9fa7f793b5d15d49 + checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27 languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.4.1, regexp.prototype.flags@npm:^1.4.3": +"regexp.prototype.flags@npm:^1.4.3": version: 1.4.3 resolution: "regexp.prototype.flags@npm:1.4.3" dependencies: @@ -7707,24 +8562,14 @@ __metadata: languageName: node linkType: hard -"regexpp@npm:^3.2.0": - version: 3.2.0 - resolution: "regexpp@npm:3.2.0" - checksum: a78dc5c7158ad9ddcfe01aa9144f46e192ddbfa7b263895a70a5c6c73edd9ce85faf7c0430e59ac38839e1734e275b9c3de5c57ee3ab6edc0e0b1bdebefccef8 - languageName: node - linkType: hard - -"regexpu-core@npm:^4.7.1": - version: 4.7.1 - resolution: "regexpu-core@npm:4.7.1" +"regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1": + version: 1.5.1 + resolution: "regexp.prototype.flags@npm:1.5.1" dependencies: - regenerate: ^1.4.0 - regenerate-unicode-properties: ^8.2.0 - regjsgen: ^0.5.1 - regjsparser: ^0.6.4 - unicode-match-property-ecmascript: ^1.0.4 - unicode-match-property-value-ecmascript: ^1.2.0 - checksum: 368b4aab72132ba3c8bd114822572c920d390ae99d3d219e0c7f872c6a0a3b1fbe30c88188ff90ec6f8e681667fa8e51d84a78bb05c460996a0df6a060b7ae80 + call-bind: ^1.0.2 + define-properties: ^1.2.0 + set-function-name: ^2.0.0 + checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47 languageName: node linkType: hard @@ -7742,10 +8587,17 @@ __metadata: languageName: node linkType: hard -"regjsgen@npm:^0.5.1": - version: 0.5.2 - resolution: "regjsgen@npm:0.5.2" - checksum: 87c83d8488affae2493a823904de1a29a1867a07433c5e1142ad749b5606c5589b305fe35bfcc0972cf5a3b0d66b1f7999009e541be39a5d42c6041c59e2fb52 +"regexpu-core@npm:^5.3.1": + version: 5.3.2 + resolution: "regexpu-core@npm:5.3.2" + dependencies: + "@babel/regjsgen": ^0.8.0 + regenerate: ^1.4.2 + regenerate-unicode-properties: ^10.1.0 + regjsparser: ^0.9.1 + unicode-match-property-ecmascript: ^2.0.0 + unicode-match-property-value-ecmascript: ^2.1.0 + checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2 languageName: node linkType: hard @@ -7756,25 +8608,25 @@ __metadata: languageName: node linkType: hard -"regjsparser@npm:^0.6.4": - version: 0.6.7 - resolution: "regjsparser@npm:0.6.7" +"regjsparser@npm:^0.8.2": + version: 0.8.4 + resolution: "regjsparser@npm:0.8.4" dependencies: jsesc: ~0.5.0 bin: regjsparser: bin/parser - checksum: e03e83714c419cdfb4c87160f2d4b4a66dd579d699a21bff2a0795a9178eb79219b0ec5a9fa8b34e75f746f1e82aa8c90fcb0d14c0a2f9d0d678208394b11d6e + checksum: d069b932491761cda127ce11f6bd2729c3b1b394a35200ec33f1199e937423db28ceb86cf33f0a97c76ecd7c0f8db996476579eaf0d80a1f74c1934f4ca8b27a languageName: node linkType: hard -"regjsparser@npm:^0.8.2": - version: 0.8.4 - resolution: "regjsparser@npm:0.8.4" +"regjsparser@npm:^0.9.1": + version: 0.9.1 + resolution: "regjsparser@npm:0.9.1" dependencies: jsesc: ~0.5.0 bin: regjsparser: bin/parser - checksum: d069b932491761cda127ce11f6bd2729c3b1b394a35200ec33f1199e937423db28ceb86cf33f0a97c76ecd7c0f8db996476579eaf0d80a1f74c1934f4ca8b27a + checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc languageName: node linkType: hard @@ -7820,6 +8672,13 @@ __metadata: languageName: node linkType: hard +"requires-port@npm:^1.0.0": + version: 1.0.0 + resolution: "requires-port@npm:1.0.0" + checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff + languageName: node + linkType: hard + "resolve-cwd@npm:^3.0.0": version: 3.0.0 resolution: "resolve-cwd@npm:3.0.0" @@ -7860,13 +8719,16 @@ __metadata: languageName: node linkType: hard -resolve@^2.0.0-next.3: - version: 2.0.0-next.3 - resolution: "resolve@npm:2.0.0-next.3" +"resolve@npm:^2.0.0-next.4": + version: 2.0.0-next.5 + resolution: "resolve@npm:2.0.0-next.5" dependencies: - is-core-module: ^2.2.0 - path-parse: ^1.0.6 - checksum: f34b3b93ada77d64a6d590c06a83e198f3a827624c4ec972260905fa6c4d612164fbf0200d16d2beefea4ad1755b001f4a9a1293d8fc2322a8f7d6bf692c4ff5 + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: a73ac69a1c4bd34c56b213d91f5b17ce390688fdb4a1a96ed3025cc7e08e7bfb90b3a06fcce461780cb0b589c958afcb0080ab802c71c01a7ecc8c64feafc89f languageName: node linkType: hard @@ -7880,13 +8742,16 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"resolve@patch:resolve@^2.0.0-next.3#~builtin": - version: 2.0.0-next.3 - resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=c3c19d" +"resolve@patch:resolve@^2.0.0-next.4#~builtin": + version: 2.0.0-next.5 + resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#~builtin::version=2.0.0-next.5&hash=c3c19d" dependencies: - is-core-module: ^2.2.0 - path-parse: ^1.0.6 - checksum: 21684b4d99a4877337cdbd5484311c811b3e8910edb5d868eec85c6e6550b0f570d911f9a384f9e176172d6713f2715bd0b0887fa512cb8c6aeece018de6a9f8 + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: 064d09c1808d0c51b3d90b5d27e198e6d0c5dad0eb57065fd40803d6a20553e5398b07f76739d69cbabc12547058bec6b32106ea66622375fb0d7e8fca6a846c languageName: node linkType: hard @@ -7915,6 +8780,13 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"rrweb-cssom@npm:^0.6.0": + version: 0.6.0 + resolution: "rrweb-cssom@npm:0.6.0" + checksum: 182312f6e4f41d18230ccc34f14263bc8e8a6b9d30ee3ec0d2d8e643c6f27964cd7a8d638d4a00e988d93e8dc55369f4ab5a473ccfeff7a8bab95b36d2b5499c + languageName: node + linkType: hard + "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -7924,6 +8796,18 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"safe-array-concat@npm:^1.0.1": + version: 1.0.1 + resolution: "safe-array-concat@npm:1.0.1" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + has-symbols: ^1.0.3 + isarray: ^2.0.5 + checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581 + languageName: node + linkType: hard + "safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" @@ -7938,6 +8822,17 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"safe-regex-test@npm:^1.0.0": + version: 1.0.0 + resolution: "safe-regex-test@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.1.3 + is-regex: ^1.1.4 + checksum: bc566d8beb8b43c01b94e67de3f070fd2781685e835959bbbaaec91cc53381145ca91f69bd837ce6ec244817afa0a5e974fc4e40a2957f0aca68ac3add1ddd34 + languageName: node + linkType: hard + "safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -7945,15 +8840,14 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"sass-loader@npm:^13.0.0": - version: 13.0.2 - resolution: "sass-loader@npm:13.0.2" +"sass-loader@npm:^13.3.2": + version: 13.3.2 + resolution: "sass-loader@npm:13.3.2" dependencies: - klona: ^2.0.4 neo-async: ^2.6.2 peerDependencies: fibers: ">= 3.1.0" - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 + node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 sass: ^1.3.0 sass-embedded: "*" webpack: ^5.0.0 @@ -7966,20 +8860,20 @@ resolve@^2.0.0-next.3: optional: true sass-embedded: optional: true - checksum: 6306712cc75bd4b4260ce67178778c92110089485f358b5956b6b12aba15a55e5c7287154daaf8b32678891df915b7bcda7356991afe8bf08ca7356ed30eb448 + checksum: 7394a8d1b818a289b9caabd979543c907b83e28ae08bc80ccb836e0ccabc4ae574c077ab2fa520ba5fb8abb2ec3e7c9822a1cbd8c58a28ff30018be9d1dc6c27 languageName: node linkType: hard -"sass@npm:^1.52.1": - version: 1.54.7 - resolution: "sass@npm:1.54.7" +"sass@npm:^1.69.5": + version: 1.69.5 + resolution: "sass@npm:1.69.5" dependencies: chokidar: ">=3.0.0 <4.0.0" immutable: ^4.0.0 source-map-js: ">=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 4b6a10e93387e65dcbad2683d46b4249453ab8777c1bafab7a73ac3900a21fa91fa31d68df7a1b982c7e332a99b5574b1adc6168eb1ac6d7ebb28e18a65c4198 + checksum: c66f4f02882e7aa7aa49703824dadbb5a174dcd05e3cd96f17f73687889aab6027d078b518e2c04b594dfd89b2f574824bf935c7aee46c770aa6be9aafcc49f2 languageName: node linkType: hard @@ -7999,6 +8893,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"saxes@npm:^6.0.0": + version: 6.0.0 + resolution: "saxes@npm:6.0.0" + dependencies: + xmlchars: ^2.2.0 + checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b + languageName: node + linkType: hard + "schema-utils@npm:^2.6.5": version: 2.7.1 resolution: "schema-utils@npm:2.7.1" @@ -8010,7 +8913,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.0, schema-utils@npm:^3.1.1": +"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1": version: 3.1.1 resolution: "schema-utils@npm:3.1.1" dependencies: @@ -8044,21 +8947,12 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"semver@npm:7.0.0": - version: 7.0.0 - resolution: "semver@npm:7.0.0" +"semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1": + version: 6.3.1 + resolution: "semver@npm:6.3.1" bin: semver: bin/semver.js - checksum: 272c11bf8d083274ef79fe40a81c55c184dff84dd58e3c325299d0927ba48cece1f020793d138382b85f89bab5002a35a5ba59a3a68a7eebbb597eb733838778 - languageName: node - linkType: hard - -"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0": - version: 6.3.0 - resolution: "semver@npm:6.3.0" - bin: - semver: ./bin/semver.js - checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 + checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2 languageName: node linkType: hard @@ -8084,6 +8978,17 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"semver@npm:^7.3.8": + version: 7.5.4 + resolution: "semver@npm:7.5.4" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 + languageName: node + linkType: hard + "sentence-case@npm:^3.0.4": version: 3.0.4 resolution: "sentence-case@npm:3.0.4" @@ -8095,15 +9000,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"serialize-javascript@npm:^6.0.0": - version: 6.0.0 - resolution: "serialize-javascript@npm:6.0.0" - dependencies: - randombytes: ^2.1.0 - checksum: 56f90b562a1bdc92e55afb3e657c6397c01a902c588c0fe3d4c490efdcc97dcd2a3074ba12df9e94630f33a5ce5b76a74784a7041294628a6f4306e0ec84bf93 - languageName: node - linkType: hard - "serialize-javascript@npm:^6.0.1": version: 6.0.1 resolution: "serialize-javascript@npm:6.0.1" @@ -8120,6 +9016,29 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"set-function-length@npm:^1.1.1": + version: 1.1.1 + resolution: "set-function-length@npm:1.1.1" + dependencies: + define-data-property: ^1.1.1 + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06 + languageName: node + linkType: hard + +"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1": + version: 2.0.1 + resolution: "set-function-name@npm:2.0.1" + dependencies: + define-data-property: ^1.0.1 + functions-have-names: ^1.2.3 + has-property-descriptors: ^1.0.0 + checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126 + languageName: node + linkType: hard + "shallow-clone@npm:^3.0.0": version: 3.0.1 resolution: "shallow-clone@npm:3.0.1" @@ -8170,14 +9089,14 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"sirv@npm:^1.0.7": - version: 1.0.11 - resolution: "sirv@npm:1.0.11" +"sirv@npm:^2.0.3": + version: 2.0.3 + resolution: "sirv@npm:2.0.3" dependencies: - "@polka/url": ^1.0.0-next.9 - mime: ^2.3.1 - totalist: ^1.0.0 - checksum: 148e28fada4fb817673a6da60d0aba609a7eae853c8f337fa17e01ceea3498703fbcbf36be44edd433920d86047f1aa8535e30f1124472a72fc489d4a7ced377 + "@polka/url": ^1.0.0-next.20 + mrmime: ^1.0.0 + totalist: ^3.0.0 + checksum: e2dfd4c97735a6ad6d842d0eec2cd9e3919ff0e46f0d228248c5753ad4b70b832711e77e1259c031c439cdb08303cc54d923685c92b0e890145cc733af7c5568 languageName: node linkType: hard @@ -8281,10 +9200,10 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"source-map@npm:^0.7.3": - version: 0.7.3 - resolution: "source-map@npm:0.7.3" - checksum: cd24efb3b8fa69b64bf28e3c1b1a500de77e84260c5b7f2b873f88284df17974157cc88d386ee9b6d081f08fdd8242f3fc05c953685a6ad81aad94c7393dedea +"source-map@npm:^0.7.4": + version: 0.7.4 + resolution: "source-map@npm:0.7.4" + checksum: 01cc5a74b1f0e1d626a58d36ad6898ea820567e87f18dfc9d24a9843a351aaa2ec09b87422589906d6ff1deed29693e176194dc88bcae7c9a852dc74b311dbf5 languageName: node linkType: hard @@ -8396,19 +9315,31 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"string.prototype.matchall@npm:^4.0.7": - version: 4.0.7 - resolution: "string.prototype.matchall@npm:4.0.7" +"string.prototype.matchall@npm:^4.0.8": + version: 4.0.10 + resolution: "string.prototype.matchall@npm:4.0.10" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - get-intrinsic: ^1.1.1 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + get-intrinsic: ^1.2.1 has-symbols: ^1.0.3 - internal-slot: ^1.0.3 - regexp.prototype.flags: ^1.4.1 + internal-slot: ^1.0.5 + regexp.prototype.flags: ^1.5.0 + set-function-name: ^2.0.0 side-channel: ^1.0.4 - checksum: fc09f3ccbfb325de0472bcc87a6be0598a7499e0b4a31db5789676155b15754a4cc4bb83924f15fc9ed48934dac7366ee52c8b9bd160bed6fd072c93b489e75c + checksum: 3c78bdeff39360c8e435d7c4c6ea19f454aa7a63eda95fa6fadc3a5b984446a2f9f2c02d5c94171ce22268a573524263fbd0c8edbe3ce2e9890d7cc036cdc3ed + languageName: node + linkType: hard + +"string.prototype.trim@npm:^1.2.8": + version: 1.2.8 + resolution: "string.prototype.trim@npm:1.2.8" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07 languageName: node linkType: hard @@ -8433,6 +9364,17 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"string.prototype.trimend@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimend@npm:1.0.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c + languageName: node + linkType: hard + "string.prototype.trimstart@npm:^1.0.4": version: 1.0.4 resolution: "string.prototype.trimstart@npm:1.0.4" @@ -8454,6 +9396,17 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"string.prototype.trimstart@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimstart@npm:1.0.7" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613 + languageName: node + linkType: hard + "string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" @@ -8529,19 +9482,19 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": +"strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443 languageName: node linkType: hard -"style-loader@npm:^3.3.1": - version: 3.3.1 - resolution: "style-loader@npm:3.3.1" +"style-loader@npm:^3.3.3": + version: 3.3.3 + resolution: "style-loader@npm:3.3.3" peerDependencies: webpack: ^5.0.0 - checksum: 470feef680f59e2fce4d6601b5c55b88c01ad8d1dd693c528ffd591ff5fd7c01a4eff3bdbe62f26f847d6bd2430c9ab594be23307cfe7a3446ab236683f0d066 + checksum: f59c953f56f6a935bd6a1dfa409f1128fed2b66b48ce4a7a75b85862a7156e5e90ab163878962762f528ec4d510903d828da645e143fbffd26f055dc1c094078 languageName: node linkType: hard @@ -8582,6 +9535,13 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"supports-preserve-symlinks-flag@npm:^1.0.0": + version: 1.0.0 + resolution: "supports-preserve-symlinks-flag@npm:1.0.0" + checksum: 53b1e247e68e05db7b3808b99b892bd36fb096e6fba213a06da7fab22045e97597db425c724f2bbd6c99a3c295e1e73f3e4de78592289f38431049e1277ca0ae + languageName: node + linkType: hard + "svg-pathdata@npm:^6.0.0": version: 6.0.3 resolution: "svg-pathdata@npm:6.0.3" @@ -8644,16 +9604,16 @@ resolve@^2.0.0-next.3: linkType: hard "tar@npm:^6.0.2, tar@npm:^6.1.0": - version: 6.1.8 - resolution: "tar@npm:6.1.8" + version: 6.2.0 + resolution: "tar@npm:6.2.0" dependencies: chownr: ^2.0.0 fs-minipass: ^2.0.0 - minipass: ^3.0.0 + minipass: ^5.0.0 minizlib: ^2.1.1 mkdirp: ^1.0.3 yallist: ^4.0.0 - checksum: f5aa41340d3415ef6f19ed0ee620db1f7cb9ea3f5ea7bfef5ea199bdb39e978d11f31d347231193e0d9262f81de3e358aa3dda6ed0c1909f22a8ce3e3a743dad + checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c languageName: node linkType: hard @@ -8667,45 +9627,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"terser-webpack-plugin@npm:^5.1.3": - version: 5.1.4 - resolution: "terser-webpack-plugin@npm:5.1.4" - dependencies: - jest-worker: ^27.0.2 - p-limit: ^3.1.0 - schema-utils: ^3.0.0 - serialize-javascript: ^6.0.0 - source-map: ^0.6.1 - terser: ^5.7.0 - peerDependencies: - webpack: ^5.1.0 - checksum: 7e5f97ac1944aaff12460201496314ab75d842f4f088e0344ca5143caf85a340d7b0294ed6b4e32b52bbd1bea71648d6417034e889872c582c1be4840e9bd0e7 - languageName: node - linkType: hard - -"terser-webpack-plugin@npm:^5.3.1": - version: 5.3.6 - resolution: "terser-webpack-plugin@npm:5.3.6" - dependencies: - "@jridgewell/trace-mapping": ^0.3.14 - jest-worker: ^27.4.5 - schema-utils: ^3.1.1 - serialize-javascript: ^6.0.0 - terser: ^5.14.1 - peerDependencies: - webpack: ^5.1.0 - peerDependenciesMeta: - "@swc/core": - optional: true - esbuild: - optional: true - uglify-js: - optional: true - checksum: 8f3448d7fdb0434ce6a0c09d95c462bfd2f4a5a430233d854163337f734a7f5c07c74513d16081e06d4ca33d366d5b1a36f5444219bc41a7403afd6162107bad - languageName: node - linkType: hard - -"terser-webpack-plugin@npm:^5.3.7": +"terser-webpack-plugin@npm:^5.3.7, terser-webpack-plugin@npm:^5.3.9": version: 5.3.9 resolution: "terser-webpack-plugin@npm:5.3.9" dependencies: @@ -8727,20 +9649,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"terser@npm:^5.14.1": - version: 5.15.0 - resolution: "terser@npm:5.15.0" - dependencies: - "@jridgewell/source-map": ^0.3.2 - acorn: ^8.5.0 - commander: ^2.20.0 - source-map-support: ~0.5.20 - bin: - terser: bin/terser - checksum: b2358c989fcb76b4a1c265f60e175c950d3f776e5f619a9f58f54e8d2d792cd6b4cca86071834075f3b9943556d695357bafdd4ee2390de2fc9fd96ba3efa8c8 - languageName: node - linkType: hard - "terser@npm:^5.16.8": version: 5.19.2 resolution: "terser@npm:5.19.2" @@ -8755,20 +9663,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"terser@npm:^5.7.0": - version: 5.16.1 - resolution: "terser@npm:5.16.1" - dependencies: - "@jridgewell/source-map": ^0.3.2 - acorn: ^8.5.0 - commander: ^2.20.0 - source-map-support: ~0.5.20 - bin: - terser: bin/terser - checksum: cb524123504a2f0d9140c1e1a8628c83bba9cacc404c6aca79e2493a38dfdf21275617ba75b91006b3f1ff586e401ab31121160cd253699f334c6340ea2756f5 - languageName: node - linkType: hard - "test-exclude@npm:^6.0.0": version: 6.0.0 resolution: "test-exclude@npm:6.0.0" @@ -8791,7 +9685,7 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "tgfont@workspace:packages/tgfont" dependencies: - fantasticon: ^1.2.2 + fantasticon: ^1.2.3 languageName: unknown linkType: soft @@ -8799,11 +9693,11 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "tgui-dev-server@workspace:packages/tgui-dev-server" dependencies: - axios: ^0.21.1 - glob: ^7.1.7 - source-map: ^0.7.3 + axios: ^1.6.2 + glob: ^7.2.3 + source-map: ^0.7.4 stacktrace-parser: ^0.1.10 - ws: ^7.5.3 + ws: ^7.5.9 languageName: unknown linkType: soft @@ -8812,8 +9706,8 @@ resolve@^2.0.0-next.3: resolution: "tgui-panel@workspace:packages/tgui-panel" dependencies: common: "workspace:*" - dompurify: ^2.3.1 - inferno: ^7.4.8 + dompurify: ^2.4.7 + inferno: ^7.4.11 tgui: "workspace:*" tgui-dev-server: "workspace:*" tgui-polyfill: "workspace:*" @@ -8824,9 +9718,9 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "tgui-polyfill@workspace:packages/tgui-polyfill" dependencies: - core-js: ^3.16.1 - regenerator-runtime: ^0.13.9 - unfetch: ^4.2.0 + core-js: ^3.33.3 + regenerator-runtime: ^0.13.11 + unfetch: ^5.0.0 languageName: unknown linkType: soft @@ -8834,45 +9728,55 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "tgui-workspace@workspace:." dependencies: - "@babel/core": ^7.18.0 - "@babel/eslint-parser": ^7.17.0 - "@babel/plugin-proposal-class-properties": ^7.17.12 - "@babel/plugin-transform-jscript": ^7.17.12 - "@babel/preset-env": ^7.18.0 - "@babel/preset-typescript": ^7.17.12 - "@types/jest": ^27.5.1 - "@types/jsdom": ^16.2.14 - "@types/node": ^17.0.35 - "@types/webpack": ^5.28.0 - "@types/webpack-env": ^1.17.0 - "@typescript-eslint/parser": ^5.25.0 - babel-jest: ^28.1.0 - babel-loader: ^8.2.5 - babel-plugin-inferno: ^6.4.0 + "@babel/code-frame": ^7.23.4 + "@babel/core": ^7.23.3 + "@babel/eslint-parser": ^7.23.3 + "@babel/generator": ^7.23.4 + "@babel/helper-environment-visitor": ^7.22.20 + "@babel/helper-function-name": ^7.23.0 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/parser": ^7.23.4 + "@babel/plugin-proposal-class-properties": ^7.18.6 + "@babel/plugin-transform-jscript": ^7.23.3 + "@babel/preset-env": ^7.23.3 + "@babel/preset-typescript": ^7.23.3 + "@babel/types": ^7.23.4 + "@types/jest": ^27.5.2 + "@types/jsdom": ^16.2.15 + "@types/node": ^17.0.45 + "@types/webpack": ^5.28.5 + "@types/webpack-env": ^1.18.4 + "@typescript-eslint/parser": ^5.62.0 + babel-jest: ^28.1.3 + babel-loader: ^8.3.0 + babel-plugin-inferno: ^6.7.0 babel-plugin-transform-remove-console: ^6.9.4 common: "workspace:*" - css-loader: ^6.7.1 - eslint: ^8.16.0 - eslint-config-prettier: ^8.5.0 + css-loader: ^6.8.1 + debug: ^4.3.4 + eslint: ^8.54.0 + eslint-config-prettier: ^8.10.0 eslint-plugin-radar: ^0.2.1 - eslint-plugin-react: ^7.30.0 - eslint-plugin-unused-imports: ^2.0.0 - inferno: ^7.4.11 - jest: ^28.1.0 - jest-circus: ^28.1.0 - jest-environment-jsdom: ^28.1.0 - jsdom: ^19.0.0 - katex: ^0.15.1 - mini-css-extract-plugin: ^2.6.0 - sass: ^1.52.1 - sass-loader: ^13.0.0 - style-loader: ^3.3.1 - terser-webpack-plugin: ^5.3.1 - typescript: ^4.6.4 + eslint-plugin-react: ^7.33.2 + eslint-plugin-unused-imports: ^3.0.0 + globals: ^13.23.0 + inferno: ^8.2.2 + jest: ^28.1.3 + jest-circus: ^28.1.3 + jest-environment-jsdom: ^28.1.3 + jsdom: ^22.1.0 + katex: ^0.15.6 + mini-css-extract-plugin: ^2.7.6 + sass: ^1.69.5 + sass-loader: ^13.3.2 + style-loader: ^3.3.3 + terser-webpack-plugin: ^5.3.9 + typescript: ^4.9.5 url-loader: ^4.1.1 - webpack: ^5.76.0 - webpack-bundle-analyzer: ^4.5.0 - webpack-cli: ^4.9.2 + webpack: ^5.89.0 + webpack-bundle-analyzer: ^4.10.1 + webpack-cli: ^4.10.0 languageName: unknown linkType: soft @@ -8880,15 +9784,15 @@ resolve@^2.0.0-next.3: version: 0.0.0-use.local resolution: "tgui@workspace:packages/tgui" dependencies: - "@popperjs/core": ^2.9.3 + "@popperjs/core": ^2.11.8 common: "workspace:*" - dateformat: ^4.5.1 - dompurify: ^2.3.1 - inferno: ^7.4.8 - inferno-vnode-flags: ^7.4.8 + dateformat: ^4.6.3 + dompurify: ^2.4.7 + inferno: ^7.4.11 + inferno-vnode-flags: ^7.4.11 js-yaml: ^4.1.0 - katex: ^0.15.1 - marked: ^4.0.10 + katex: ^0.15.6 + marked: ^4.3.0 tgui-dev-server: "workspace:*" tgui-polyfill: "workspace:*" languageName: unknown @@ -8927,10 +9831,10 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"totalist@npm:^1.0.0": - version: 1.1.0 - resolution: "totalist@npm:1.1.0" - checksum: dfab80c7104a1d170adc8c18782d6c04b7df08352dec452191208c66395f7ef2af7537ddfa2cf1decbdcfab1a47afbbf0dec6543ea191da98c1c6e1599f86adc +"totalist@npm:^3.0.0": + version: 3.0.1 + resolution: "totalist@npm:3.0.1" + checksum: 5132d562cf88ff93fd710770a92f31dbe67cc19b5c6ccae2efc0da327f0954d211bbfd9456389655d726c624f284b4a23112f56d1da931ca7cfabbe1f45e778a languageName: node linkType: hard @@ -8945,6 +9849,18 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"tough-cookie@npm:^4.1.2": + version: 4.1.3 + resolution: "tough-cookie@npm:4.1.3" + dependencies: + psl: ^1.1.33 + punycode: ^2.1.1 + universalify: ^0.2.0 + url-parse: ^1.5.3 + checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc + languageName: node + linkType: hard + "tough-cookie@npm:~2.5.0": version: 2.5.0 resolution: "tough-cookie@npm:2.5.0" @@ -8964,6 +9880,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"tr46@npm:^4.1.1": + version: 4.1.1 + resolution: "tr46@npm:4.1.1" + dependencies: + punycode: ^2.3.0 + checksum: aeeb821ac2cd792e63ec84888b4fd6598ac6ed75d861579e21a5cf9d4ee78b2c6b94e7d45036f2ca2088bc85b9b46560ad23c4482979421063b24137349dbd96 + languageName: node + linkType: hard + "tslib@npm:^1.8.1, tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" @@ -9103,23 +10028,70 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"typescript@npm:^4.6.4": - version: 4.8.2 - resolution: "typescript@npm:4.8.2" +"typed-array-buffer@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-buffer@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + is-typed-array: ^1.1.10 + checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3 + languageName: node + linkType: hard + +"typed-array-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94 + languageName: node + linkType: hard + +"typed-array-byte-offset@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-offset@npm:1.0.0" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b + languageName: node + linkType: hard + +"typed-array-length@npm:^1.0.4": + version: 1.0.4 + resolution: "typed-array-length@npm:1.0.4" + dependencies: + call-bind: ^1.0.2 + for-each: ^0.3.3 + is-typed-array: ^1.1.9 + checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956 + languageName: node + linkType: hard + +"typescript@npm:^4.9.5": + version: 4.9.5 + resolution: "typescript@npm:4.9.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 7f5b81d0d558c9067f952c7af52ab7f19c2e70a916817929e4a5b256c93990bf3178eccb1ac8a850bc75df35f6781b6f4cb3370ce20d8b1ded92ed462348f628 + checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db languageName: node linkType: hard -"typescript@patch:typescript@^4.6.4#~builtin": - version: 4.8.2 - resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin::version=4.8.2&hash=3b564f" +"typescript@patch:typescript@^4.9.5#~builtin": + version: 4.9.5 + resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=23ec76" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 28e130a49d9330b64b8229ad336247bf980e9a705c5850f30a859a68c051e8e68e367b3275f119da4a825dca71ad0fe315964a1315d4a381c0021bca5eeeb62e + checksum: ab417a2f398380c90a6cf5a5f74badd17866adf57f1165617d6a551f059c3ba0a3e4da0d147b3ac5681db9ac76a303c5876394b13b3de75fdd5b1eaa06181c9d languageName: node linkType: hard @@ -9156,17 +10128,10 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"unfetch@npm:^4.2.0": - version: 4.2.0 - resolution: "unfetch@npm:4.2.0" - checksum: 6a4b2557e1d921eaa80c4425ce27a404945ec26491ed06e62598f333996a91a44c7908cb26dc7c2746d735762b13276cf4aa41829b4c8f438dde63add3045d7a - languageName: node - linkType: hard - -"unicode-canonical-property-names-ecmascript@npm:^1.0.4": - version: 1.0.4 - resolution: "unicode-canonical-property-names-ecmascript@npm:1.0.4" - checksum: cc1973b18d0e1a151711e5551f87f4b3086c4f542cd5142aa691307d5720fd725fa7d36c24e12e944e108b91c72554237b0c236772d35592839434da5506c40f +"unfetch@npm:^5.0.0": + version: 5.0.0 + resolution: "unfetch@npm:5.0.0" + checksum: 005133bcdc85cefea60890af4ac265799356b69c6a7719c1330484165af7109c06b9eedd3e03d620c14dcc8b43bcf329148f4c1f06016390162f845e0d0a62c5 languageName: node linkType: hard @@ -9177,16 +10142,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"unicode-match-property-ecmascript@npm:^1.0.4": - version: 1.0.4 - resolution: "unicode-match-property-ecmascript@npm:1.0.4" - dependencies: - unicode-canonical-property-names-ecmascript: ^1.0.4 - unicode-property-aliases-ecmascript: ^1.0.4 - checksum: 08e269fac71b5ace0f8331df9e87b9b533fe97b00c43ea58de69ae81816581490f846050e0c472279a3e7434524feba99915a93816f90dbbc0a30bcbd082da88 - languageName: node - linkType: hard - "unicode-match-property-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-match-property-ecmascript@npm:2.0.0" @@ -9197,13 +10152,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"unicode-match-property-value-ecmascript@npm:^1.2.0": - version: 1.2.0 - resolution: "unicode-match-property-value-ecmascript@npm:1.2.0" - checksum: 2e663cfec8e2cf317b69613566314979f717034ea8f58a237dd63234795044a87337410064fe839774d71e1d7e12195520e9edd69ed8e28f2a9eb28a2db38595 - languageName: node - linkType: hard - "unicode-match-property-value-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-match-property-value-ecmascript@npm:2.0.0" @@ -9211,10 +10159,10 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"unicode-property-aliases-ecmascript@npm:^1.0.4": - version: 1.1.0 - resolution: "unicode-property-aliases-ecmascript@npm:1.1.0" - checksum: 1a96dc462d251bb1c5237f7bc77956b29f01cefce7f3e7448430742930961557c3d1515a9669715ebb06209bf01072e2f78ba1627247017daa84346414bc02f1 +"unicode-match-property-value-ecmascript@npm:^2.1.0": + version: 2.1.0 + resolution: "unicode-match-property-value-ecmascript@npm:2.1.0" + checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220 languageName: node linkType: hard @@ -9257,6 +10205,27 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"universalify@npm:^0.2.0": + version: 0.2.0 + resolution: "universalify@npm:0.2.0" + checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5 + languageName: node + linkType: hard + +"update-browserslist-db@npm:^1.0.13": + version: 1.0.13 + resolution: "update-browserslist-db@npm:1.0.13" + dependencies: + escalade: ^3.1.1 + picocolors: ^1.0.0 + peerDependencies: + browserslist: ">= 4.21.0" + bin: + update-browserslist-db: cli.js + checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322 + languageName: node + linkType: hard + "update-browserslist-db@npm:^1.0.5": version: 1.0.5 resolution: "update-browserslist-db@npm:1.0.5" @@ -9315,6 +10284,16 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"url-parse@npm:^1.5.3": + version: 1.5.10 + resolution: "url-parse@npm:1.5.10" + dependencies: + querystringify: ^2.1.1 + requires-port: ^1.0.0 + checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf + languageName: node + linkType: hard + "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" @@ -9383,6 +10362,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"w3c-xmlserializer@npm:^4.0.0": + version: 4.0.0 + resolution: "w3c-xmlserializer@npm:4.0.0" + dependencies: + xml-name-validator: ^4.0.0 + checksum: eba070e78deb408ae8defa4d36b429f084b2b47a4741c4a9be3f27a0a3d1845e277e3072b04391a138f7e43776842627d1334e448ff13ff90ad9fb1214ee7091 + languageName: node + linkType: hard + "walker@npm:^1.0.8": version: 1.0.8 resolution: "walker@npm:1.0.8" @@ -9409,26 +10397,30 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"webpack-bundle-analyzer@npm:^4.5.0": - version: 4.6.1 - resolution: "webpack-bundle-analyzer@npm:4.6.1" +"webpack-bundle-analyzer@npm:^4.10.1": + version: 4.10.1 + resolution: "webpack-bundle-analyzer@npm:4.10.1" dependencies: + "@discoveryjs/json-ext": 0.5.7 acorn: ^8.0.4 acorn-walk: ^8.0.0 - chalk: ^4.1.0 commander: ^7.2.0 + debounce: ^1.2.1 + escape-string-regexp: ^4.0.0 gzip-size: ^6.0.0 - lodash: ^4.17.20 + html-escaper: ^2.0.2 + is-plain-object: ^5.0.0 opener: ^1.5.2 - sirv: ^1.0.7 + picocolors: ^1.0.0 + sirv: ^2.0.3 ws: ^7.3.1 bin: webpack-bundle-analyzer: lib/bin/analyzer.js - checksum: 4bc97ac6a1d9cd1f133444b0fc9d9091c97f4bd8388f97636ce27abd1ebffaa7dd45d29f6693661a666e77bcc08dff43ab7c2f5e2600a3101b956c94c1d038d0 + checksum: 77f48f10a493b1cc95674526472978a2de32412ddbf556bd3903738f14890611426f19477352993efe5a9fd6ca16711eb912d986f2221b17ba6eeca1b6f71fb6 languageName: node linkType: hard -"webpack-cli@npm:^4.9.2": +"webpack-cli@npm:^4.10.0": version: 4.10.0 resolution: "webpack-cli@npm:4.10.0" dependencies: @@ -9515,21 +10507,21 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"webpack@npm:^5.76.0": - version: 5.76.1 - resolution: "webpack@npm:5.76.1" +"webpack@npm:^5.89.0": + version: 5.89.0 + resolution: "webpack@npm:5.89.0" dependencies: "@types/eslint-scope": ^3.7.3 - "@types/estree": ^0.0.51 - "@webassemblyjs/ast": 1.11.1 - "@webassemblyjs/wasm-edit": 1.11.1 - "@webassemblyjs/wasm-parser": 1.11.1 + "@types/estree": ^1.0.0 + "@webassemblyjs/ast": ^1.11.5 + "@webassemblyjs/wasm-edit": ^1.11.5 + "@webassemblyjs/wasm-parser": ^1.11.5 acorn: ^8.7.1 - acorn-import-assertions: ^1.7.6 + acorn-import-assertions: ^1.9.0 browserslist: ^4.14.5 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.10.0 - es-module-lexer: ^0.9.0 + enhanced-resolve: ^5.15.0 + es-module-lexer: ^1.2.1 eslint-scope: 5.1.1 events: ^3.2.0 glob-to-regexp: ^0.4.1 @@ -9538,9 +10530,9 @@ resolve@^2.0.0-next.3: loader-runner: ^4.2.0 mime-types: ^2.1.27 neo-async: ^2.6.2 - schema-utils: ^3.1.0 + schema-utils: ^3.2.0 tapable: ^2.1.1 - terser-webpack-plugin: ^5.1.3 + terser-webpack-plugin: ^5.3.7 watchpack: ^2.4.0 webpack-sources: ^3.2.3 peerDependenciesMeta: @@ -9548,7 +10540,7 @@ resolve@^2.0.0-next.3: optional: true bin: webpack: bin/webpack.js - checksum: b01fe0bc2dbca0e10d290ddb0bf81e807a031de48028176e2b21afd696b4d3f25ab9accdad888ef4a1f7c7f4d41f13d5bf2395b7653fdf3e5e3dafa54e56dab2 + checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed languageName: node linkType: hard @@ -9588,6 +10580,16 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"whatwg-url@npm:^12.0.0, whatwg-url@npm:^12.0.1": + version: 12.0.1 + resolution: "whatwg-url@npm:12.0.1" + dependencies: + tr46: ^4.1.1 + webidl-conversions: ^7.0.0 + checksum: 8698993b763c1e7eda5ed16c31dab24bca6489626aca7caf8b5a2b64684dda6578194786f10ec42ceb1c175feea16d0a915096e6419e08d154ce551c43176972 + languageName: node + linkType: hard + "which-boxed-primitive@npm:^1.0.2": version: 1.0.2 resolution: "which-boxed-primitive@npm:1.0.2" @@ -9601,6 +10603,51 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"which-builtin-type@npm:^1.1.3": + version: 1.1.3 + resolution: "which-builtin-type@npm:1.1.3" + dependencies: + function.prototype.name: ^1.1.5 + has-tostringtag: ^1.0.0 + is-async-function: ^2.0.0 + is-date-object: ^1.0.5 + is-finalizationregistry: ^1.0.2 + is-generator-function: ^1.0.10 + is-regex: ^1.1.4 + is-weakref: ^1.0.2 + isarray: ^2.0.5 + which-boxed-primitive: ^1.0.2 + which-collection: ^1.0.1 + which-typed-array: ^1.1.9 + checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36 + languageName: node + linkType: hard + +"which-collection@npm:^1.0.1": + version: 1.0.1 + resolution: "which-collection@npm:1.0.1" + dependencies: + is-map: ^2.0.1 + is-set: ^2.0.1 + is-weakmap: ^2.0.1 + is-weakset: ^2.0.1 + checksum: c815bbd163107ef9cb84f135e6f34453eaf4cca994e7ba85ddb0d27cea724c623fae2a473ceccfd5549c53cc65a5d82692de418166df3f858e1e5dc60818581c + languageName: node + linkType: hard + +"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.9": + version: 1.1.13 + resolution: "which-typed-array@npm:1.1.13" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.4 + for-each: ^0.3.3 + gopd: ^1.0.1 + has-tostringtag: ^1.0.0 + checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309 + languageName: node + linkType: hard + "which@npm:^2.0.1, which@npm:^2.0.2": version: 2.0.2 resolution: "which@npm:2.0.2" @@ -9628,10 +10675,10 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f +"word-wrap@npm:~1.2.3": + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb languageName: node linkType: hard @@ -9670,7 +10717,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"ws@npm:^7.3.1, ws@npm:^7.5.3": +"ws@npm:^7.3.1": version: 7.5.5 resolution: "ws@npm:7.5.5" peerDependencies: @@ -9685,6 +10732,36 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"ws@npm:^7.5.9": + version: 7.5.9 + resolution: "ws@npm:7.5.9" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ^5.0.2 + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138 + languageName: node + linkType: hard + +"ws@npm:^8.13.0": + version: 8.14.2 + resolution: "ws@npm:8.14.2" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ">=5.0.2" + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 3ca0dad26e8cc6515ff392b622a1467430814c463b3368b0258e33696b1d4bed7510bc7030f7b72838b9fdeb8dbd8839cbf808367d6aae2e1d668ce741d4308b + languageName: node + linkType: hard + "ws@npm:^8.2.3": version: 8.8.1 resolution: "ws@npm:8.8.1" @@ -9721,6 +10798,13 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"yallist@npm:^3.0.2": + version: 3.1.1 + resolution: "yallist@npm:3.1.1" + checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d + languageName: node + linkType: hard + "yallist@npm:^4.0.0": version: 4.0.0 resolution: "yallist@npm:4.0.0"