diff --git a/code/game/machinery/syndicatebeacon_vr.dm b/code/game/machinery/syndicatebeacon_vr.dm new file mode 100644 index 0000000000..15a663ddc6 --- /dev/null +++ b/code/game/machinery/syndicatebeacon_vr.dm @@ -0,0 +1,42 @@ +// Virgo modified syndie beacon, does not give objectives + +/obj/machinery/syndicate_beacon/virgo/attack_hand(var/mob/user as mob) + usr.set_machine(src) + var/dat = "Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...
Identity confirmed,
" + if(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon/ai)) + if(is_special_character(user)) + dat += "Operative record found. Greetings, Agent [user.name].
" + else if(charges < 1) + dat += "Connection severed.
" + else + var/honorific = "Mr." + if(user.gender == FEMALE) + honorific = "Ms." + dat += "Identity not found in operative database. What can the Black Market do for you today, [honorific] [user.name]?
" + if(!selfdestructing) + dat += "

\"[pick("Send me some supplies!", "Transfer supplies.")]\"
" + dat += temptext + user << browse(dat, "window=syndbeacon") + onclose(user, "syndbeacon") + +/obj/machinery/syndicate_beacon/virgo/Topic(href, href_list) + if(..()) + return + if(href_list["betraitor"]) + if(charges < 1) + updateUsrDialog() + return + var/mob/M = locate(href_list["traitormob"]) + if(M.mind.special_role || jobban_isbanned(M, "Syndicate")) + temptext = "We have no need for you at this time. Have a pleasant day.
" + updateUsrDialog() + return + charges -= 1 + if(istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/N = M + to_chat(N, "Access granted, here are the supplies!") + traitors.equip(N) + message_admins("[N]/([N.ckey]) has recieved an uplink and telecrystals from the syndicate beacon.") + + updateUsrDialog() + return diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/space_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/space_vr.dm new file mode 100644 index 0000000000..082f6342d0 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/space_vr.dm @@ -0,0 +1,3 @@ +// Fix for Virgo 2's Surface +/mob/living/simple_mob/animal/space + maxbodytemp = 700 \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical_vr.dm new file mode 100644 index 0000000000..307f7c715d --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mechanical_vr.dm @@ -0,0 +1,3 @@ +// Fix for Virgo 2's Surface +/mob/living/simple_mob/mechanical + maxbodytemp = 700 \ No newline at end of file diff --git a/maps/submaps/surface_submaps/mountains/mountains_areas_vr.dm b/maps/submaps/surface_submaps/mountains/mountains_areas_vr.dm new file mode 100644 index 0000000000..8fb98ffe54 --- /dev/null +++ b/maps/submaps/surface_submaps/mountains/mountains_areas_vr.dm @@ -0,0 +1,2 @@ +/area/submap/cave + base_turf = /turf/simulated/mineral/floor/ignore_mapgen/cave diff --git a/maps/tether/submaps/aerostat/submaps/CaveS.dmm b/maps/tether/submaps/aerostat/submaps/CaveS.dmm index 520021efe9..db8ec8a9b3 100644 --- a/maps/tether/submaps/aerostat/submaps/CaveS.dmm +++ b/maps/tether/submaps/aerostat/submaps/CaveS.dmm @@ -12,11 +12,6 @@ "d" = ( /turf/simulated/mineral/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) -"e" = ( -/obj/item/ammo_casing/a45, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, -/turf/template_noop, -/area/submap/virgo2/CaveS) "f" = ( /obj/tether_away_spawner/aerostat_surface, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, @@ -30,10 +25,6 @@ /obj/item/ammo_casing/a45, /turf/template_noop, /area/submap/virgo2/CaveS) -"i" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, -/turf/template_noop, -/area/submap/virgo2/CaveS) "j" = ( /obj/item/clothing/accessory/storage/webbing, /obj/item/weapon/material/knife/tacknife/combatknife, @@ -47,10 +38,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) -"m" = ( -/mob/living/simple_mob/animal/giant_spider/lurker, -/turf/simulated/mineral/floor/ignore_mapgen/virgo2, -/area/submap/virgo2/CaveS) "n" = ( /obj/effect/decal/cleanable/cobweb2, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, @@ -59,11 +46,6 @@ /obj/effect/mine, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) -"q" = ( -/obj/effect/decal/cleanable/cobweb2, -/mob/living/simple_mob/animal/giant_spider/lurker, -/turf/simulated/mineral/floor/ignore_mapgen/virgo2, -/area/submap/virgo2/CaveS) "r" = ( /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/CaveS) @@ -133,11 +115,6 @@ /obj/item/weapon/material/star, /turf/simulated/floor, /area/submap/virgo2/CaveS) -"D" = ( -/obj/effect/spider/stickyweb, -/mob/living/simple_mob/animal/giant_spider/lurker, -/turf/simulated/mineral/floor/ignore_mapgen/virgo2, -/area/submap/virgo2/CaveS) "E" = ( /obj/structure/cable{ d1 = 1; @@ -685,7 +662,7 @@ d d g r -m +r d r r @@ -699,7 +676,7 @@ d r r d -m +r d d d @@ -861,7 +838,7 @@ r r d d -m +r r r r @@ -911,8 +888,8 @@ d d d g -D -r +g +f d d d @@ -985,7 +962,7 @@ d l r r -m +r d d r @@ -1016,7 +993,7 @@ b b b b -i +b b d d @@ -1140,7 +1117,7 @@ b c b b -r +f r g d @@ -1180,7 +1157,7 @@ b b b c -e +c d g r @@ -1292,7 +1269,7 @@ u u r r -m +r d d d @@ -1320,7 +1297,7 @@ d d d d -q +n r r d @@ -1333,7 +1310,7 @@ y B E u -r +f r d d @@ -1366,7 +1343,7 @@ d r r d -m +r r u u @@ -1539,7 +1516,7 @@ d r r r -r +f r d d diff --git a/maps/tether/submaps/aerostat/submaps/DJOutpost1.dmm b/maps/tether/submaps/aerostat/submaps/DJOutpost1.dmm index 8a72f7e8ff..e8524d220a 100644 --- a/maps/tether/submaps/aerostat/submaps/DJOutpost1.dmm +++ b/maps/tether/submaps/aerostat/submaps/DJOutpost1.dmm @@ -4,32 +4,32 @@ /area/template_noop) "b" = ( /turf/simulated/wall/virgo2, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "c" = ( /obj/structure/grille/broken, /obj/item/weapon/material/shard, /obj/item/weapon/material/shard{ - icon_state = "shardmedium" + icon_state = "shardmedium" }, /obj/item/stack/rods, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "d" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "e" = ( /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "f" = ( /obj/machinery/telecomms/relay/preset/ruskie, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "g" = ( /obj/structure/loot_pile/maint/technical, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "h" = ( /obj/structure/sign/goldenplaque{ desc = "An award given to Sif Free Radio for media excellency. It looks fake."; @@ -37,11 +37,7 @@ pixel_y = 30 }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) -"i" = ( -/mob/living/simple_mob/animal/giant_spider/frost, -/turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "j" = ( /obj/effect/decal/remains, /obj/effect/decal/cleanable/blood, @@ -49,19 +45,19 @@ /obj/item/weapon/material/knife/tacknife/combatknife, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "k" = ( /obj/machinery/door/airlock/glass, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "l" = ( /obj/structure/table/steel_reinforced, /obj/item/device/radio/intercom{ - icon_state = "intercom"; + icon_state = "intercom"; dir = 8 }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "m" = ( /obj/machinery/computer/message_monitor, /obj/item/weapon/paper/monitorkey, @@ -71,7 +67,7 @@ icon_state = "2-4" }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "n" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -82,7 +78,7 @@ pixel_x = 0 }, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "o" = ( /obj/effect/overlay/snow/floor, /obj/structure/cable/yellow{ @@ -93,29 +89,25 @@ /turf/simulated/floor{ outdoors = 1 }, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "p" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "q" = ( /obj/effect/decal/remains, /obj/item/clothing/under/dress/blacktango, /obj/effect/decal/cleanable/blood, /obj/item/device/universal_translator/ear, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) -"r" = ( -/obj/random/mob/spider/mutant, -/turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "s" = ( /obj/structure/bed/chair/office/dark{ - icon_state = "officechair_dark"; + icon_state = "officechair_dark"; dir = 8 }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "t" = ( /obj/machinery/light{ dir = 4; @@ -131,7 +123,7 @@ icon_state = "1-2" }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "u" = ( /obj/effect/overlay/snow/floor, /obj/structure/cable/yellow{ @@ -146,19 +138,19 @@ /turf/simulated/floor{ outdoors = 1 }, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "v" = ( /obj/structure/table/woodentable, /obj/item/trash/candle, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "w" = ( /obj/structure/bed/chair/wood{ - icon_state = "wooden_chair"; + icon_state = "wooden_chair"; dir = 8 }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "x" = ( /obj/structure/bookcase, /obj/item/weapon/book/codex/lore/vir, @@ -166,17 +158,17 @@ /obj/item/weapon/book/manual/engineering_construction, /obj/item/weapon/storage/bible, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "y" = ( /obj/item/weapon/storage/toolbox/mechanical, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "z" = ( /obj/structure/table/steel_reinforced, /obj/item/device/radio/phone, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "A" = ( /obj/structure/table/steel_reinforced, /obj/item/device/radio/intercom/syndicate{ @@ -185,7 +177,7 @@ }, /obj/item/device/multitool, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "B" = ( /obj/structure/table/steel_reinforced, /obj/item/device/radio, @@ -202,7 +194,7 @@ }, /obj/structure/cable/yellow, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "C" = ( /obj/effect/overlay/snow/floor, /obj/machinery/power/port_gen/pacman, @@ -210,16 +202,16 @@ /turf/simulated/floor{ outdoors = 1 }, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "D" = ( /obj/machinery/door/airlock/glass, /obj/item/device/gps/internal/poi, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "E" = ( /obj/machinery/biogenerator, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "F" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/snacks/unajerky, @@ -229,7 +221,7 @@ }, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "G" = ( /obj/machinery/light{ dir = 4; @@ -238,18 +230,18 @@ }, /obj/machinery/seed_extractor, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "H" = ( /obj/structure/bed/chair/wood{ - icon_state = "wooden_chair"; + icon_state = "wooden_chair"; dir = 1 }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "I" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "J" = ( /obj/structure/table/woodentable, /obj/item/weapon/material/knife/machete/hatchet, @@ -258,22 +250,22 @@ /obj/item/device/analyzer/plant_analyzer, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "K" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "L" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/boots/winter, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/random_multi/single_item/sfr_headset, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "M" = ( /obj/machinery/light/flamp, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "N" = ( /obj/structure/sink{ dir = 4; @@ -281,18 +273,18 @@ pixel_x = 15 }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "O" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/clown, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "P" = ( /obj/structure/table/rack, /obj/item/ammo_magazine/clip/c762/hunter, /obj/item/weapon/gun/projectile/shotgun/pump/rifle, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "Q" = ( /obj/structure/table/rack, /obj/item/device/flashlight/lantern, @@ -300,11 +292,15 @@ gps_tag = "Sif Free Radio" }, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "R" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/wood, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) +"Z" = ( +/obj/tether_away_spawner/aerostat_inside, +/turf/simulated/floor/wood, +/area/submap/virgo2/DJOutpost1) (1,1,1) = {" a @@ -362,11 +358,11 @@ a b b e -i e +Z w b -r +e e e K @@ -417,7 +413,7 @@ k b b b -e +Z e b L @@ -437,8 +433,8 @@ D e e I -r e +Z I a "} @@ -447,8 +443,8 @@ a b g e +Z e -r e b e diff --git a/maps/tether/submaps/aerostat/submaps/DJOutpost2.dmm b/maps/tether/submaps/aerostat/submaps/DJOutpost2.dmm index c0be156121..96b1221ee1 100644 --- a/maps/tether/submaps/aerostat/submaps/DJOutpost2.dmm +++ b/maps/tether/submaps/aerostat/submaps/DJOutpost2.dmm @@ -4,7 +4,7 @@ /area/template_noop) "b" = ( /turf/simulated/wall/virgo2, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "c" = ( /obj/structure/grille/broken, /obj/item/weapon/material/shard, @@ -13,19 +13,19 @@ }, /obj/item/stack/rods, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "d" = ( /obj/structure/grille/broken, /obj/item/weapon/material/shard, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "e" = ( /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "f" = ( /obj/structure/loot_pile/maint/technical, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "g" = ( /obj/structure/sign/goldenplaque{ desc = "An award given to Sif Free Radio for media excellency. It looks fake."; @@ -33,7 +33,7 @@ pixel_y = 30 }, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "h" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -42,15 +42,15 @@ }, /obj/structure/loot_pile/maint/technical, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "i" = ( /obj/structure/loot_pile/surface/bones, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "k" = ( /obj/structure/girder, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "l" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -61,53 +61,53 @@ icon_state = "1-2" }, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "m" = ( /obj/structure/table/steel_reinforced, /obj/item/device/radio/phone, /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "n" = ( /obj/item/stack/rods, /turf/template_noop, /area/template_noop) "o" = ( /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "p" = ( /obj/structure/loot_pile/surface/bones, /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "q" = ( /obj/structure/table/steel_reinforced, /obj/item/device/radio, /obj/structure/cable/yellow, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "r" = ( /turf/simulated/floor/outdoors/rocks, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "s" = ( /obj/effect/overlay/snow/floor, /turf/simulated/floor{ outdoors = 1 }, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "u" = ( /obj/effect/decal/cleanable/ash, /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "w" = ( /obj/structure/grille/broken, /obj/item/weapon/material/shard{ icon_state = "shardmedium" }, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "x" = ( /obj/structure/girder, /turf/simulated/floor/outdoors/rocks, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "y" = ( /obj/structure/table/steel_reinforced, /obj/item/device/radio/intercom/syndicate{ @@ -115,15 +115,15 @@ name = "station intercom (General)" }, /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "A" = ( /obj/item/stack/rods, /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "B" = ( /obj/structure/door_assembly/door_assembly_ext, /turf/simulated/floor/outdoors/rocks, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "C" = ( /obj/structure/grille/broken, /obj/item/weapon/material/shard{ @@ -135,7 +135,7 @@ icon_state = "4-8" }, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "D" = ( /obj/item/weapon/material/shard{ icon_state = "shardmedium" @@ -145,14 +145,14 @@ "F" = ( /obj/item/device/transfer_valve, /turf/simulated/floor/outdoors/rocks, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "G" = ( /obj/structure/grille/broken, /obj/item/weapon/material/shard{ icon_state = "medium" }, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "H" = ( /obj/item/weapon/material/shard{ icon_state = "medium" @@ -162,7 +162,7 @@ "I" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "J" = ( /obj/item/weapon/material/shard, /turf/template_noop, @@ -174,11 +174,11 @@ pixel_x = 15 }, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "L" = ( /obj/item/weapon/storage/toolbox/mechanical, /turf/simulated/floor/outdoors/rocks, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "M" = ( /obj/structure/grille/broken, /obj/item/weapon/material/shard{ @@ -186,24 +186,24 @@ }, /obj/item/stack/rods, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "N" = ( /obj/structure/grille/broken, /obj/item/stack/rods, /turf/simulated/floor, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "O" = ( /obj/structure/lattice, /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "P" = ( /obj/effect/decal/cleanable/ash, /turf/simulated/floor/wood/broken, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) "S" = ( /obj/structure/girder, /turf/simulated/floor/outdoors/dirt, -/area/submap/DJOutpost1) +/area/submap/virgo2/DJOutpost1) (1,1,1) = {" a diff --git a/maps/tether/submaps/aerostat/submaps/DecoupledEngine.dmm b/maps/tether/submaps/aerostat/submaps/DecoupledEngine.dmm index 42bcf0455b..853351c02e 100644 --- a/maps/tether/submaps/aerostat/submaps/DecoupledEngine.dmm +++ b/maps/tether/submaps/aerostat/submaps/DecoupledEngine.dmm @@ -50,10 +50,7 @@ /turf/template_noop, /area/submap/virgo2/DecoupledEngine) "an" = ( -/turf/simulated/floor/water{ - color = "#ddaa77"; - name = "shallow water(?)" - }, +/turf/simulated/floor/lava, /area/submap/virgo2/DecoupledEngine) "ao" = ( /obj/structure/lattice, @@ -222,10 +219,7 @@ icon_state = "propulsion_r"; dir = 4 }, -/turf/simulated/floor/water{ - color = "#ddaa77"; - name = "shallow water(?)" - }, +/turf/simulated/floor/lava, /area/submap/virgo2/DecoupledEngine) "aP" = ( /obj/effect/floor_decal/rust, @@ -302,10 +296,7 @@ /obj/structure/shuttle/engine/propulsion{ dir = 4 }, -/turf/simulated/floor/water{ - color = "#ddaa77"; - name = "shallow water(?)" - }, +/turf/simulated/floor/lava, /area/submap/virgo2/DecoupledEngine) "aZ" = ( /obj/item/stack/material/steel, diff --git a/maps/tether/submaps/aerostat/submaps/DoomP.dmm b/maps/tether/submaps/aerostat/submaps/DoomP.dmm index e3509b9050..7d23c3c59e 100644 --- a/maps/tether/submaps/aerostat/submaps/DoomP.dmm +++ b/maps/tether/submaps/aerostat/submaps/DoomP.dmm @@ -4,114 +4,106 @@ /area/template_noop) "ab" = ( /turf/template_noop, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "ac" = ( /turf/simulated/floor/outdoors/rocks, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "ad" = ( -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) "ae" = ( /mob/living/simple_mob/mechanical/viscerator, -/turf/template_noop, -/area/submap/DoomP) +/turf/simulated/floor/outdoors/rocks, +/area/submap/virgo2/DoomP) "af" = ( -/turf/simulated/floor/water, -/area/submap/DoomP) +/turf/simulated/floor/lava, +/area/submap/virgo2/DoomP) "ag" = ( /obj/structure/flora/tree/sif, -/turf/template_noop, -/area/submap/DoomP) +/turf/simulated/floor/outdoors/rocks, +/area/submap/virgo2/DoomP) "ah" = ( /obj/random/landmine, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) "ai" = ( /mob/living/simple_mob/mechanical/viscerator, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) -"aj" = ( -/obj/effect/decal/cleanable/blood, -/obj/random/landmine, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) -"ak" = ( -/turf/simulated/floor/water/deep, -/area/submap/DoomP) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) "al" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) +/obj/effect/decal/remains/mouse, +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) "am" = ( /obj/random/landmine, /turf/simulated/floor/outdoors/rocks, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "an" = ( -/obj/effect/decal/remains/mouse, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) -"ao" = ( /obj/effect/decal/remains/deer, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) -"ap" = ( +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) +"ao" = ( /obj/effect/decal/remains/mouse, /obj/random/landmine, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) -"aq" = ( +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) +"ap" = ( /obj/structure/flora/tree/sif, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) -"ar" = ( +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) +"aq" = ( /obj/machinery/light/small, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) +"ar" = ( +/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced, +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) "as" = ( /obj/machinery/porta_turret/poi, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "at" = ( /turf/simulated/wall/r_wall, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "au" = ( /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "av" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aw" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "ax" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "ay" = ( /obj/structure/bed/chair, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "az" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aA" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, /mob/living/simple_mob/humanoid/merc/ranged/space, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aB" = ( /obj/machinery/light/small{ dir = 1 @@ -120,20 +112,20 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aC" = ( /obj/machinery/vending/cigarette, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aD" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aE" = ( /obj/machinery/power/smes/buildable/point_of_interest, /obj/structure/cable/green{ @@ -141,7 +133,7 @@ icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aF" = ( /obj/machinery/power/smes/buildable/point_of_interest, /obj/structure/cable/green{ @@ -154,7 +146,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aG" = ( /obj/machinery/power/apc{ dir = 1; @@ -167,7 +159,7 @@ icon_state = "0-8" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aH" = ( /obj/structure/cable{ icon_state = "0-2"; @@ -175,27 +167,27 @@ }, /obj/machinery/power/port_gen/pacman, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aI" = ( /obj/structure/table/standard, /obj/random/toolbox, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aJ" = ( /obj/structure/table/standard, /obj/item/stack/material/phoron{ amount = 25 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aK" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aL" = ( /obj/structure/lattice, /turf/simulated/floor/outdoors/rocks, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aM" = ( /obj/structure/bed/chair{ dir = 4 @@ -204,26 +196,26 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aN" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aO" = ( /obj/structure/table/standard, /obj/item/pizzabox, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aP" = ( /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aQ" = ( /obj/machinery/vending/snack, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aR" = ( /obj/machinery/power/terminal{ icon_state = "term"; @@ -234,7 +226,7 @@ d2 = 4 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aS" = ( /obj/machinery/power/terminal{ icon_state = "term"; @@ -251,7 +243,7 @@ pixel_x = 0 }, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aT" = ( /obj/structure/cable{ d1 = 4; @@ -261,7 +253,7 @@ }, /mob/living/simple_mob/humanoid/merc/melee/sword/space, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aU" = ( /obj/structure/cable{ d1 = 1; @@ -269,126 +261,127 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aV" = ( /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aW" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "aX" = ( -/obj/structure/lattice, -/turf/simulated/floor/water, -/area/submap/DoomP) -"aY" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, +/mob/living/simple_mob/humanoid/merc/melee/sword/space, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) +"aY" = ( +/obj/structure/lattice, +/turf/simulated/floor/lava, +/area/submap/virgo2/DoomP) "aZ" = ( /obj/machinery/vending/cola, /obj/effect/floor_decal/borderfloor/corner{ dir = 4 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "ba" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bb" = ( /obj/machinery/door/airlock/engineering, /turf/simulated/floor/tiled/techfloor/grid, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bc" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bd" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "be" = ( /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bf" = ( /obj/machinery/light/small, /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bg" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, /mob/living/simple_mob/humanoid/merc/ranged/space, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bh" = ( /obj/machinery/door/airlock/hatch, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bi" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/tiled, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bj" = ( /obj/machinery/door/airlock/highsecurity, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bk" = ( /obj/machinery/door/airlock, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bl" = ( /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bm" = ( -/obj/structure/table/standard, -/turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/mob/living/simple_mob/humanoid/merc/ranged/space, +/turf/simulated/floor/tiled, +/area/submap/virgo2/DoomP) "bn" = ( /obj/structure/table/standard, /obj/item/weapon/storage/box/syndie_kit/spy, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bo" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/smokes, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bp" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/handcuffs, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bq" = ( /obj/structure/table/rack, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "br" = ( /obj/structure/table/rack, /obj/random/energy, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bs" = ( /obj/structure/table/rack, /obj/item/weapon/gun/projectile/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bt" = ( /obj/structure/bed, /obj/item/weapon/bedsheet, @@ -397,14 +390,14 @@ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bu" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/lime{ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bv" = ( /obj/structure/bed, /obj/item/weapon/bedsheet, @@ -412,7 +405,7 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bw" = ( /obj/structure/table/standard, /obj/item/device/flashlight/lamp, @@ -420,7 +413,7 @@ dir = 5 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bx" = ( /obj/structure/table/standard, /obj/structure/bedsheetbin, @@ -428,16 +421,16 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "by" = ( /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bz" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bA" = ( /obj/structure/sink{ dir = 4; @@ -449,24 +442,21 @@ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bB" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bC" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/full, -/turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/obj/machinery/syndicate_beacon/virgo, +/turf/simulated/floor/tiled/techfloor, +/area/submap/virgo2/DoomP) "bD" = ( /obj/effect/floor_decal/corner/lime{ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bE" = ( /obj/machinery/light/small{ dir = 4; @@ -476,20 +466,20 @@ dir = 10 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bF" = ( /obj/machinery/shower{ dir = 1 }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bG" = ( /obj/structure/toilet{ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bH" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -501,7 +491,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bI" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -510,7 +500,7 @@ /obj/structure/window/reinforced, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bJ" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -522,15 +512,34 @@ }, /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, -/area/submap/DoomP) +/area/submap/virgo2/DoomP) "bK" = ( -/obj/structure/lattice, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/submap/DoomP) +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/full, +/mob/living/simple_mob/humanoid/merc/ranged/space, +/turf/simulated/floor/tiled/white, +/area/submap/virgo2/DoomP) "bL" = ( -/mob/living/simple_mob/humanoid/merc/melee/sword/space, -/turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/mob/living/simple_mob/humanoid/merc/ranged/space, +/turf/simulated/floor/tiled/white, +/area/submap/virgo2/DoomP) +"bM" = ( +/obj/structure/lattice, +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) +"bN" = ( +/obj/machinery/crystal/lava, +/turf/simulated/floor/outdoors/rocks, +/area/submap/virgo2/DoomP) +"bO" = ( +/obj/machinery/crystal/lava, +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/DoomP) (1,1,1) = {" aa @@ -578,55 +587,10 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa "} (2,1,1) = {" aa ab -ae -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab ab ab ab @@ -654,6 +618,21 @@ ab ab ab ab +bN +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac +ac aa "} (3,1,1) = {" @@ -661,109 +640,53 @@ aa ab ab ab +ab +ab +ac +ac +ac ac ac ac ac ac ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac ac ac ab +ag +ac +ac +ac +ac +ac +ac ab ac ac ac +ac +af +af +af +af +af +ac +ac +af +ac +af +af +af +ac +ac aa "} (4,1,1) = {" aa -ab -ab -ac -ac -af -af -af -af -ac -ac -ac +ae ac ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac ac ac ac @@ -772,81 +695,99 @@ af af af af -ac -ac +af +af +af +af ac ac af +af +af +af +af +af ac +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac +ac +ab aa "} (5,1,1) = {" aa -ab -ab -ac -af -af -af -af -af -af -af -af ac ac ac +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac ab ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ab -ag -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac aa "} (6,1,1) = {" aa ab -ab ac +bN +af +af +af +af +af +af +af af af af @@ -857,14 +798,6 @@ af af af af -ac -ac -ac -ac -ae -ac -ac -ac af af af @@ -872,21 +805,6 @@ af af af af -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac af af af @@ -900,14 +818,14 @@ af af af ac -ac +ab +ab ab aa "} (7,1,1) = {" aa ab -ab ac af af @@ -921,10 +839,6 @@ af af af af -ac -ac -ac -ac af af af @@ -935,16 +849,6 @@ af af af af -ac -ac -ab -ab -ab -ab -ab -ac -ac -ac af af af @@ -961,7 +865,7 @@ af af af ac -ac +ab ab ab aa @@ -969,41 +873,6 @@ aa (8,1,1) = {" aa ab -ab -ac -af -af -af -ak -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac -ab -ac -ac -ac ac af af @@ -1021,7 +890,27 @@ af af af af -ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af ac ab ab @@ -1031,13 +920,20 @@ aa (9,1,1) = {" aa ab -ab ac af af af -ak -ak +af +af +af +af +af +af +af +af +af +af af af af @@ -1063,28 +959,6 @@ af af af ac -ac -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac -ab ab ab ab @@ -1093,25 +967,10 @@ aa (10,1,1) = {" aa ab -ab ac ac af af -ak -ak -ak -af -af -af -af -af -af -af -af -af -ak -ak af af af @@ -1137,16 +996,16 @@ af af af af -ak -ak +af +af +af +af +af af af af af ac -ac -ab -ab ab ab ab @@ -1156,25 +1015,9 @@ aa aa ab ab -ab ac af af -ak -ak -ak -ak -ak -af -af -af -af -af -af -af -ak -ak -ak af af af @@ -1194,12 +1037,15 @@ af af af af +as +af +af +as +af af af af af -ak -ak af af af @@ -1210,585 +1056,20 @@ ab ab ab ab -ae -ab aa "} (12,1,1) = {" aa ab ab -ab -ac -af -af -ak -ak -ak -ak -ak -ak -af -af -af -af -af -ak -ak -ak -ak -ak -ak -af -af -af -af -af -af -ak -ak -ak -ak -af -af -af -ak -ak -ak -af -af -ak -ak -af -ak -ak -ak -ak -af -af -ac -ac -ab -ab -ab -ab -ab -ab -aa -"} -(13,1,1) = {" -aa -ab -ab -ab -ac -af -af -ak -ak -ak -ak -ak -ak -ak -af -ak -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -ac -ab -ab -ab -ab -ab -ab -ab -aa -"} -(14,1,1) = {" -aa -ab -ab -ab ac af af af af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak af af -ac -ab -ab -ab -ab -ab -ab -ab -aa -"} -(15,1,1) = {" -aa -ab -ab -ab -ac -ac -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -ac -ab -ab -ab -ab -ab -ab -ab -aa -"} -(16,1,1) = {" -aa -ab -ab -ab -ab -ac -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -ac -ab -ab -ab -ab -ab -ab -ab -aa -"} -(17,1,1) = {" -aa -ab -ab -ab -ab -ac -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -af -ak -ak -ak -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -ak -ak -af -ac -ab -ab -ab -ab -ab -ab -ab -aa -"} -(18,1,1) = {" -aa -ab -ab -ag -ae -ac -af -af -af -af -af -ak -ak -ak -ak -ak -ak -af -af -af -ak -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -ak -ak -af -ac -ab -ab -ab -ag -ab -ab -ac -aa -"} -(19,1,1) = {" -aa -ab -ab -ab -ab -ac -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -af -af -af -ak -af -af -af -af -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af -ac -ac -ab -ab -ab -ab -ac -ac -aa -"} -(20,1,1) = {" -aa -ab -ab -ab -ac -ac -af -af -af -af -ak -ak -ak -ak -ak -ak -af -af -af -af -af -af -af -af -af -af -af -af -af -af -as -af -af -as -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af -af -ac -ab -ac -ac -ac -ac -ac -aa -"} -(21,1,1) = {" -aa -ab -ab -ab -ac -af -af -af -af -af -ak -ak -ak -ak -ak -ak af af af @@ -1806,19 +1087,11 @@ ac aL af af -aX +aY +af +af af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak af af af @@ -1826,92 +1099,70 @@ af af af ac -ac -ac -af -af -af -ac +ab +ab +ab +ab aa "} -(22,1,1) = {" +(13,1,1) = {" aa ab ab +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac +ac +ad +ad +bO +at +at +at +at +at +at +at +at +at +af +af +af +af +af +af +af +ac +ab +ab +ab ab -ac -af -af -af -af -af -ak -ak -ak -ak -ak -af -af -af -af -af -af -af -af -ac -ac -ad -ad -ad -at -at -at -at -at -at -at -at -at -af -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af -af -af -af -af -af -af -af -ac aa "} -(23,1,1) = {" +(14,1,1) = {" aa ab ab ac -ac af af af -ak -ak -ak -ak -ak -ak -ak +af +af +af af af af @@ -1928,27 +1179,13 @@ ad at ax aM -aY +bm bd bj bl bl at af -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af af af af @@ -1956,9 +1193,13 @@ af af af ac +ab +ab +ab +ab aa "} -(24,1,1) = {" +(15,1,1) = {" aa ab ab @@ -1967,12 +1208,7 @@ af af af af -ak -ak -ak -ak -ak -ak +af af af af @@ -1993,34 +1229,24 @@ aN aN be at -bm +bn bl at af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af af af af af af ac +ab +ab +ab +ab aa "} -(25,1,1) = {" +(16,1,1) = {" aa ab ab @@ -2029,11 +1255,6 @@ af af af af -ak -ak -ak -ak -ak af af af @@ -2055,34 +1276,24 @@ aO aN be at -bn +bo bB at af af af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af af af af ac +ab +ab +ab +ae aa "} -(26,1,1) = {" +(17,1,1) = {" aa ab ab @@ -2091,11 +1302,6 @@ af af af af -ak -ak -ak -ak -ak af af af @@ -2117,7 +1323,7 @@ aN aN bf at -bo +bp bl at aL @@ -2126,25 +1332,15 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af af ac ac +ab +ac +ac aa "} -(27,1,1) = {" +(18,1,1) = {" aa ab ab @@ -2152,13 +1348,8 @@ ac af af af -ak -ak -ak -ak -ak -ak -ak +af +af af af af @@ -2179,8 +1370,8 @@ aN aN be at -bp -bL +bq +bl at ac af @@ -2188,47 +1379,32 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af af af +bN +ac +ac ac -ab aa "} -(28,1,1) = {" +(19,1,1) = {" aa ab -ab +ac ac ac af af -ak -ak -ak -ak -ak -ak -ak -ak +af +af +af af af af af ac ad -aq +ap ad ad ad @@ -2241,7 +1417,7 @@ aN aN be at -bq +br bB at ac @@ -2250,52 +1426,37 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +af af af af af ac -ab aa "} -(29,1,1) = {" +(20,1,1) = {" aa ab -ab +ae ac ac af af -ak -ak -ak -ak -ak -ak -ak -ak af af af af -ac +af +af +af +bN ad ad ad ad ad ad -ar +aq at at az @@ -2303,7 +1464,7 @@ aP aP bg at -br +bs bl at ad @@ -2312,40 +1473,25 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +af af af af af ac -ab aa "} -(30,1,1) = {" +(21,1,1) = {" aa ab -ab ac ac +bN +af +af +af af af -ak -ak -ak -ak -ak -ak -ak -ak af af af @@ -2365,7 +1511,7 @@ aQ aZ aP at -bs +bC bl at ad @@ -2375,39 +1521,24 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -ak -af af af af af ac -ab aa "} -(31,1,1) = {" +(22,1,1) = {" aa ab -ab -ab +ac +ac ac af af -ak -ak -ak -ak -ak -ak -ak -ak +af +af +af af af af @@ -2415,7 +1546,7 @@ af ac ad ad -aq +ap ad ad ad @@ -2438,38 +1569,23 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af af af af ac -ac -ab aa "} -(32,1,1) = {" +(23,1,1) = {" aa ab -ab -ab +ac +ac ac af af -ak -ak -ak -ak -ak -ak -ak -ak +af +af +af af af af @@ -2481,16 +1597,16 @@ ad ad ad ad -ad +ar av aw aD -aP +aX ba aP at bt -bC +bK at ad ac @@ -2500,23 +1616,13 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af af af af ac -ab -ab aa "} -(33,1,1) = {" +(24,1,1) = {" aa ab ab @@ -2524,14 +1630,9 @@ ac af af af -ak -ak -ak -ak -ak -ak -ak -ak +af +af +af af af af @@ -2554,7 +1655,7 @@ at bu bD at -bK +bM as ac ac @@ -2562,38 +1663,23 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af -af af af ac -ab -ab +ac aa "} -(34,1,1) = {" +(25,1,1) = {" aa ab -ab +ac ac af af af af -ak -ak -ak -ak -ak -ak -ak +af +af af af af @@ -2624,38 +1710,23 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af -af af af ac ab -ab aa "} -(35,1,1) = {" +(26,1,1) = {" aa ab -ab ac af af af af -ak -ak -ak -ak -ak -ak -ak +af +af +af af af af @@ -2667,7 +1738,7 @@ ah ad ad ad -ar +aq at at aF @@ -2676,7 +1747,7 @@ at aP at bw -bD +bL bI ad ad @@ -2686,38 +1757,23 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af af af ac -ac -ab ab aa "} -(36,1,1) = {" +(27,1,1) = {" aa ab ac -ac af af af af -ak af -ak -ak -ak af -ak +af af af af @@ -2748,25 +1804,15 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af af af ac ab -ab -ab aa "} -(37,1,1) = {" +(28,1,1) = {" aa -ac +ab ac af af @@ -2775,11 +1821,6 @@ af af af af -ak -af -af -af -af af af af @@ -2810,24 +1851,16 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af af af ac -ac -ab ab aa "} -(38,1,1) = {" +(29,1,1) = {" aa +ab +ab ac af af @@ -2837,13 +1870,6 @@ af af af af -ak -af -af -af -af -af -af ac ac ad @@ -2872,24 +1898,16 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -af -af af ac ac ab -ab aa "} -(39,1,1) = {" +(30,1,1) = {" aa +ab +ab ac af af @@ -2898,17 +1916,10 @@ af af af af -af -ak -af -af -af -af -af ac ac ad -ad +ai ac ac am @@ -2921,12 +1932,12 @@ at aH aU bb -aP +aX at bk at at -bK +bM as ac ac @@ -2934,24 +1945,16 @@ af af af af -ak -ak -ak -ak -ak -ak -ak -ak af -af -ac -ac +ae ab ab aa "} -(40,1,1) = {" +(31,1,1) = {" aa +ab +ab ac af af @@ -2959,13 +1962,6 @@ af af af af -af -af -af -af -af -af -af ac ac ah @@ -2996,33 +1992,18 @@ af af af af -ak -ak -ak -ak -ak -ak -ak af -af -af -ac ac ab ab aa "} -(41,1,1) = {" +(32,1,1) = {" aa +ab +ab ac -af -af -af -af -af -af -af -ac +bN af af af @@ -3058,32 +2039,17 @@ af af af af -ak -ak -ak -ak -ak -ak -af -af -af -af af ac ab ab aa "} -(42,1,1) = {" +(33,1,1) = {" aa -ac -af -af -af -af -af -ac -ac +ab +ab +ab ac ac af @@ -3101,7 +2067,7 @@ af af af af -ac +bN ac at aK @@ -3120,1093 +2086,531 @@ af af af af -ak -ak -ak -ak -ak -ak -ak +af +ac +ab +ab +aa +"} +(34,1,1) = {" +aa +ab +ab +ab +al +ac +ac +am +ac +ac +ad +ad +ad +ac +af +af +af +af +af +af +af +af +af +at +at +at +at +at +at +at +at +at +af +af +af +af +af af af af af ac +ab +ab +aa +"} +(35,1,1) = {" +aa +ab +ab +ab +ad +ad +ad +ad +ad +ai +ad +ah +ac +ac +af +af +af +af +af +af +af +af +af +af +af +aY +af +af +aY +af +af +af +af +af +af +af +af +af +af +af +af +ac +ab +ab +aa +"} +(36,1,1) = {" +aa +ab +ab +ab +ad +ad +ad +ah +ad +ad +ad +ad +ac +af +af +af +af +af +af +af +af +af +af +af +af +as +af +af +as +af +af +af +af +af +af +af +af +af +af +af +af +ac +ab +ab +aa +"} +(37,1,1) = {" +aa +ab +ab +ab +ad +ah +ad +ad +ad +ao +ad +ac +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac +ab +ab +aa +"} +(38,1,1) = {" +aa +ab +ab +ab +an +ad +ai +ad +ad +ac +ac +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +bN +ab +ab +aa +"} +(39,1,1) = {" +aa +ab +ab +ab +ad +ad +ad +ac +ac +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac +ab +ab +aa +"} +(40,1,1) = {" +aa +ab +ab +ab +ah +ac +ac +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac +ac +ab +aa +"} +(41,1,1) = {" +aa +ab +ab +ab +ac +ac +am +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac +ab +aa +"} +(42,1,1) = {" +aa +ab +ab +ab +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +ac +ac +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af +af ac ab aa "} (43,1,1) = {" aa +ab +ab +ab ac +ac +ac +ac +ac +ac +af +af +bN +ac +ac +ac +ac +ac +ac +ac +ae +ac +ac +ac +ac +bN +ac +ac +ac +ac +ac +ac +af af af af af ac ac -ad -an ac ac -am ac ac -ad -ad -ad -ac -af -af -af -af -af -af -af -af -af -at -at -at -at -at -at -at -at -at -af -af -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -af -af -af -af -af -ac ab aa "} (44,1,1) = {" aa +ab +ab +ab +ab +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +ac +ac +ab +ac +ac +ac +ac +ab +ac +ac +ac +ac +ab +ab +ab +ac +ac +ac +ac +ac +ac +ac +ac ac ac -af -af -af -ac -ad -ah -ad -ad -ad -ad -ad -ad -ad -ah ac ac -af -af -af -af -af -af -af -af -af -af -af -aX -af -af -aX -af -af -af -af -af -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -af -af -af -af -af ac ab aa "} (45,1,1) = {" aa -ab -ac -af -af -ac -ac -al -ad -ad -ad -ad -ah -ad -ad -ad -ad -ac -af -af -af -af -af -af -af -af -af -af -af -af -as -af -af -as -af -af -af -af -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -ac -ab -aa -"} -(46,1,1) = {" -aa -ab -ac -af -ac -ac -ah -ad -ad -ad -ah -ad -ad -ad -ap -ad -ac -ac -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ak -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -ac -ab -aa -"} -(47,1,1) = {" -aa -ab -ac -ac -ac -ad -ad -ad -ad -ao -ad -ai -ad -ad -ac -ac -ac -af -af -af -af -af -ak -ak -ak -af -af -af -af -af -af -af -af -af -af -af -af -af -ak -ak -ak -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -ac -ab -aa -"} -(48,1,1) = {" -aa -ab -ab -ac -ad -ai -ad -ah -ad -ad -ad -ad -ac -ac -ac -af -af -af -af -af -ak -ak -ak -ak -ak -ak -af -af -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -ac -ac -aa -"} -(49,1,1) = {" -aa -ab -ab -ac -ad -ad -ad -ad -ad -ah -ac -ac -ac -af -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -ac -aa -"} -(50,1,1) = {" -aa -ab -ac -ac -ah -ad -ad -ad -ad -ac -ac -am -af -af -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -ac -aa -"} -(51,1,1) = {" -aa -ab -ad -ad -ad -aj -ad -ad -am -ac -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af -ak -ak -ak -ak -ak -ak -af -ak -ak -af -af -af -ac -aa -"} -(52,1,1) = {" -aa -ad -ad -ad -ad -ac -ac -ac -ac -af -af -af -af -af -af -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -af -af -af -af -af -ak -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac -aa -"} -(53,1,1) = {" -aa -ad -ad -ah -ac -ac -af -af -af -af -af -af -af -af -af -af -af -ak -ak -ak -af -af -af -ak -ak -ak -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac -ab -aa -"} -(54,1,1) = {" -aa -ad -ad -ad -ac -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ak -ak -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac -ac -ab -aa -"} -(55,1,1) = {" -aa -ab -ad -ac -ac -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac -ac -ab -ab -ab -aa -"} -(56,1,1) = {" -aa -ab -ac -af -af -af -af -af -af -af -af -af -af -af -ac -ac -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -af -ac -ac -ac -af -af -af -af -ac -ac -ac -ac -ab -ab -ab -ab -ab -aa -"} -(57,1,1) = {" -aa -ab -ac -af -af -af -af -af -af -af -af -af -af -af -ac -ac -ac -ac -af -af -af -af -ac -ac -af -af -af -af -ac -ac -af -af -af -af -af -af -af -af -af -af -ac -ac -ac -ac -ab -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -aa -"} -(58,1,1) = {" -aa -ae -ac -ac -ac -ac -af -af -af -af -af -ac -ac -ac -ac -ab -ab -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -af -af -af -af -af -af -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ag -ab -ab -ab -ab -aa -"} -(59,1,1) = {" -aa -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ac -ac -ac -ac -ac -ac -ac -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ae -ab -ab -ab -ab -ab -aa -"} -(60,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa diff --git a/maps/tether/submaps/aerostat/submaps/Drugden.dmm b/maps/tether/submaps/aerostat/submaps/Drugden.dmm index f12df92336..1966dbcab8 100644 --- a/maps/tether/submaps/aerostat/submaps/Drugden.dmm +++ b/maps/tether/submaps/aerostat/submaps/Drugden.dmm @@ -4,118 +4,116 @@ /area/template_noop) "b" = ( /turf/template_noop, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "c" = ( -/turf/simulated/mineral/ignore_mapgen, -/area/submap/Drugd) -"d" = ( -/turf/simulated/wall, -/area/submap/Drugd) +/turf/simulated/mineral/ignore_mapgen/virgo2, +/area/submap/virgo2/Drugd) "e" = ( /obj/machinery/door/airlock, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "f" = ( /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "g" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "h" = ( /obj/random/trash, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "i" = ( /obj/structure/closet/cabinet, /obj/item/weapon/lipstick/random, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "j" = ( /obj/structure/bed, /obj/item/weapon/bedsheet, /obj/structure/curtain/open/bed, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "k" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/pill/happy{ name = "pill" }, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "l" = ( +/obj/tether_away_spawner/aerostat_inside, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "m" = ( /obj/structure/curtain/black, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "n" = ( /obj/random/trash, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "o" = ( /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "p" = ( /obj/effect/decal/remains/mouse, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "q" = ( /obj/structure/closet/cabinet, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "r" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/pill/methylphenidate{ name = "pill" }, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "s" = ( /obj/structure/bed/chair/comfy/beige{ icon_state = "armchair_preview"; dir = 1 }, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "t" = ( /obj/item/weapon/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "u" = ( /obj/random/junk, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "v" = ( /obj/structure/closet/cabinet, /obj/item/weapon/contraband/poster, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "w" = ( /obj/structure/bed/chair/comfy/beige, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "x" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp, /obj/item/weapon/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "y" = ( /obj/structure/bed/chair/comfy/beige, /obj/item/weapon/reagent_containers/pill/citalopram{ name = "pill" }, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "z" = ( /obj/structure/loot_pile/maint/junk, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "A" = ( /obj/item/weapon/reagent_containers/pill/citalopram{ name = "pill" @@ -124,111 +122,117 @@ name = "pill" }, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "B" = ( /obj/structure/table/standard, /obj/item/weapon/storage/pill_bottle/happy, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "C" = ( /obj/structure/table/standard, /obj/item/stack/medical/splint, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "D" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/pill/citalopram, /obj/item/weapon/reagent_containers/pill/citalopram, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "E" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/pill/tramadol, /obj/item/weapon/reagent_containers/pill/tramadol, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "F" = ( /obj/structure/closet/cabinet, /obj/item/clothing/accessory/jacket, /obj/item/weapon/material/butterfly/switchblade, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "G" = ( /obj/item/weapon/reagent_containers/pill/zoom{ name = "pill" }, /obj/random/trash, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "H" = ( /obj/item/weapon/reagent_containers/pill/zoom{ name = "pill" }, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "I" = ( /obj/structure/loot_pile/maint/boxfort, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "J" = ( /obj/structure/table/standard, /obj/item/weapon/surgical/scalpel, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "K" = ( /obj/item/wheelchair, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "L" = ( /obj/structure/table/standard, /obj/random/firstaid, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "M" = ( /obj/structure/loot_pile/maint/junk, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "N" = ( /obj/effect/floor_decal/rust, /obj/structure/table/standard, /obj/item/device/survivalcapsule, /turf/simulated/floor/tiled, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "O" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/pill/zoom, /obj/item/weapon/reagent_containers/pill/zoom, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "P" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/pill/tramadol{ name = "pill" }, /turf/simulated/floor/carpet, -/area/submap/Drugd) -"Q" = ( -/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard, -/turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "R" = ( /obj/structure/girder, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "S" = ( /obj/item/weapon/material/shard, /turf/simulated/floor, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "T" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) "U" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/syringe/drugs, /turf/simulated/floor/carpet, -/area/submap/Drugd) +/area/submap/virgo2/Drugd) +"V" = ( +/turf/simulated/floor, +/area/submap/virgo2/Drugd) +"W" = ( +/turf/simulated/wall/virgo2, +/area/submap/virgo2/Drugd) +"X" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor, +/area/submap/virgo2/Drugd) (1,1,1) = {" a @@ -407,13 +411,13 @@ c c c c -d -d -d -d -d -d -d +W +W +W +W +W +W +W c c c @@ -434,13 +438,13 @@ c c c c -d +W B J N -l +V R -d +W c c c @@ -461,13 +465,13 @@ c c c c -d +W C K -l -Q -l -d +V +V +V +W c c c @@ -488,13 +492,13 @@ c c c c -d +W D g l -l +V S -d +W c c c @@ -515,13 +519,13 @@ c c c c -d +W E L O -l -l -d +V +V +W c c b @@ -535,20 +539,20 @@ b b b b -d -d -d -d -d -d -d -d -d -d -d +W +W +W +W +W +W +W +W +W +W +W e -d -d +W +W c c b @@ -560,22 +564,22 @@ b b b b -b -b -d +W +W +W f g g p u -l +V z -l -l +V +V h -l -l -l +V +V +V c c b @@ -587,21 +591,21 @@ b b b b -b -b -e +X +V +X f g +V +V +V l -l -l -l -l -l +V +V f -l -l -l +V +V +V u c c @@ -614,22 +618,22 @@ b b b b -b -b -d +W +W +W f h -l -l +V +V h -l +V g f M g -l +V h -d +W c c b @@ -643,20 +647,20 @@ b b b b -d -d -d +W +W +W m -d -d -d +W +W +W m -d -d -d +W +W +W m -d -d +W +W c c c @@ -671,19 +675,19 @@ b b c c -d +W i n q -d +W v o F -d +W q o q -d +W c c c @@ -698,19 +702,19 @@ b c c c -d +W j o r -d +W w o G -d +W P o T -d +W c c c @@ -725,19 +729,19 @@ b c c c -d +W k o s -d +W x o H -d +W w o U -d +W c c c @@ -752,19 +756,19 @@ b c c c -d +W j o t -d +W y A I -d +W w o n -d +W c c b @@ -779,19 +783,19 @@ b c c c -d -d -d -d -d -d -d -d -d -d -d -d -d +W +W +W +W +W +W +W +W +W +W +W +W +W c c c diff --git a/maps/tether/submaps/aerostat/submaps/Epod3.dmm b/maps/tether/submaps/aerostat/submaps/Epod3.dmm index 2aefeefde7..23eafb7790 100644 --- a/maps/tether/submaps/aerostat/submaps/Epod3.dmm +++ b/maps/tether/submaps/aerostat/submaps/Epod3.dmm @@ -4,25 +4,25 @@ /area/template_noop) "b" = ( /turf/template_noop, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "c" = ( /turf/simulated/floor/outdoors/dirt, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "d" = ( /obj/tether_away_spawner/aerostat_surface, /turf/template_noop, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "e" = ( /turf/simulated/shuttle/wall, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "f" = ( /obj/tether_away_spawner/aerostat_surface, /turf/simulated/floor/outdoors/dirt, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "g" = ( /obj/effect/spider/stickyweb, /turf/template_noop, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "h" = ( /obj/structure/bed/chair{ dir = 4 @@ -34,7 +34,7 @@ pixel_y = -26 }, /turf/simulated/shuttle/floor, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "i" = ( /obj/structure/bed/chair{ dir = 4 @@ -46,7 +46,7 @@ /obj/machinery/light, /obj/item/weapon/weldingtool/largetank, /turf/simulated/shuttle/floor, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "j" = ( /obj/machinery/status_display{ density = 0; @@ -65,40 +65,37 @@ /obj/item/clothing/shoes/dress, /obj/item/clothing/glasses/sunglasses, /obj/random/multiple/gun/projectile/handgun, +/obj/effect/spider/eggcluster/small/frost, /turf/simulated/shuttle/floor, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "k" = ( /obj/structure/shuttle/engine/propulsion/burst{ icon_state = "propulsion"; dir = 8 }, /turf/simulated/shuttle/wall, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "l" = ( /obj/effect/spider/stickyweb, /turf/simulated/floor/outdoors/dirt, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "m" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Hatch"; welded = 1 }, /turf/simulated/shuttle/floor, -/area/submap/Epod3) -"n" = ( -/obj/effect/spider/eggcluster/small/frost, -/turf/simulated/floor/outdoors/dirt, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "p" = ( /obj/effect/spider/stickyweb, /obj/effect/spider/stickyweb, /turf/template_noop, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) "r" = ( /obj/structure/shuttle/window, /obj/structure/grille, /turf/simulated/shuttle/plating, -/area/submap/Epod3) +/area/submap/virgo2/Epod3) (1,1,1) = {" a @@ -225,7 +222,7 @@ a b l c -n +c l l f diff --git a/maps/tether/submaps/aerostat/submaps/Epod4.dmm b/maps/tether/submaps/aerostat/submaps/Epod4.dmm index 4df5b86f87..2fd3c9bb4d 100644 --- a/maps/tether/submaps/aerostat/submaps/Epod4.dmm +++ b/maps/tether/submaps/aerostat/submaps/Epod4.dmm @@ -4,21 +4,18 @@ /area/template_noop) "b" = ( /turf/template_noop, -/area/submap/Epod4) +/area/submap/virgo2/Epod4) "c" = ( -/turf/simulated/floor/outdoors/dirt, -/area/submap/Epod4) -"f" = ( -/turf/simulated/floor/water, -/area/submap/Epod4) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Epod4) "h" = ( /turf/simulated/shuttle/wall, -/area/submap/Epod4) +/area/submap/virgo2/Epod4) "i" = ( /obj/structure/shuttle/window, /obj/structure/grille, /turf/simulated/shuttle/plating, -/area/submap/Epod4) +/area/submap/virgo2/Epod4) "k" = ( /obj/structure/bed/chair{ icon_state = "chair_preview"; @@ -31,11 +28,8 @@ pixel_y = 0 }, /obj/structure/loot_pile/maint/junk, -/turf/simulated/floor/water, -/area/submap/Epod4) -"l" = ( -/turf/simulated/floor/water/deep, -/area/submap/Epod4) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Epod4) "m" = ( /obj/structure/bed/chair{ icon_state = "chair_preview"; @@ -56,8 +50,8 @@ /obj/item/clothing/shoes/brown, /obj/item/clothing/under/mbill, /obj/item/clothing/head/soft/mbill, -/turf/simulated/floor/water, -/area/submap/Epod4) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Epod4) "n" = ( /obj/structure/bed/chair{ icon_state = "chair_preview"; @@ -74,18 +68,21 @@ name = "exotic seeds crate"; starts_with = list(/obj/item/seeds/random = 6, /obj/item/seeds/replicapod = 2, /obj/item/seeds/ambrosiavulgarisseed = 2, /obj/item/seeds/kudzuseed, /obj/item/seeds/libertymycelium, /obj/item/seeds/reishimycelium) }, -/turf/simulated/floor/water, -/area/submap/Epod4) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Epod4) "o" = ( /obj/structure/shuttle/engine/propulsion/burst, /turf/simulated/shuttle/wall, -/area/submap/Epod4) +/area/submap/virgo2/Epod4) "p" = ( /obj/structure/door_assembly/door_assembly_ext{ anchored = 1 }, -/turf/simulated/floor/water, -/area/submap/Epod4) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Epod4) +"Y" = ( +/turf/simulated/floor/outdoors/dirt, +/area/submap/virgo2/Epod4) (1,1,1) = {" a @@ -128,10 +125,10 @@ c c c c -f -f -f -f +c +c +c +c c c c @@ -144,13 +141,13 @@ b c c c -f -f -l -l -l -f -f +c +c +c +c +c +c +c c c a @@ -160,15 +157,15 @@ a b c c -f +c h h h h o -l -l -f +c +c +c c a "} @@ -177,22 +174,22 @@ a b c c -f +c i k m n p -l -l -f +c +c +c c a "} (7,1,1) = {" a b -c +Y c c h @@ -200,9 +197,9 @@ h h h o -l -f -f +c +c +c c a "} @@ -214,10 +211,10 @@ c c c c -f -f -f -f +c +c +c +c c c c diff --git a/maps/tether/submaps/aerostat/submaps/Flake.dmm b/maps/tether/submaps/aerostat/submaps/Flake.dmm index fe1f502d87..37a5070d76 100644 --- a/maps/tether/submaps/aerostat/submaps/Flake.dmm +++ b/maps/tether/submaps/aerostat/submaps/Flake.dmm @@ -4,19 +4,27 @@ /area/template_noop) "b" = ( /turf/template_noop, -/area/submap/Lake1) +/area/submap/virgo2/Lake1) +"d" = ( +/obj/machinery/crystal/lava, +/turf/simulated/floor/outdoors/rocks, +/area/submap/virgo2/Lake1) "f" = ( /turf/simulated/floor/outdoors/rocks, -/area/submap/Lake1) +/area/submap/virgo2/Lake1) "h" = ( -/turf/simulated/floor/water, -/area/submap/Lake1) +/turf/simulated/floor/lava, +/area/submap/virgo2/Lake1) "i" = ( -/turf/simulated/floor/outdoors/dirt, -/area/submap/Lake1) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Lake1) "j" = ( -/turf/simulated/mineral, -/area/submap/Lake1) +/turf/simulated/mineral/ignore_mapgen/virgo2, +/area/submap/virgo2/Lake1) +"R" = ( +/obj/machinery/crystal/lava, +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Lake1) (1,1,1) = {" a @@ -69,7 +77,7 @@ a a b b -f +d f f f @@ -166,7 +174,7 @@ h h h h -f +d f b b @@ -287,7 +295,7 @@ a b b b -f +d h h h @@ -513,12 +521,12 @@ b b b i +R i i i i -i -i +R b b a @@ -578,7 +586,7 @@ b b b b -i +R j j j @@ -626,7 +634,7 @@ b b i i -i +R b b b diff --git a/maps/tether/submaps/aerostat/submaps/GovPatrol.dmm b/maps/tether/submaps/aerostat/submaps/GovPatrol.dmm index bbdd2930c1..857bb008ea 100644 --- a/maps/tether/submaps/aerostat/submaps/GovPatrol.dmm +++ b/maps/tether/submaps/aerostat/submaps/GovPatrol.dmm @@ -29,7 +29,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/submap/virgo2/GovPatrol) "i" = ( -/obj/item/clothing/under/utility/sifguard, +/obj/item/clothing/under/solgov/utility/sifguard, /obj/item/clothing/shoes/boots/jackboots, /obj/effect/decal/remains, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, diff --git a/maps/tether/submaps/aerostat/submaps/MHR.dmm b/maps/tether/submaps/aerostat/submaps/MHR.dmm index 5e39209496..06a7705e14 100644 --- a/maps/tether/submaps/aerostat/submaps/MHR.dmm +++ b/maps/tether/submaps/aerostat/submaps/MHR.dmm @@ -62,12 +62,6 @@ outdoors = 0 }, /area/submap/virgo2/MHR) -"m" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, -/turf/simulated/mineral/floor/ignore_mapgen/virgo2{ - outdoors = 0 - }, -/area/submap/virgo2/MHR) "n" = ( /obj/effect/decal/cleanable/spiderling_remains, /obj/tether_away_spawner/aerostat_surface, @@ -102,13 +96,6 @@ outdoors = 0 }, /area/submap/virgo2/MHR) -"s" = ( -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, -/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat, -/turf/simulated/mineral/floor/ignore_mapgen/virgo2{ - outdoors = 0 - }, -/area/submap/virgo2/MHR) (1,1,1) = {" a @@ -296,7 +283,7 @@ e e e e -m +d d d n @@ -323,7 +310,7 @@ d d d d -s +d e e e @@ -366,7 +353,7 @@ e f d d -s +d d e e diff --git a/maps/tether/submaps/aerostat/submaps/Manor1.dmm b/maps/tether/submaps/aerostat/submaps/Manor1.dmm index 65c5a5e20b..6d3c998571 100644 --- a/maps/tether/submaps/aerostat/submaps/Manor1.dmm +++ b/maps/tether/submaps/aerostat/submaps/Manor1.dmm @@ -1,144 +1,138 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /turf/template_noop, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ab" = ( /turf/simulated/wall/virgo2, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ac" = ( /obj/structure/window/reinforced/full, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ad" = ( /obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ae" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "af" = ( /obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 8 }, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ag" = ( /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ah" = ( /obj/structure/flora/pottedplant/dead, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ai" = ( /obj/structure/flora/pottedplant/drooping, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aj" = ( /obj/structure/table/woodentable, /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/weapon/material/ashtray/glass, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ak" = ( /obj/structure/flora/pottedplant/dead, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "al" = ( /obj/structure/table/woodentable, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "am" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "an" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ao" = ( /obj/structure/mopbucket, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ap" = ( /obj/structure/sink, /turf/simulated/wall/virgo2, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aq" = ( /turf/simulated/floor/carpet/bcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ar" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet/bcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "as" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "at" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp, /obj/effect/decal/cleanable/blood/gibs/robot, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "au" = ( /obj/structure/bed, /obj/item/weapon/bedsheet, /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "av" = ( /obj/structure/janitorialcart, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aw" = ( /obj/structure/table/woodentable, /obj/item/weapon/mop, /obj/item/weapon/reagent_containers/glass/bucket, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ax" = ( /obj/structure/closet/cabinet, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ay" = ( /obj/effect/decal/cleanable/blood/gibs/robot/limb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "az" = ( /obj/structure/table/woodentable, /obj/item/trash/candle, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) -"aB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spider/stickyweb, -/mob/living/simple_mob/animal/giant_spider/lurker, -/turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aC" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/maglight, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aD" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aE" = ( /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/cobweb2, @@ -146,127 +140,118 @@ /obj/item/clothing/shoes/boots/winter, /obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aF" = ( /obj/structure/table/woodentable, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aG" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aH" = ( /obj/structure/table/woodentable, /obj/item/weapon/pen, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aI" = ( /obj/structure/flora/pottedplant/dead, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aJ" = ( /obj/effect/spider/stickyweb, -/mob/living/simple_mob/animal/giant_spider/lurker, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) -"aK" = ( -/obj/effect/spider/stickyweb, -/turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aL" = ( /obj/structure/fireplace, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) -"aM" = ( -/mob/living/simple_mob/animal/giant_spider/lurker, -/turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aN" = ( /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aO" = ( /obj/structure/bed, /obj/item/weapon/bedsheet, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aP" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aQ" = ( /turf/simulated/floor/carpet/purcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aR" = ( /obj/structure/table/standard, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aS" = ( /obj/structure/table/standard, /obj/machinery/microwave, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aT" = ( /obj/structure/closet/cabinet, /obj/random/projectile/shotgun, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aU" = ( /obj/structure/bookcase, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aV" = ( /obj/structure/table/woodentable, /obj/item/weapon/material/kitchen/utensil/fork, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aW" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/condiment/small/peppermill, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aX" = ( /obj/structure/table/standard, /obj/item/weapon/material/knife, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aY" = ( /obj/machinery/cooker/oven, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "aZ" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ba" = ( /obj/machinery/cooker/grill, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bb" = ( /obj/structure/table/standard, /obj/item/weapon/tray, /obj/item/weapon/tray, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bc" = ( /obj/structure/table/standard, /obj/item/weapon/material/knife/butch, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bd" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "be" = ( /obj/random/trash, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bf" = ( /obj/structure/closet/cabinet, /obj/item/clothing/head/hood/winter, @@ -274,57 +259,57 @@ /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/random/contraband, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bg" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bh" = ( /obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; dir = 1 }, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bi" = ( /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/holofloor/wood{ icon_state = "wood_broken0" }, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bj" = ( /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bk" = ( /obj/random/plushielarge, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bl" = ( /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bm" = ( /obj/structure/loot_pile/surface/bones, /obj/item/clothing/accessory/sweater/blue, /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bn" = ( /obj/structure/window/reinforced/full, /turf/template_noop, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bo" = ( /obj/item/weapon/material/twohanded/baseballbat/metal, /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bp" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bq" = ( /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "br" = ( /obj/structure/bed/chair/comfy/purp{ icon_state = "comfychair_preview"; @@ -333,11 +318,11 @@ /turf/simulated/floor/holofloor/wood{ icon_state = "wood_broken5" }, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bs" = ( /obj/structure/table, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bt" = ( /obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; @@ -345,7 +330,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bu" = ( /obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; @@ -353,51 +338,51 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bv" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bw" = ( /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bx" = ( /obj/structure/bed/chair/comfy/purp{ icon_state = "comfychair_preview"; dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "by" = ( /obj/structure/closet/cabinet, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/head/hood/winter, /obj/item/clothing/shoes/boots/winter, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bz" = ( /obj/structure/table/woodentable, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bA" = ( /obj/structure/table/standard, /obj/item/weapon/material/kitchen/utensil/fork, /obj/item/weapon/material/kitchen/utensil/fork, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bB" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/weapon/reagent_containers/food/snacks/stew, /obj/item/weapon/reagent_containers/food/snacks/stew, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bC" = ( /obj/item/weapon/shovel, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bD" = ( /obj/structure/bed/chair/wood{ icon_state = "wooden_chair"; @@ -405,7 +390,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bE" = ( /obj/structure/table/standard, /obj/item/weapon/material/kitchen/utensil/spoon, @@ -413,169 +398,169 @@ /obj/item/weapon/material/kitchen/utensil/spoon, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bF" = ( /obj/structure/table/standard, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bG" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/weapon/reagent_containers/food/snacks/sausage, /obj/item/weapon/reagent_containers/food/snacks/sausage, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/pottedplant/drooping, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/pottedplant/dead, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bJ" = ( /obj/structure/table/standard, /obj/item/weapon/material/kitchen/rollingpin, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bK" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/glass/bottle/stoxin, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bL" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/fancy/candle_box, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bM" = ( /obj/machinery/papershredder, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bN" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/carpet/purcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bO" = ( /obj/machinery/icecream_vat, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bP" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bQ" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bR" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/table/woodentable, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bS" = ( /obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bT" = ( /obj/item/weapon/material/minihoe, /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bU" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet/purcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bV" = ( /turf/simulated/floor/holofloor/wood{ icon_state = "wood_broken6" }, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bW" = ( /obj/machinery/washing_machine, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bX" = ( /obj/structure/table/woodentable, /obj/structure/bedsheetbin, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bY" = ( /obj/structure/table/rack, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "bZ" = ( /obj/structure/closet/crate, /obj/item/stack/cable_coil/random_belt, /obj/random/cash, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ca" = ( /obj/structure/table/woodentable, /obj/item/weapon/melee/umbrella/random, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cb" = ( /obj/structure/closet/cabinet, /obj/random/gun/random, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cc" = ( /obj/structure/closet/cabinet, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /obj/random/medical, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cd" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp/green, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ce" = ( /obj/structure/bed/double, /obj/item/weapon/bedsheet/rddouble, /obj/structure/curtain/open/bed, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cf" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/wallet/random, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cg" = ( /obj/structure/flora/pottedplant/dead, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ch" = ( /obj/structure/loot_pile/surface/bones, /obj/item/clothing/accessory/sweater, /turf/simulated/floor/carpet/blucarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ci" = ( /obj/structure/closet/crate, /obj/item/weapon/flame/lighter/random, /obj/random/powercell, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cj" = ( /obj/structure/closet/cabinet, /obj/item/clothing/shoes/boots/winter, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/head/hood/winter, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ck" = ( /obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cl" = ( /turf/simulated/floor/carpet/turcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cm" = ( /obj/effect/decal/cleanable/blood, /obj/structure/bed/chair/comfy/purp{ @@ -583,107 +568,107 @@ dir = 4 }, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cn" = ( /obj/structure/closet/crate, /obj/item/weapon/storage/wallet/random, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "co" = ( /obj/structure/coatrack, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cp" = ( /obj/structure/loot_pile/surface/bones, /obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cq" = ( /obj/structure/loot_pile/surface/bones, /obj/item/clothing/under/suit_jacket, /obj/item/clothing/shoes/black, /obj/random/projectile/random, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external, /turf/simulated/floor/carpet/purcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cs" = ( /obj/item/weapon/material/twohanded/spear, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "ct" = ( /obj/structure/closet/cabinet{ opened = 1 }, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cu" = ( /obj/effect/decal/remains, /obj/item/weapon/material/knife/tacknife/combatknife, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cv" = ( /obj/structure/sink{ pixel_y = 30 }, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cw" = ( /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cx" = ( /obj/structure/table/standard, /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cy" = ( /obj/structure/table/standard, /obj/item/weapon/towel/random, /obj/item/weapon/towel/random, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cz" = ( /obj/effect/decal/cleanable/cobweb2, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cA" = ( /obj/item/weapon/paper/crumpled, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cB" = ( /turf/simulated/floor/holofloor/wood{ icon_state = "wood_broken3" }, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cC" = ( /obj/effect/decal/cleanable/spiderling_remains, /obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cD" = ( /obj/structure/closet/crate, /obj/item/clothing/suit/armor/vest, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cE" = ( /obj/structure/closet/crate, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cF" = ( /obj/structure/simple_door/wood, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cG" = ( /obj/structure/toilet{ icon_state = "toilet00"; dir = 8 }, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cH" = ( /obj/machinery/shower{ icon_state = "shower"; @@ -691,11 +676,11 @@ }, /obj/structure/curtain/open/shower, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cI" = ( /obj/item/stack/material/wood, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cJ" = ( /obj/machinery/shower{ icon_state = "shower"; @@ -704,30 +689,42 @@ /obj/structure/curtain/open/shower, /obj/random/soap, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cK" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cL" = ( /obj/structure/toilet{ icon_state = "toilet00"; dir = 1 }, /turf/simulated/floor/tiled/hydro, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cM" = ( /obj/structure/table/woodentable, /obj/item/modular_computer/laptop/preset/custom_loadout/standard, /turf/simulated/floor/holofloor/wood, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) "cN" = ( /turf/template_noop, /area/template_noop) "cO" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/carpet/purcarpet, -/area/submap/Manor1) +/area/submap/virgo2/Manor1) +"kI" = ( +/obj/tether_away_spawner/aerostat_surface, +/turf/simulated/floor/holofloor/wood, +/area/submap/virgo2/Manor1) +"KY" = ( +/obj/tether_away_spawner/aerostat_surface, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/virgo2/Manor1) +"VR" = ( +/obj/tether_away_spawner/aerostat_surface, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/virgo2/Manor1) (1,1,1) = {" cN @@ -1120,7 +1117,7 @@ ab ag ab aT -aM +ag aO ab bg @@ -1302,7 +1299,7 @@ ag ag ag ag -ag +kI ag ag ag @@ -1458,7 +1455,7 @@ ag ag ag ag -ag +kI ag ag an @@ -1622,7 +1619,7 @@ ar an ab aI -aK +aJ ag ag ag @@ -1642,7 +1639,7 @@ an ab ag ag -ag +kI ag ag cC @@ -1664,7 +1661,7 @@ ar aA ab aJ -aK +aJ ad ad ad @@ -1686,7 +1683,7 @@ bZ ci cn ag -aK +aJ aJ ab aa @@ -1703,9 +1700,9 @@ ag ag aq ar -aB +aA ab -aK +aJ aP al al @@ -1727,8 +1724,8 @@ ab ab ab ab -aK -aK +aJ +aJ cD ab aa @@ -1848,7 +1845,7 @@ aQ bN aQ aQ -aQ +VR bU bU bU @@ -1880,7 +1877,7 @@ aQ aQ aQ aQ -aQ +VR aQ aQ aQ @@ -2209,7 +2206,6 @@ aq aq ag ab -aM ag ag ag @@ -2223,7 +2219,8 @@ ag ag ag ag -aK +ag +aJ ab ag ag @@ -2265,7 +2262,7 @@ aR bA bE bF -aK +aJ ab ag ag @@ -2300,14 +2297,14 @@ aR bc ag ag -ag +kI ag ag bv aR bF bJ -aK +aJ ab ag ag @@ -2315,7 +2312,7 @@ ab ag cl cl -cl +KY cl cl cl @@ -2670,7 +2667,7 @@ ap ag ag ab -ag +kI ag ab ag @@ -2718,7 +2715,7 @@ as ag as ag -ag +kI ab ag bm diff --git a/maps/tether/submaps/aerostat/submaps/Rocky1.dmm b/maps/tether/submaps/aerostat/submaps/Rocky1.dmm index d34ea33311..76725279f7 100644 --- a/maps/tether/submaps/aerostat/submaps/Rocky1.dmm +++ b/maps/tether/submaps/aerostat/submaps/Rocky1.dmm @@ -4,23 +4,23 @@ /area/template_noop) "b" = ( /turf/template_noop, -/area/submap/Rocky1) +/area/submap/virgo2/Rocky1) "c" = ( -/turf/simulated/floor/outdoors/dirt, -/area/submap/Rocky1) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Rocky1) "d" = ( /obj/structure/boulder, -/turf/simulated/floor/outdoors/dirt, -/area/submap/Rocky1) +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Rocky1) "e" = ( -/turf/simulated/mineral, -/area/submap/Rocky1) +/turf/simulated/mineral/ignore_mapgen/virgo2, +/area/submap/virgo2/Rocky1) "g" = ( /obj/random/handgun/sec, /obj/effect/decal/remains/human, -/obj/item/weapon/spacecash/c200, -/turf/simulated/floor/outdoors/dirt, -/area/submap/Rocky1) +/obj/item/weapon/storage/secure/briefcase/money, +/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/area/submap/virgo2/Rocky1) (1,1,1) = {" a diff --git a/maps/tether/submaps/aerostat/submaps/Rocky4.dmm b/maps/tether/submaps/aerostat/submaps/Rocky4.dmm index 1194b94595..fb7a78f363 100644 --- a/maps/tether/submaps/aerostat/submaps/Rocky4.dmm +++ b/maps/tether/submaps/aerostat/submaps/Rocky4.dmm @@ -4,16 +4,20 @@ /area/template_noop) "b" = ( /turf/template_noop, -/area/submap/Rocky4) +/area/submap/virgo2/Rocky4) "c" = ( -/turf/simulated/mineral/ignore_mapgen, -/area/submap/Rocky4) +/turf/simulated/mineral/ignore_mapgen/virgo2, +/area/submap/virgo2/Rocky4) "e" = ( /turf/simulated/floor/outdoors/rocks, -/area/submap/Rocky4) +/area/submap/virgo2/Rocky4) "f" = ( -/turf/simulated/floor/water, -/area/submap/Rocky4) +/turf/simulated/floor/lava, +/area/submap/virgo2/Rocky4) +"Y" = ( +/obj/machinery/crystal/lava, +/turf/simulated/floor/outdoors/rocks, +/area/submap/virgo2/Rocky4) (1,1,1) = {" a @@ -210,7 +214,7 @@ c c b b -e +Y e e e diff --git a/maps/tether/submaps/aerostat/submaps/butchershack.dmm b/maps/tether/submaps/aerostat/submaps/butchershack.dmm index b983b8a552..95937cc842 100644 --- a/maps/tether/submaps/aerostat/submaps/butchershack.dmm +++ b/maps/tether/submaps/aerostat/submaps/butchershack.dmm @@ -3,11 +3,8 @@ /turf/template_noop, /area/template_noop) "b" = ( -/turf/simulated/wall/log_sif, -/area/submap/ButcherShack) -"c" = ( -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/wall/virgo2, +/area/submap/virgo2/ButcherShack) "d" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb, @@ -15,12 +12,12 @@ /obj/item/weapon/beartrap, /obj/item/weapon/packageWrap, /obj/item/weapon/material/knife/hook, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "e" = ( /obj/structure/closet/secure_closet/freezer/meat, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "f" = ( /obj/structure/closet/crate/freezer, /obj/effect/decal/cleanable/blood/gibs, @@ -34,85 +31,86 @@ /obj/random/meat, /obj/random/meat, /obj/random/meat, -/turf/simulated/floor/wood/sif/broken, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "g" = ( /obj/machinery/gibber/autogibber, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "h" = ( -/turf/simulated/floor/wood/sif/broken, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "i" = ( /obj/structure/window/basic, /obj/structure/curtain, /turf/simulated/floor/wood/sif/broken, -/area/submap/ButcherShack) +/area/submap/virgo2/ButcherShack) "j" = ( /turf/template_noop, -/area/submap/ButcherShack) -"k" = ( -/obj/structure/simple_door/sifwood, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/area/submap/virgo2/ButcherShack) "l" = ( /obj/structure/loot_pile/maint/trash, -/turf/simulated/floor/outdoors/dirt, -/area/submap/ButcherShack) +/turf/simulated/mineral/floor/virgo2, +/area/submap/virgo2/ButcherShack) "m" = ( /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "n" = ( /obj/structure/kitchenspike, /obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "o" = ( /obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "p" = ( /obj/structure/table/standard, /obj/item/clothing/suit/chef/classic, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "q" = ( /obj/structure/table/standard, /obj/effect/decal/cleanable/blood, /obj/item/weapon/material/knife/butch, -/turf/simulated/floor/wood/sif/broken, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "r" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/sausage, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "s" = ( /obj/structure/coatrack, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "t" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/brown, -/turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "u" = ( /obj/effect/decal/cleanable/blood/drip, -/turf/simulated/floor/wood/sif/broken, -/area/submap/ButcherShack) +/obj/machinery/door/airlock/external, +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) "v" = ( -/turf/simulated/floor/outdoors/dirt, -/area/submap/ButcherShack) +/turf/simulated/mineral/floor/virgo2, +/area/submap/virgo2/ButcherShack) "w" = ( /obj/structure/window/basic, /obj/structure/curtain, /turf/simulated/floor/wood/sif, -/area/submap/ButcherShack) +/area/submap/virgo2/ButcherShack) +"x" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor/tiled, +/area/submap/virgo2/ButcherShack) (1,1,1) = {" a @@ -143,44 +141,44 @@ a b d h -c +h s b b -v +b a "} (4,1,1) = {" a b m -c +h p o u -k -v +h +x a "} (5,1,1) = {" a b n -c +h q -c +h +b b b -v a "} (6,1,1) = {" a b e -c +h r -c +h i l v @@ -191,7 +189,7 @@ a b f o -c +h h w l @@ -202,8 +200,8 @@ a a b g -c -c +h +h t b v diff --git a/maps/tether/submaps/aerostat/submaps/virgo2_submap_areas.dm b/maps/tether/submaps/aerostat/submaps/virgo2_submap_areas.dm index 24dd005c0c..ddfa01ebaf 100644 --- a/maps/tether/submaps/aerostat/submaps/virgo2_submap_areas.dm +++ b/maps/tether/submaps/aerostat/submaps/virgo2_submap_areas.dm @@ -5,50 +5,80 @@ base_turf = /turf/simulated/mineral/floor/ignore_mapgen/virgo2 /area/submap/virgo2/spider1 - name = "spider nest" + name = "POI - spider nest" /area/submap/virgo2/Field1 - name = "Field 1" + name = "POI - Field 1" /area/submap/virgo2/Lake1 - name = "Lake 1" + name = "POI - Lake 1" /area/submap/virgo2/MilitaryCamp1 - name = "Military Camp 1" + name = "POI - Military Camp 1" /area/submap/virgo2/Mudpit - name = "Mudpit" + name = "POI - Mudpit" /area/submap/virgo2/Shack1 - name = "Shack1" + name = "POI - Shack1" /area/submap/virgo2/Small1 - name = "Small1" + name = "POI - Small1" /area/submap/virgo2/SnowR1 - name = "SnowR1" + name = "POI - SnowR1" /area/submap/virgo2/BoomBase - name = "Boom1" + name = "POI - Boom1" /area/submap/virgo2/Blackshuttledown - name = "BSD" + name = "POI - BSD" requires_power = FALSE /area/submap/virgo2/Lab1 - name = "Lab1" + name = "POI - Lab1" /area/submap/virgo2/MHR - name = "Manhack Rock" + name = "POI - Manhack Rock" /area/submap/virgo2/Rockybase - name = "Rockybase" + name = "POI - Rockybase" /area/submap/virgo2/GovPatrol - name = "GovPatrol" + name = "POI - GovPatrol" /area/submap/virgo2/DecoupledEngine - name = "DecoupledEngine" + name = "POI - DecoupledEngine" /area/submap/virgo2/CaveS - name = "CaveS" + name = "POI - CaveS" + +/area/submap/virgo2/ButcherShack + name = "POI - CaveS" + +/area/submap/virgo2/DJOutpost1 + name = "POI - DJOutpost1" + +/area/submap/virgo2/DoomP + name = "POI - DoomP" + +/area/submap/virgo2/Drugd + name = "POI - Drugd" + +/area/submap/virgo2/Epod3 + name = "POI - Epod3" + +/area/submap/virgo2/Epod4 + name = "POI - Epod4" + +/area/submap/virgo2/Lake1 + name = "POI - Lake1" + +/area/submap/virgo2/Manor1 + name = "POI - Manor1" + +/area/submap/virgo2/Rocky1 + name = "POI - Rocky1" + +/area/submap/virgo2/Rocky4 + name = "POI - Rocky4" diff --git a/maps/tether/submaps/aerostat/surface.dmm b/maps/tether/submaps/aerostat/surface.dmm index a912e56993..7a911982d7 100644 --- a/maps/tether/submaps/aerostat/surface.dmm +++ b/maps/tether/submaps/aerostat/surface.dmm @@ -22,8 +22,7 @@ /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/tether_away/aerostat/surface/explored) "s" = ( -/obj/structure/stairs/east, -/turf/simulated/mineral/floor/ignore_mapgen/virgo2, +/turf/simulated/floor/plating/virgo2, /area/tether_away/aerostat/surface/explored) "A" = ( /obj/structure/railing{ @@ -57,10 +56,6 @@ }, /turf/simulated/mineral/floor/ignore_mapgen/virgo2, /area/tether_away/aerostat/surface/explored) -"Z" = ( -/obj/structure/stairs/west, -/turf/simulated/mineral/floor/ignore_mapgen/virgo2, -/area/tether_away/aerostat/surface/explored) (1,1,1) = {" b @@ -10780,8 +10775,8 @@ A A A A -Z -Z +s +s A A A diff --git a/vorestation.dme b/vorestation.dme index 39450f8688..e968b0c974 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -763,6 +763,7 @@ #include "code\game\machinery\supply_display.dm" #include "code\game\machinery\supplybeacon.dm" #include "code\game\machinery\syndicatebeacon.dm" +#include "code\game\machinery\syndicatebeacon_vr.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transportpod.dm" #include "code\game\machinery\turret_control.dm" @@ -2446,6 +2447,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\space\goose_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\snake_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\space.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\space\space_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\space\worm.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\blob.dm" #include "code\modules\mob\living\simple_mob\subtypes\blob\spore.dm" @@ -2474,6 +2476,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\mechanical.dm" +#include "code\modules\mob\living\simple_mob\subtypes\mechanical\mechanical_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\viscerator.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\hivebot.dm" #include "code\modules\mob\living\simple_mob\subtypes\mechanical\hivebot\hivebot_vr.dm" @@ -3323,6 +3326,7 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\mountains\mountains.dm" #include "maps\submaps\surface_submaps\mountains\mountains_areas.dm" +#include "maps\submaps\surface_submaps\mountains\mountains_areas_vr.dm" #include "maps\submaps\surface_submaps\plains\plains.dm" #include "maps\submaps\surface_submaps\plains\plains_areas.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"