diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index b7ab1999f0..6ffec0be99 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -47,6 +47,12 @@ obj/var/contaminated = 0 return 0 else if(istype(src,/obj/item/weapon/storage/backpack)) return 0 //Cannot be washed :( + //VOREStation Addition start + else if(isbelly(loc)) + return 0 + else if(ismob(loc) && isbelly(loc.loc)) + return 0 + //VOREStation Addition end else if(istype(src,/obj/item/clothing)) return 1 diff --git a/code/__defines/map.dm b/code/__defines/map.dm index 7d0f3706af..fce63b9955 100644 --- a/code/__defines/map.dm +++ b/code/__defines/map.dm @@ -9,4 +9,4 @@ #define MAP_LEVEL_XENOARCH_EXEMPT 0x080 // Z-levels exempt from xenoarch digsite generation. // Misc map defines. -#define SUBMAP_MAP_EDGE_PAD 15 // Automatically created submaps are forbidden from being this close to the main map's edge. \ No newline at end of file +#define SUBMAP_MAP_EDGE_PAD 8 // Automatically created submaps are forbidden from being this close to the main map's edge. //VOREStation Edit \ No newline at end of file diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index b79314b871..06c22a4c8b 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -13,7 +13,7 @@ access = list() //See /datum/job/assistant/get_access() minimal_access = list() //See /datum/job/assistant/get_access() outfit_type = /decl/hierarchy/outfit/job/assistant/intern - alt_titles = list("Apprentice Engineer","Medical Intern","Lab Assistant","Security Cadet","Jr. Cargo Tech") //VOREStation Edit + alt_titles = list("Apprentice Engineer","Medical Intern","Lab Assistant","Security Cadet","Jr. Cargo Tech", "Jr. Explorer") //VOREStation Edit timeoff_factor = 0 //VOREStation Edit - Interns, noh //VOREStation Add diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm index f992aaab10..4969e89334 100644 --- a/code/game/machinery/computer/timeclock_vr.dm +++ b/code/game/machinery/computer/timeclock_vr.dm @@ -170,6 +170,7 @@ foundjob.current_positions++ var/mob/living/carbon/human/H = usr H.mind.assigned_role = foundjob.title + H.mind.role_alt_title = newjob announce.autosay("[card.registered_name] has moved On-Duty as [card.assignment].", "Employee Oversight") return @@ -200,6 +201,7 @@ callHook("reassign_employee", list(card)) var/mob/living/carbon/human/H = usr H.mind.assigned_role = ptojob.title + H.mind.role_alt_title = ptojob.title foundjob.current_positions-- announce.autosay("[card.registered_name], [oldtitle], has moved Off-Duty.", "Employee Oversight") return diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 5a98c7f73c..68c862db09 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -526,9 +526,8 @@ var/global/list/default_medbay_channels = list( return -1 if(!(0 in level)) var/turf/position = get_turf(src) - if(!position || !(position.z in level)) - if(!bluespace_radio) //VOREStation Edit - return -1 + if((!position || !(position.z in level)) && !bluespace_radio) //VOREStation Edit + return -1 if(freq in ANTAG_FREQS) if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys return -1 diff --git a/code/game/objects/items/devices/radio/radio_vr.dm b/code/game/objects/items/devices/radio/radio_vr.dm index 26684ce704..932229d0ad 100644 --- a/code/game/objects/items/devices/radio/radio_vr.dm +++ b/code/game/objects/items/devices/radio/radio_vr.dm @@ -56,14 +56,14 @@ ..() /obj/item/device/subspaceradio/MouseDrop() - if(ismob(loc)) - if(!CanMouseDrop(src)) - return - var/mob/M = loc - if(!M.unEquip(src)) - return - add_fingerprint(usr) - M.put_in_any_hand_if_possible(src) + if(ismob(loc)) + if(!CanMouseDrop(src)) + return + var/mob/M = loc + if(!M.unEquip(src)) + return + add_fingerprint(usr) + M.put_in_any_hand_if_possible(src) /obj/item/device/subspaceradio/attackby(obj/item/weapon/W, mob/user, params) if(W == handset) @@ -114,7 +114,7 @@ if(ismob(handset.loc)) var/mob/M = handset.loc if(M.drop_from_inventory(handset, src)) - to_chat(user, "\The [handset] snap back into the main unit.") + to_chat(user, "\The [handset] snaps back into the main unit.") else handset.forceMove(src) diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index 5914630c57..ac48532427 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -132,7 +132,7 @@ prob(5);/obj/item/weapon/storage/backpack/satchel/norm, prob(5);/obj/item/weapon/storage/box, // prob(5);/obj/random/cigarettes, - prob(4);/obj/item/broken_device, + prob(4);/obj/item/broken_device/random, prob(4);/obj/item/clothing/head/hardhat, prob(4);/obj/item/clothing/mask/breath, prob(4);/obj/item/clothing/shoes/black, diff --git a/code/game/turfs/flooring/shuttle_vr.dm b/code/game/turfs/flooring/shuttle_vr.dm index f7f1b6e497..0b80dc7211 100644 --- a/code/game/turfs/flooring/shuttle_vr.dm +++ b/code/game/turfs/flooring/shuttle_vr.dm @@ -8,3 +8,8 @@ oxygen = 0 nitrogen = 0 temperature = TCMB + +/turf/simulated/shuttle/floor/white/airless + oxygen = 0 + nitrogen = 0 + temperature = TCMB diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 4ac69de9a7..05442e5208 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -34,7 +34,7 @@ display_name = "wallet, polychromic" path = /obj/item/weapon/storage/wallet/poly cost = 0 //VOREStation Edit - + /datum/gear/accessory/wallet/womens display_name = "wallet, womens" @@ -209,6 +209,8 @@ ..() var/list/sweaters = list() for(var/sweater in typesof(/obj/item/clothing/accessory/sweater)) + if(sweater in typesof(/obj/item/clothing/accessory/sweater/fluff)) //VOREStation addition + continue //VOREStation addition var/obj/item/clothing/suit/sweater_type = sweater sweaters[initial(sweater_type.name)] = sweater_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters)) diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index cbedca3a67..96db8bf2fe 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -27,6 +27,8 @@ ..() var/list/zippos = list() for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo)) + if(zippo in typesof(/obj/item/weapon/flame/lighter/zippo/fluff)) //VOREStation addition + continue //VOREStation addition var/obj/item/weapon/flame/lighter/zippo/zippo_type = zippo zippos[initial(zippo_type.name)] = zippo_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(zippos)) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 81099280c3..21a99fe124 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -106,6 +106,8 @@ datum/gear/suit/duster ..() var/list/hazards = list() for(var/hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest)) + if(hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest/fluff)) //VOREStation addition + continue //VOREStation addition var/obj/item/clothing/suit/storage/hazardvest/hazardvest = hazard_style hazards[initial(hazardvest.name)] = hazardvest gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hazards)) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 0c87a80a5b..0cd1c8f50e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -65,6 +65,8 @@ ..() var/list/skirts = list() for(var/skirt in (typesof(/obj/item/clothing/under/skirt))) + if(skirt in typesof(/obj/item/clothing/under/skirt/fluff)) //VOREStation addition + continue //VOREStation addition var/obj/item/clothing/under/skirt/skirt_type = skirt skirts[initial(skirt_type.name)] = skirt_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(skirts)) @@ -223,6 +225,8 @@ ..() var/list/msuits = list() for(var/msuit in typesof(/obj/item/clothing/under/suit_jacket)) + if(msuit in typesof(/obj/item/clothing/under/suit_jacket/female/fluff)) //VOREStation addition + continue //VOREStation addition var/obj/item/clothing/suit/msuit_type = msuit msuits[initial(msuit_type.name)] = msuit_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(msuits)) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 757f392335..2a1e88cd35 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -123,7 +123,7 @@ display_name = "implant, tracking" path = /obj/item/weapon/implant/tracking/weak cost = 0 //VOREStation Edit. Changed cost to 0 -/* VOREStation Edit - Make languages great again + /datum/gear/utility/implant/language cost = 2 exploitable = 0 @@ -137,7 +137,7 @@ display_name = "vocal synthesizer, Skrellian" description = "A surgically implanted vocal synthesizer which allows the owner to speak Common Skrellian, if they know it." path = /obj/item/weapon/implant/language/skrellian -*/ + /datum/gear/utility/pen display_name = "Fountain Pen" path = /obj/item/weapon/pen/fountain diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index 2fe8b54e98..dcccf64ae0 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -46,6 +46,7 @@ character.weight_loss = pref.weight_loss character.fuzzy = pref.fuzzy character.appearance_flags -= pref.fuzzy*PIXEL_SCALE + character.appearance_flags |= KEEP_TOGETHER character.resize(pref.size_multiplier, animate = FALSE) /datum/category_item/player_setup_item/vore/size/content(var/mob/user) diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm index 63a597ac8e..132d76445c 100644 --- a/code/modules/maps/tg/map_template.dm +++ b/code/modules/maps/tg/map_template.dm @@ -225,8 +225,8 @@ orientation = pick(list(0, 90, 180, 270)) chosen_template.preload_size(chosen_template.mappath, orientation) - var/width_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.height : chosen_template.width) / 2) // %180 catches East/West (90,270) rotations on true, North/South (0,180) rotations on false - var/height_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.width : chosen_template.height) / 2) + var/width_border = SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.height : chosen_template.width) / 2) // %180 catches East/West (90,270) rotations on true, North/South (0,180) rotations on false //VOREStation Edit + var/height_border = SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.width : chosen_template.height) / 2) //VOREStation Edit var/z_level = pick(z_levels) var/turf/T = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z_level) var/valid = TRUE diff --git a/code/modules/mining/ore_datum_vr.dm b/code/modules/mining/ore_datum_vr.dm new file mode 100644 index 0000000000..e55bc9e599 --- /dev/null +++ b/code/modules/mining/ore_datum_vr.dm @@ -0,0 +1,2 @@ +/ore/coal + compresses_to = "carbon" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index e8f503fe4f..a26c15ad46 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -17,7 +17,7 @@ selects_bodytype = TRUE body_temperature = T20C - breath_type = "carbon_dioxide" + breath_type = "oxygen" poison_type = "phoron" exhale_type = "oxygen" @@ -170,7 +170,7 @@ var/failed_inhale = 0 var/failed_exhale = 0 - inhaling = breath.gas[breath_type] + inhaling = breath.gas["carbon_dioxide"] poison = breath.gas[poison_type] exhaling = breath.gas[exhale_type] @@ -194,7 +194,7 @@ H.oxygen_alert = 0 inhaled_gas_used = inhaling/6 - breath.adjust_gas(breath_type, -inhaled_gas_used, update = 0) //update afterwards + breath.adjust_gas("carbon_dioxide", -inhaled_gas_used, update = 0) //update afterwards breath.adjust_gas_temp(exhale_type, inhaled_gas_used, H.bodytemperature, update = 0) //update afterwards //Now we handle CO2. diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index d5295289fa..9e618ba85c 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1363,3 +1363,30 @@ default behaviour is: BRAIN:[getBrainLoss()] "} +//VOREStation edit, allows for custom say verbs +/mob/living/verb/customsay() + set category = "IC" + set name = "Customise Say Verbs" + set desc = "Customise the text which appears when you type- e.g. 'says', 'asks', 'exclaims'." + + if(src.client && src.client.holder) + var/customsaylist[] = list( + "Say", + "Whisper", + "Ask (?)", + "Exclaim/Shout/Yell (!)", + "Cancel" + ) + var/sayselect = input("Which say-verb do you wish to customise?") as null|anything in customsaylist //we can't use alert() for this because there's too many terms + + if(sayselect == "Say") + custom_say = sanitize(input(usr, "This word or phrase will appear instead of 'says': [src] says, \"Hi.\"", "Custom Say", null) as text) + else if(sayselect == "Whisper") + custom_whisper = sanitize(input(usr, "This word or phrase will appear instead of 'whispers': [src] whispers, \"Hi...\"", "Custom Whisper", null) as text) + else if(sayselect == "Ask (?)") + custom_ask = sanitize(input(usr, "This word or phrase will appear instead of 'asks': [src] asks, \"Hi?\"", "Custom Ask", null) as text) + else if(sayselect == "Exclaim/Shout/Yell (!)") + custom_exclaim = sanitize(input(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [src] exclaims, \"Hi!\"", "Custom Exclaim", null) as text) + else + return + //VOREStation edit ends \ No newline at end of file diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index 8b463df93b..72c495ce14 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -1,3 +1,9 @@ /mob/living var/ooc_notes = null - var/obj/structure/mob_spawner/source_spawner = null \ No newline at end of file + var/obj/structure/mob_spawner/source_spawner = null + +//custom say verbs + var/custom_say = null + var/custom_ask = null + var/custom_exclaim = null + var/custom_whisper = null \ No newline at end of file diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 02900ffe1a..cad6da735c 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -275,6 +275,20 @@ proc/get_radio_key_from_channel(var/channel) message_range = 1 sound_vol *= 0.5 + //VOREStation edit - allows for custom say verbs, overriding all other say-verb types- e.g. "says loudly" instead of "shouts" + //You'll still stammer if injured or slur if drunk, but it won't have those specific words + var/ending = copytext(message, length(message)) + + if(custom_whisper && whispering) + verb = "[custom_whisper]" + else if(custom_exclaim && ending=="!") + verb = "[custom_exclaim]" + else if(custom_ask && ending=="?") + verb = "[custom_ask]" + else if(custom_say) + verb = "[custom_say]" + //VOREStation edit ends + //Handle nonverbal and sign languages here if (speaking) if (speaking.flags & SIGNLANG) diff --git a/code/modules/mob/new_player/login_vr.dm b/code/modules/mob/new_player/login_vr.dm new file mode 100644 index 0000000000..5eeb269bc5 --- /dev/null +++ b/code/modules/mob/new_player/login_vr.dm @@ -0,0 +1,2 @@ +/obj/effect/lobby_image + name = "VORE Station" \ No newline at end of file diff --git a/code/modules/projectiles/targeting/targeting_gun.dm b/code/modules/projectiles/targeting/targeting_gun.dm index e2ef466255..3b80658226 100644 --- a/code/modules/projectiles/targeting/targeting_gun.dm +++ b/code/modules/projectiles/targeting/targeting_gun.dm @@ -17,5 +17,7 @@ user.face_atom(A) if(ismob(A) && user.aiming) user.aiming.aim_at(A, src) + if(!isliving(A)) + return 0 return 1 return 0 \ No newline at end of file diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 17d2a8e114..514c3b2036 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -26,6 +26,7 @@ var/list/table_icon_cache = list() // Gambling tables. I'd prefer reinforced with carpet/felt/cloth/whatever, but AFAIK it's either harder or impossible to get /obj/item/stack/material of those. // Convert if/when you can easily get stacks of these. var/carpeted = 0 + var/carpeted_type = /obj/item/stack/tile/carpet var/list/connections = list("nw0", "ne0", "sw0", "se0") @@ -110,7 +111,7 @@ var/list/table_icon_cache = list() if(carpeted && W.is_crowbar()) user.visible_message("\The [user] removes the carpet from \the [src].", "You remove the carpet from \the [src].") - new /obj/item/stack/tile/carpet(loc) + new carpeted_type(loc) carpeted = 0 update_icon() return 1 @@ -121,6 +122,7 @@ var/list/table_icon_cache = list() user.visible_message("\The [user] adds \the [C] to \the [src].", "You add \the [C] to \the [src].") carpeted = 1 + carpeted_type = W.type update_icon() return 1 else @@ -315,7 +317,7 @@ var/list/table_icon_cache = list() S = material.place_shard(loc) if(S) shards += S if(carpeted && (full_return || prob(50))) // Higher chance to get the carpet back intact, since there's no non-intact option - new /obj/item/stack/tile/carpet(src.loc) + new carpeted_type(src.loc) if(full_return || prob(20)) new /obj/item/stack/material/steel(src.loc) else diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm index a306caea19..4728ed6ecf 100644 --- a/code/modules/ventcrawl/ventcrawl.dm +++ b/code/modules/ventcrawl/ventcrawl.dm @@ -18,6 +18,7 @@ var/list/ventcrawl_machinery = list( /mob/living/var/list/icon/pipes_shown = list() /mob/living/var/last_played_vent /mob/living/var/is_ventcrawling = 0 +/mob/living/var/prepping_to_ventcrawl = 0 /mob/var/next_play_vent = 0 /mob/living/proc/can_ventcrawl() @@ -106,7 +107,7 @@ var/list/ventcrawl_machinery = list( /mob/living/var/ventcrawl_layer = 3 /mob/living/proc/handle_ventcrawl(var/atom/clicked_on) - if(!can_ventcrawl()) + if(!can_ventcrawl() || prepping_to_ventcrawl) return var/obj/machinery/atmospherics/unary/vent_found @@ -153,6 +154,9 @@ var/list/ventcrawl_machinery = list( to_chat(src, "You feel a roaring wind pushing you away from the vent!") fade_towards(vent_found,45) + prepping_to_ventcrawl = 1 + spawn(50) + prepping_to_ventcrawl = 0 if(!do_after(src, 45, vent_found, 1, 1)) return if(!can_ventcrawl()) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 94308a0f22..767ffc3fa5 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -652,6 +652,7 @@ set category = "Preferences" set desc = "Switch sharp/fuzzy scaling for current mob." appearance_flags ^= PIXEL_SCALE + appearance_flags ^= KEEP_TOGETHER /mob/living/examine(mob/user, distance, infix, suffix) . = ..(user, distance, infix, suffix) diff --git a/html/changelogs/mistyLuminescence - Sayverbs.yml b/html/changelogs/mistyLuminescence - Sayverbs.yml new file mode 100644 index 0000000000..dc54f0712d --- /dev/null +++ b/html/changelogs/mistyLuminescence - Sayverbs.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Novacat + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "You can now select customised say-verbs in the IC tab. You know how when you use a question mark, you always 'ask' something? You don't have to "ask" any more, you can "query" instead, for example." \ No newline at end of file diff --git a/icons/turf/areas_vr.dmi b/icons/turf/areas_vr.dmi index d0bc8e7df7..6b6f7e8a22 100644 Binary files a/icons/turf/areas_vr.dmi and b/icons/turf/areas_vr.dmi differ diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index bc7b4e19ce..453b4dc8c0 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -149,6 +149,8 @@ #include "space/_debrisfield.dm" +#include "space/pois/_templates.dm" +#include "space/pois/debrisfield_things.dm" /datum/map_template/tether_lateload/away_debrisfield name = "Debris Field - Z1 Space" desc = "The Virgo 3 Debris Field away mission." @@ -158,7 +160,7 @@ /datum/map_template/tether_lateload/away_debrisfield/on_map_loaded(z) . = ..() //Commented out until we actually get POIs - //seed_submaps(list(Z_LEVEL_DEBRISFIELD), 50, /area/tether_away/debrisfield/space/poi, /datum/map_template/debrisfield) + seed_submaps(list(Z_LEVEL_DEBRISFIELD), 200, /area/tether_away/debrisfield/unexplored, /datum/map_template/debrisfield) /datum/map_z_level/tether_lateload/away_debrisfield name = "Away Mission - Debris Field" diff --git a/maps/tether/submaps/space/_debrisfield.dm b/maps/tether/submaps/space/_debrisfield.dm index 2b7db1efc4..3cf3126028 100644 --- a/maps/tether/submaps/space/_debrisfield.dm +++ b/maps/tether/submaps/space/_debrisfield.dm @@ -17,6 +17,30 @@ shuttle_name = "Excursion Shuttle" destinations = list(/datum/shuttle_destination/excursion/debrisfield) +/obj/effect/step_trigger/teleporter/debrisfield_loop/north/New() + ..() + teleport_x = x + teleport_y = 2 + teleport_z = z + +/obj/effect/step_trigger/teleporter/debrisfield_loop/south/New() + ..() + teleport_x = x + teleport_y = world.maxy - 1 + teleport_z = z + +/obj/effect/step_trigger/teleporter/debrisfield_loop/west/New() + ..() + teleport_x = world.maxx - 1 + teleport_y = y + teleport_z = z + +/obj/effect/step_trigger/teleporter/debrisfield_loop/east/New() + ..() + teleport_x = 2 + teleport_y = y + teleport_z = z + //This does nothing right now, but is framework if we do POIs for this place /obj/away_mission_init/debrisfield name = "away mission initializer - debrisfield" @@ -29,6 +53,13 @@ /area/shuttle/excursion/debrisfield name = "\improper Excursion Shuttle - Debris Field" -/area/tether_away/debrisfield/space/poi +/area/tether_away/debrisfield name = "Away Mission - Debris Field" - icon_state = "space" + icon = 'icons/turf/areas_vr.dmi' + icon_state = "dark" + +/area/tether_away/debrisfield/explored + icon_state = "debrisexplored" + +/area/tether_away/debrisfield/unexplored + icon_state = "debrisunexplored" \ No newline at end of file diff --git a/maps/tether/submaps/space/debrisfield.dmm b/maps/tether/submaps/space/debrisfield.dmm index baffaccc9d..56ad612f88 100644 --- a/maps/tether/submaps/space/debrisfield.dmm +++ b/maps/tether/submaps/space/debrisfield.dmm @@ -1,9609 +1,463 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/space, -/area/tether_away/debrisfield/space/poi) +/area/tether_away/debrisfield/unexplored) "b" = ( +/turf/space, +/area/tether_away/debrisfield/explored) +"c" = ( /obj/shuttle_connector/debrisfield, /turf/space, -/area/tether_away/debrisfield/space/poi) +/area/tether_away/debrisfield/explored) +"e" = ( +/obj/effect/step_trigger/teleporter/debrisfield_loop/north, +/turf/space, +/area/tether_away/debrisfield/explored) "f" = ( /turf/space, /area/shuttle/excursion/debrisfield) +"g" = ( +/obj/effect/step_trigger/teleporter/debrisfield_loop/east, +/turf/space, +/area/tether_away/debrisfield/explored) +"h" = ( +/obj/effect/step_trigger/teleporter/debrisfield_loop/west, +/turf/space, +/area/tether_away/debrisfield/explored) +"j" = ( +/obj/effect/step_trigger/teleporter/debrisfield_loop/south, +/turf/space, +/area/tether_away/debrisfield/explored) (1,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h "} (2,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +e +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +j "} (3,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +e +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +j "} (4,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(5,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(6,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(7,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(8,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(9,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(10,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(11,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(12,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(13,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(14,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(15,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(16,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(17,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(18,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(19,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(20,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(21,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(22,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(23,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(24,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(25,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(26,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(27,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(28,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(29,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(30,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(31,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(32,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(33,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(34,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(35,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(36,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(37,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(38,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(39,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(40,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(41,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(42,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(43,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(44,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(45,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(46,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(47,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(48,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(49,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(50,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(51,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(52,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(53,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(54,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(55,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(56,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(57,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(58,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(59,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(60,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(61,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(62,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(63,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -f -f -f -f -f -f -f -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(64,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -f -f -f -f -f -f -f -f -f -f -f -f -f -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(65,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -f -f -f -f -f -f -f -f -f -f -f -f -f -f -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(66,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -f -f -f -f -f -f -f -f -f -f -f -f -f -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(67,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -f -f -f -f -f -f -f -f -f -f -f -f -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -"} -(68,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -f -f -f -f -f -f -f -f -f -f -f -f -a -a -a +e +b b a a @@ -9665,8 +519,9176 @@ a a a a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(5,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(6,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(7,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(8,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(9,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(10,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(11,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(12,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(13,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(14,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(15,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(16,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(17,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(18,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(19,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(20,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(21,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(22,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(23,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(24,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(25,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(26,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(27,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(28,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(29,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(30,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(31,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(32,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(33,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(34,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(35,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(36,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(37,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(38,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(39,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(40,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(41,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(42,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(43,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(44,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(45,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(46,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(47,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(48,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(49,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(50,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(51,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(52,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(53,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(54,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(55,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(56,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(57,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(58,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(59,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(60,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(61,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(62,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(63,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +f +f +f +f +f +f +f +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(64,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +f +f +f +f +f +f +f +f +f +f +f +f +f +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(65,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +f +f +f +f +f +f +f +f +f +f +f +f +f +f +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(66,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +f +f +f +f +f +f +f +f +f +f +f +f +f +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(67,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +f +f +f +f +f +f +f +f +f +f +f +f +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j +"} +(68,1,1) = {" +e +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +f +f +f +f +f +f +f +f +f +f +f +f +b +b +b +c +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +j "} (69,1,1) = {" +e +b +b a a a @@ -9722,15 +9744,12 @@ a a a a -a -a -a -a -a -a -a -a -a +b +b +b +b +b +b f f f @@ -9744,6 +9763,12 @@ f f f f +b +b +b +b +b +b a a a @@ -9798,17 +9823,14 @@ a a a a -a -a -a -a -a -a -a -a -a +b +b +j "} (70,1,1) = {" +e +b +b a a a @@ -9864,15 +9886,12 @@ a a a a -a -a -a -a -a -a -a -a -a +b +b +b +b +b +b f f f @@ -9886,6 +9905,12 @@ f f f f +b +b +b +b +b +b a a a @@ -9940,17 +9965,14 @@ a a a a -a -a -a -a -a -a -a -a -a +b +b +j "} (71,1,1) = {" +e +b +b a a a @@ -10006,15 +10028,12 @@ a a a a -a -a -a -a -a -a -a -a -a +b +b +b +b +b +b f f f @@ -10029,6 +10048,11 @@ f f f f +b +b +b +b +b a a a @@ -10083,16 +10107,14 @@ a a a a -a -a -a -a -a -a -a -a +b +b +j "} (72,1,1) = {" +e +b +b a a a @@ -10148,16 +10170,13 @@ a a a a -a -a -a -a -a -a -a -a -a -a +b +b +b +b +b +b +b f f f @@ -10171,6 +10190,11 @@ f f f f +b +b +b +b +b a a a @@ -10225,16 +10249,14 @@ a a a a -a -a -a -a -a -a -a -a +b +b +j "} (73,1,1) = {" +e +b +b a a a @@ -10290,22 +10312,19 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +b +b +b +b +b +b +b +b +b +b +b f f f @@ -10313,6 +10332,11 @@ f f f f +b +b +b +b +b a a a @@ -10367,16 +10391,14 @@ a a a a -a -a -a -a -a -a -a -a +b +b +j "} (74,1,1) = {" +e +b +b a a a @@ -10432,6 +10454,31 @@ a a a a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b a a a @@ -10486,39 +10533,14 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +j "} (75,1,1) = {" +e +b +b a a a @@ -10574,6 +10596,31 @@ a a a a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b a a a @@ -10628,39 +10675,14 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +j "} (76,1,1) = {" +e +b +b a a a @@ -10716,6 +10738,31 @@ a a a a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b a a a @@ -10770,39 +10817,14 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +j "} (77,1,1) = {" +e +b +b a a a @@ -10858,6 +10880,31 @@ a a a a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b a a a @@ -10912,39 +10959,14 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +j "} (78,1,1) = {" +e +b +b a a a @@ -11000,6 +11022,31 @@ a a a a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b a a a @@ -11054,39 +11101,14 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +j "} (79,1,1) = {" +e +b +b a a a @@ -11221,14 +11243,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (80,1,1) = {" +e +b +b a a a @@ -11363,14 +11385,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (81,1,1) = {" +e +b +b a a a @@ -11505,14 +11527,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (82,1,1) = {" +e +b +b a a a @@ -11647,14 +11669,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (83,1,1) = {" +e +b +b a a a @@ -11789,14 +11811,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (84,1,1) = {" +e +b +b a a a @@ -11931,14 +11953,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (85,1,1) = {" +e +b +b a a a @@ -12073,14 +12095,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (86,1,1) = {" +e +b +b a a a @@ -12215,14 +12237,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (87,1,1) = {" +e +b +b a a a @@ -12357,14 +12379,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (88,1,1) = {" +e +b +b a a a @@ -12499,14 +12521,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (89,1,1) = {" +e +b +b a a a @@ -12641,14 +12663,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (90,1,1) = {" +e +b +b a a a @@ -12783,14 +12805,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (91,1,1) = {" +e +b +b a a a @@ -12925,14 +12947,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (92,1,1) = {" +e +b +b a a a @@ -13067,14 +13089,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (93,1,1) = {" +e +b +b a a a @@ -13209,14 +13231,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (94,1,1) = {" +e +b +b a a a @@ -13351,14 +13373,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (95,1,1) = {" +e +b +b a a a @@ -13493,14 +13515,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (96,1,1) = {" +e +b +b a a a @@ -13635,14 +13657,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (97,1,1) = {" +e +b +b a a a @@ -13777,14 +13799,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (98,1,1) = {" +e +b +b a a a @@ -13919,14 +13941,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (99,1,1) = {" +e +b +b a a a @@ -14061,14 +14083,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (100,1,1) = {" +e +b +b a a a @@ -14203,14 +14225,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (101,1,1) = {" +e +b +b a a a @@ -14345,14 +14367,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (102,1,1) = {" +e +b +b a a a @@ -14487,14 +14509,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (103,1,1) = {" +e +b +b a a a @@ -14629,14 +14651,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (104,1,1) = {" +e +b +b a a a @@ -14771,14 +14793,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (105,1,1) = {" +e +b +b a a a @@ -14913,14 +14935,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (106,1,1) = {" +e +b +b a a a @@ -15055,14 +15077,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (107,1,1) = {" +e +b +b a a a @@ -15197,14 +15219,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (108,1,1) = {" +e +b +b a a a @@ -15339,14 +15361,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (109,1,1) = {" +e +b +b a a a @@ -15481,14 +15503,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (110,1,1) = {" +e +b +b a a a @@ -15623,14 +15645,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (111,1,1) = {" +e +b +b a a a @@ -15765,14 +15787,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (112,1,1) = {" +e +b +b a a a @@ -15907,14 +15929,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (113,1,1) = {" +e +b +b a a a @@ -16049,14 +16071,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (114,1,1) = {" +e +b +b a a a @@ -16191,14 +16213,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (115,1,1) = {" +e +b +b a a a @@ -16333,14 +16355,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (116,1,1) = {" +e +b +b a a a @@ -16475,14 +16497,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (117,1,1) = {" +e +b +b a a a @@ -16617,14 +16639,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (118,1,1) = {" +e +b +b a a a @@ -16759,14 +16781,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (119,1,1) = {" +e +b +b a a a @@ -16901,14 +16923,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (120,1,1) = {" +e +b +b a a a @@ -17043,14 +17065,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (121,1,1) = {" +e +b +b a a a @@ -17185,14 +17207,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (122,1,1) = {" +e +b +b a a a @@ -17327,14 +17349,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (123,1,1) = {" +e +b +b a a a @@ -17469,14 +17491,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (124,1,1) = {" +e +b +b a a a @@ -17611,14 +17633,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (125,1,1) = {" +e +b +b a a a @@ -17753,14 +17775,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (126,1,1) = {" +e +b +b a a a @@ -17895,14 +17917,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (127,1,1) = {" +e +b +b a a a @@ -18037,14 +18059,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (128,1,1) = {" +e +b +b a a a @@ -18179,14 +18201,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (129,1,1) = {" +e +b +b a a a @@ -18321,14 +18343,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (130,1,1) = {" +e +b +b a a a @@ -18463,14 +18485,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (131,1,1) = {" +e +b +b a a a @@ -18605,14 +18627,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (132,1,1) = {" +e +b +b a a a @@ -18747,14 +18769,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (133,1,1) = {" +e +b +b a a a @@ -18889,14 +18911,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (134,1,1) = {" +e +b +b a a a @@ -19031,14 +19053,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (135,1,1) = {" +e +b +b a a a @@ -19173,14 +19195,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (136,1,1) = {" +e +b +b a a a @@ -19315,14 +19337,14 @@ a a a a -a -a -a -a -a -a +b +b +j "} (137,1,1) = {" +e +b +b a a a @@ -19457,436 +19479,433 @@ a a a a -a -a -a -a -a -a +b +b +j "} (138,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +e +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +j "} (139,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +e +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +j "} (140,1,1) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +e +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g +g "} diff --git a/maps/tether/submaps/space/pois/_templates.dm b/maps/tether/submaps/space/pois/_templates.dm new file mode 100644 index 0000000000..2ca55e2555 --- /dev/null +++ b/maps/tether/submaps/space/pois/_templates.dm @@ -0,0 +1,68 @@ +/datum/map_template/debrisfield + name = "Debris Field Content" + desc = "For seeding submaps in debris field" + allow_duplicates = TRUE + +/datum/map_template/debrisfield/asteroids1 + name = "Asteroids 1" + mappath = 'asteroids1.dmm' + cost = 2 + +/datum/map_template/debrisfield/asteroids2 + name = "Asteroids 2" + mappath = 'asteroids2.dmm' + cost = 2 + +/datum/map_template/debrisfield/asteroids3 + name = "Asteroids 3" + mappath = 'asteroids3.dmm' + cost = 2 + +/datum/map_template/debrisfield/carp_asteroids1 + name = "Carp Asteroids 1" + mappath = 'carp_asteroids1.dmm' + cost = 5 + +/datum/map_template/debrisfield/carp_asteroids2 + name = "Carp Asteroids 2" + mappath = 'carp_asteroids2.dmm' + cost = 5 + +/datum/map_template/debrisfield/carp_asteroids3 + name = "Carp Asteroids 3" + mappath = 'carp_asteroids3.dmm' + cost = 5 + +/datum/map_template/debrisfield/carp_asteroids4 + name = "Carp Asteroids 4" + mappath = 'carp_asteroids4.dmm' + cost = 5 + +/datum/map_template/debrisfield/foodstand + name = "Food Stand" + mappath = 'foodstand.dmm' + cost = 20 + allow_duplicates = FALSE + +/datum/map_template/debrisfield/debris1 + name = "Debris 1" + mappath = 'debris1.dmm' + cost = 2 + +/datum/map_template/debrisfield/ship_sup_exploded + name = "Exploded Cargo Ship" + mappath = 'ship_sup_exploded.dmm' + cost = 35 + allow_duplicates = FALSE + +/datum/map_template/debrisfield/ship_med_crashed + name = "Crashed Medical Ship" + mappath = 'ship_med_crashed.dmm' + cost = 35 + allow_duplicates = FALSE + +/datum/map_template/debrisfield/ship_sci_overrun + name = "Overrun Research Ship" + mappath = 'ship_sci_overrun.dmm' + cost = 35 + allow_duplicates = FALSE diff --git a/maps/tether/submaps/space/pois/asteroids1.dmm b/maps/tether/submaps/space/pois/asteroids1.dmm new file mode 100644 index 0000000000..0bdaf44d13 --- /dev/null +++ b/maps/tether/submaps/space/pois/asteroids1.dmm @@ -0,0 +1,129 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +b +b +b +a +a +b +b +"} +(2,1,1) = {" +a +a +b +b +a +a +a +a +b +"} +(3,1,1) = {" +b +b +b +b +b +a +a +a +b +"} +(4,1,1) = {" +b +b +a +b +b +b +a +b +b +"} +(5,1,1) = {" +b +a +a +a +b +b +b +b +b +"} +(6,1,1) = {" +b +a +a +a +a +b +b +b +b +"} +(7,1,1) = {" +a +a +a +a +a +a +b +b +a +"} +(8,1,1) = {" +a +a +a +a +a +a +b +a +a +"} +(9,1,1) = {" +b +a +a +a +a +a +b +b +b +"} +(10,1,1) = {" +b +b +b +a +a +b +b +b +b +"} +(11,1,1) = {" +b +b +b +b +b +b +b +b +a +"} diff --git a/maps/tether/submaps/space/pois/asteroids2.dmm b/maps/tether/submaps/space/pois/asteroids2.dmm new file mode 100644 index 0000000000..77631496cc --- /dev/null +++ b/maps/tether/submaps/space/pois/asteroids2.dmm @@ -0,0 +1,128 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +a +b +b +b +b +a +a +a +a +b +b +"} +(2,1,1) = {" +a +a +a +b +b +b +a +a +a +a +a +b +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +b +b +a +a +a +a +a +b +b +a +a +a +"} +(5,1,1) = {" +b +b +b +b +a +a +a +a +b +b +b +a +a +"} +(6,1,1) = {" +b +b +b +b +a +a +a +b +b +b +b +b +a +"} +(7,1,1) = {" +a +b +b +b +a +a +b +b +b +b +b +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +b +b +b +b +a +a +"} diff --git a/maps/tether/submaps/space/pois/asteroids3.dmm b/maps/tether/submaps/space/pois/asteroids3.dmm new file mode 100644 index 0000000000..ea91de7838 --- /dev/null +++ b/maps/tether/submaps/space/pois/asteroids3.dmm @@ -0,0 +1,107 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +b +b +b +a +a +a +a +b +"} +(2,1,1) = {" +a +a +b +a +a +a +a +a +a +"} +(3,1,1) = {" +a +b +b +a +a +a +a +a +a +"} +(4,1,1) = {" +b +b +b +b +a +a +a +a +b +"} +(5,1,1) = {" +b +b +b +b +b +a +a +a +b +"} +(6,1,1) = {" +b +a +a +b +b +b +a +b +b +"} +(7,1,1) = {" +a +a +a +a +b +b +b +b +a +"} +(8,1,1) = {" +a +a +a +b +b +b +b +b +b +"} +(9,1,1) = {" +b +a +b +b +b +b +a +a +b +"} diff --git a/maps/tether/submaps/space/pois/carp_asteroids1.dmm b/maps/tether/submaps/space/pois/carp_asteroids1.dmm new file mode 100644 index 0000000000..985271c59b --- /dev/null +++ b/maps/tether/submaps/space/pois/carp_asteroids1.dmm @@ -0,0 +1,155 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"c" = ( +/obj/tether_away_spawner/debrisfield/carp, +/turf/template_noop, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +b +b +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +b +a +a +a +b +b +a +"} +(3,1,1) = {" +a +a +b +b +b +b +a +a +b +b +b +"} +(4,1,1) = {" +a +a +a +b +a +a +a +b +b +b +b +"} +(5,1,1) = {" +a +a +a +a +a +a +a +b +b +b +b +"} +(6,1,1) = {" +a +b +b +a +a +c +a +b +b +b +b +"} +(7,1,1) = {" +b +b +b +b +a +a +a +a +b +b +a +"} +(8,1,1) = {" +b +b +b +b +a +a +a +a +a +a +a +"} +(9,1,1) = {" +b +b +b +a +a +b +b +a +a +a +a +"} +(10,1,1) = {" +b +b +a +a +b +b +b +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +b +b +b +b +a +a +a +"} diff --git a/maps/tether/submaps/space/pois/carp_asteroids2.dmm b/maps/tether/submaps/space/pois/carp_asteroids2.dmm new file mode 100644 index 0000000000..4231265275 --- /dev/null +++ b/maps/tether/submaps/space/pois/carp_asteroids2.dmm @@ -0,0 +1,129 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"c" = ( +/obj/tether_away_spawner/debrisfield/carp, +/turf/template_noop, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +b +b +b +b +b +"} +(2,1,1) = {" +a +a +a +b +b +a +a +"} +(3,1,1) = {" +a +a +a +b +b +b +b +"} +(4,1,1) = {" +b +b +b +b +b +c +b +"} +(5,1,1) = {" +b +b +a +a +b +b +b +"} +(6,1,1) = {" +b +a +a +a +a +b +b +"} +(7,1,1) = {" +b +a +a +a +a +b +b +"} +(8,1,1) = {" +b +c +a +a +b +b +b +"} +(9,1,1) = {" +b +b +a +b +b +b +b +"} +(10,1,1) = {" +b +b +b +b +b +b +b +"} +(11,1,1) = {" +b +b +b +b +a +a +b +"} +(12,1,1) = {" +b +a +b +b +a +a +a +"} +(13,1,1) = {" +b +b +b +b +b +a +b +"} diff --git a/maps/tether/submaps/space/pois/carp_asteroids3.dmm b/maps/tether/submaps/space/pois/carp_asteroids3.dmm new file mode 100644 index 0000000000..c6de2a9657 --- /dev/null +++ b/maps/tether/submaps/space/pois/carp_asteroids3.dmm @@ -0,0 +1,162 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"c" = ( +/obj/tether_away_spawner/debrisfield/carp, +/turf/template_noop, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +b +a +a +"} +(2,1,1) = {" +a +c +a +a +a +a +a +a +b +b +b +b +a +"} +(3,1,1) = {" +a +a +a +b +b +b +a +a +b +b +b +b +a +"} +(4,1,1) = {" +a +a +b +b +b +b +b +a +a +b +b +a +a +"} +(5,1,1) = {" +a +b +b +b +b +b +b +b +a +a +a +a +a +"} +(6,1,1) = {" +a +b +b +b +b +b +b +b +a +a +a +a +a +"} +(7,1,1) = {" +b +b +b +b +b +b +b +b +a +a +a +a +a +"} +(8,1,1) = {" +b +b +b +b +b +b +b +a +a +a +a +a +b +"} +(9,1,1) = {" +a +b +b +b +b +a +a +a +a +c +a +b +b +"} +(10,1,1) = {" +a +a +b +b +a +a +a +a +a +a +a +b +b +"} diff --git a/maps/tether/submaps/space/pois/carp_asteroids4.dmm b/maps/tether/submaps/space/pois/carp_asteroids4.dmm new file mode 100644 index 0000000000..e4ebbe5b4d --- /dev/null +++ b/maps/tether/submaps/space/pois/carp_asteroids4.dmm @@ -0,0 +1,122 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"c" = ( +/obj/tether_away_spawner/debrisfield/carp/hard, +/turf/template_noop, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +b +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +a +b +b +b +"} +(3,1,1) = {" +b +b +b +b +a +b +b +b +"} +(4,1,1) = {" +b +b +b +a +a +a +b +b +"} +(5,1,1) = {" +a +b +a +a +c +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +b +b +b +a +a +a +"} +(8,1,1) = {" +a +b +b +b +b +b +b +a +"} +(9,1,1) = {" +a +b +b +b +b +b +b +a +"} +(10,1,1) = {" +a +a +b +b +b +b +a +a +"} +(11,1,1) = {" +a +a +a +b +b +a +a +a +"} diff --git a/maps/tether/submaps/space/pois/debris1.dmm b/maps/tether/submaps/space/pois/debris1.dmm new file mode 100644 index 0000000000..2c9339ae2d --- /dev/null +++ b/maps/tether/submaps/space/pois/debris1.dmm @@ -0,0 +1,48 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/lattice, +/turf/space, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"c" = ( +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"d" = ( +/obj/structure/girder, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +c +b +d +c +"} +(2,1,1) = {" +a +a +c +c +c +b +"} +(3,1,1) = {" +a +a +c +c +b +b +"} +(4,1,1) = {" +b +a +d +d +c +b +"} diff --git a/maps/tether/submaps/space/pois/debrisfield_things.dm b/maps/tether/submaps/space/pois/debrisfield_things.dm new file mode 100644 index 0000000000..abfb414766 --- /dev/null +++ b/maps/tether/submaps/space/pois/debrisfield_things.dm @@ -0,0 +1,61 @@ +/obj/tether_away_spawner/debrisfield + atmos_comp = FALSE + +/obj/tether_away_spawner/debrisfield/carp + name = "debris field carp spawner" + mobs_to_pick_from = list( + /mob/living/simple_mob/animal/space/carp = 3, + /mob/living/simple_mob/animal/space/carp/large = 1 + ) + +/obj/tether_away_spawner/debrisfield/carp/hard + mobs_to_pick_from = list( + /mob/living/simple_mob/animal/space/carp/large = 2, + /mob/living/simple_mob/animal/space/carp/large/huge = 1 + ) + + +//Sciship +/mob/living/simple_mob/tomato/space + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + +/mob/living/simple_mob/tomato/space/Process_Spacemove(var/check_drift = 0) + return TRUE + +/obj/random/slimecore + name = "random slime core" + desc = "Random slime core." + icon = 'icons/mob/slimes.dmi' + icon_state = "rainbow slime extract" + +/obj/random/slimecore/item_to_spawn() + return pick(prob(3);/obj/item/slime_extract/metal, + prob(3);/obj/item/slime_extract/blue, + prob(3);/obj/item/slime_extract/purple, + prob(3);/obj/item/slime_extract/orange, + prob(3);/obj/item/slime_extract/yellow, + prob(3);/obj/item/slime_extract/gold, + prob(3);/obj/item/slime_extract/silver, + prob(3);/obj/item/slime_extract/dark_purple, + prob(3);/obj/item/slime_extract/dark_blue, + prob(3);/obj/item/slime_extract/red, + prob(3);/obj/item/slime_extract/green, + prob(3);/obj/item/slime_extract/pink, + prob(2);/obj/item/slime_extract/oil, + prob(2);/obj/item/slime_extract/bluespace, + prob(2);/obj/item/slime_extract/cerulean, + prob(2);/obj/item/slime_extract/amber, + prob(2);/obj/item/slime_extract/sapphire, + prob(2);/obj/item/slime_extract/ruby, + prob(2);/obj/item/slime_extract/emerald, + prob(2);/obj/item/slime_extract/light_pink, + prob(1);/obj/item/slime_extract/grey, + prob(1);/obj/item/slime_extract/rainbow) \ No newline at end of file diff --git a/maps/tether/submaps/space/pois/foodstand.dmm b/maps/tether/submaps/space/pois/foodstand.dmm new file mode 100644 index 0000000000..a035bb4b3a --- /dev/null +++ b/maps/tether/submaps/space/pois/foodstand.dmm @@ -0,0 +1,237 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"c" = ( +/turf/simulated/mineral/floor/vacuum, +/area/tether_away/debrisfield/explored) +"d" = ( +/turf/simulated/wall/wood, +/area/tether_away/debrisfield/explored) +"e" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"f" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/condiment/coldsauce, +/obj/item/weapon/reagent_containers/food/condiment/ketchup, +/obj/item/weapon/reagent_containers/food/condiment/hotsauce, +/obj/item/weapon/reagent_containers/food/condiment/soysauce, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"g" = ( +/obj/structure/table/woodentable, +/obj/machinery/microwave, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"h" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"i" = ( +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"j" = ( +/obj/structure/closet/crate/freezer, +/obj/item/weapon/reagent_containers/food/snacks/taco, +/obj/item/weapon/reagent_containers/food/snacks/taco, +/obj/item/weapon/reagent_containers/food/snacks/taco, +/obj/item/weapon/reagent_containers/food/snacks/hotdog, +/obj/item/weapon/reagent_containers/food/snacks/hotdog, +/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, +/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"k" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"l" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/taco, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) +"m" = ( +/obj/structure/table/woodentable, +/obj/machinery/cash_register{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +b +b +c +c +c +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +b +c +c +c +c +a +a +"} +(3,1,1) = {" +b +b +b +b +c +c +c +c +c +c +a +"} +(4,1,1) = {" +b +b +b +c +c +c +c +c +c +c +a +"} +(5,1,1) = {" +b +b +b +c +d +d +h +d +c +c +a +"} +(6,1,1) = {" +b +b +c +c +d +e +i +m +c +c +c +"} +(7,1,1) = {" +a +b +c +c +d +f +i +l +c +c +c +"} +(8,1,1) = {" +a +c +c +c +d +g +j +k +c +c +c +"} +(9,1,1) = {" +a +c +c +c +d +d +d +d +c +c +c +"} +(10,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +"} +(11,1,1) = {" +a +a +a +c +c +c +c +c +c +c +a +"} +(12,1,1) = {" +a +a +a +a +a +c +c +c +c +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +c +c +a +a +a +"} diff --git a/maps/tether/submaps/space/pois/ship_med_crashed.dmm b/maps/tether/submaps/space/pois/ship_med_crashed.dmm new file mode 100644 index 0000000000..5343ec1ac9 --- /dev/null +++ b/maps/tether/submaps/space/pois/ship_med_crashed.dmm @@ -0,0 +1,733 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"b" = ( +/turf/simulated/mineral/vacuum, +/area/tether_away/debrisfield/explored) +"c" = ( +/turf/simulated/shuttle/wall, +/area/tether_away/debrisfield/explored) +"d" = ( +/turf/simulated/mineral/floor/vacuum, +/area/tether_away/debrisfield/explored) +"e" = ( +/obj/structure/shuttle/window, +/obj/structure/grille, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"f" = ( +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"g" = ( +/obj/effect/decal/cleanable/generic, +/turf/simulated/mineral/floor/vacuum, +/area/tether_away/debrisfield/explored) +"h" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/frame, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"i" = ( +/obj/structure/frame, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"j" = ( +/obj/structure/closet/secure_closet/sar{ + name = "sar locker"; + req_access = list() + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"k" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4 + }, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"l" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"m" = ( +/obj/structure/table/standard, +/obj/random/unidentified_medicine/fresh_medicine, +/obj/random/unidentified_medicine/fresh_medicine, +/obj/random/unidentified_medicine/old_medicine, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"n" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"o" = ( +/obj/structure/table/standard, +/obj/random/unidentified_medicine/fresh_medicine, +/obj/random/unidentified_medicine/fresh_medicine, +/obj/random/unidentified_medicine/viral, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"p" = ( +/obj/structure/closet/secure_closet/medical3{ + name = "medical locker"; + req_access = list() + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"q" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/molten_item, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"r" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"s" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/remains/posi, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"t" = ( +/obj/machinery/door/unpowered/shuttle, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"u" = ( +/obj/structure/closet/emcloset, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"v" = ( +/obj/structure/table/rack, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"w" = ( +/obj/effect/decal/cleanable/generic, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"x" = ( +/obj/structure/dispenser/oxygen{ + oxygentanks = 7 + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"y" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"z" = ( +/obj/structure/frame/computer{ + dir = 1 + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"A" = ( +/obj/machinery/suit_cycler/medical, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"B" = ( +/mob/living/bot/medbot{ + name = "Dr. Crusty" + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"C" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/firstaid, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"D" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/storage/firstaid/adv, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"E" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/mineral/floor/vacuum, +/area/tether_away/debrisfield/explored) +"F" = ( +/obj/item/stack/material/steel, +/turf/simulated/mineral/floor/vacuum, +/area/tether_away/debrisfield/explored) +"G" = ( +/obj/item/stack/rods, +/turf/simulated/mineral/floor/vacuum, +/area/tether_away/debrisfield/explored) +"H" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/material/steel, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"I" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"J" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"K" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"L" = ( +/obj/tether_away_spawner/debrisfield/carp, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"M" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +"} +(4,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(5,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(6,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(7,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(8,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(9,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(10,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(11,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(12,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(13,1,1) = {" +a +b +b +b +b +b +b +F +G +E +E +G +d +b +b +b +b +b +a +a +"} +(14,1,1) = {" +a +a +b +b +c +g +E +n +q +r +H +D +J +g +c +b +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +c +h +l +C +H +s +n +I +w +y +c +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +c +c +c +c +M +f +f +f +K +z +c +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +c +i +m +o +c +f +f +c +c +c +c +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +c +f +f +f +f +f +f +u +x +A +c +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +e +B +f +f +c +f +f +f +f +f +e +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +e +f +f +f +c +f +f +f +f +f +e +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +c +j +j +p +c +t +c +v +v +v +c +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +c +c +c +c +c +f +c +c +c +c +c +a +a +a +a +a +"} +(23,1,1) = {" +a +L +a +a +c +k +k +k +M +t +M +k +k +k +c +a +a +a +L +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/tether/submaps/space/pois/ship_sci_overrun.dmm b/maps/tether/submaps/space/pois/ship_sci_overrun.dmm new file mode 100644 index 0000000000..66bdd9c3d4 --- /dev/null +++ b/maps/tether/submaps/space/pois/ship_sci_overrun.dmm @@ -0,0 +1,1250 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"ab" = ( +/turf/simulated/wall/thull, +/area/tether_away/debrisfield/explored) +"ac" = ( +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"ad" = ( +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ae" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"af" = ( +/obj/machinery/botany/editor, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ag" = ( +/obj/machinery/vending/hydronutrients, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ah" = ( +/obj/machinery/seed_extractor, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ai" = ( +/obj/machinery/seed_storage/xenobotany, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aj" = ( +/obj/machinery/botany/extractor, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ak" = ( +/obj/item/seeds/killertomatoseed, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"al" = ( +/obj/structure/railing, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"am" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"an" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ao" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ap" = ( +/obj/structure/table/rack, +/obj/item/weapon/shovel/spade, +/obj/item/weapon/shovel/spade, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/material/minihoe, +/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/weapon/material/knife/machete/hatchet, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/device/analyzer/plant_analyzer, +/obj/item/device/analyzer/plant_analyzer, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aq" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ar" = ( +/mob/living/simple_mob/tomato/space, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"as" = ( +/obj/structure/table/rack, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"at" = ( +/obj/machinery/door/airlock/science{ + req_one_access = list(0) + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"au" = ( +/obj/item/clothing/head/collectable/slime, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"av" = ( +/obj/structure/sign/hydro, +/turf/simulated/wall/thull, +/area/tether_away/debrisfield/explored) +"aw" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ax" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + name = "Research Airlock"; + req_one_access = list(0) + }, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"ay" = ( +/obj/structure/sign/xenobio, +/turf/simulated/wall/thull, +/area/tether_away/debrisfield/explored) +"az" = ( +/obj/item/device/slime_scanner, +/obj/item/device/slime_scanner, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aA" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/gun/energy/taser/xeno, +/obj/item/weapon/melee/baton/slime/loaded, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aB" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aC" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube, +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aD" = ( +/obj/machinery/processor, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aE" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"aF" = ( +/obj/item/weapon/reagent_containers/spray/plantbgone, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aG" = ( +/obj/item/weapon/reagent_containers/spray/chemsprayer, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aH" = ( +/obj/tether_away_spawner/debrisfield/carp, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"aI" = ( +/obj/effect/decal/remains, +/obj/item/clothing/under/rank/hydroponics, +/obj/item/clothing/suit/storage/toggle/labcoat/green, +/obj/item/clothing/head/greenbandana, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aJ" = ( +/obj/structure/table/rack, +/obj/item/slime_extract/rainbow, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aK" = ( +/obj/item/weapon/gun/energy/temperature, +/obj/structure/table/rack, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aL" = ( +/obj/structure/window/reinforced/full, +/obj/structure/grille, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"aM" = ( +/obj/machinery/computer/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aN" = ( +/obj/structure/bed/chair/comfy/purp{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aO" = ( +/obj/item/weapon/gun/energy/decloner, +/obj/structure/table/rack, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aP" = ( +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aQ" = ( +/obj/structure/table/reinforced, +/obj/item/stack/material/phoron{ + amount = 10 + }, +/obj/item/device/flashlight/pen, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aR" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen/blue, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aS" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/folder/white, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aT" = ( +/mob/living/simple_mob/slime/feral/dark_blue, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aU" = ( +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/weapon/material/shard, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aV" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aW" = ( +/obj/item/weapon/airlock_electronics, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aX" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aY" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"aZ" = ( +/obj/machinery/door/unpowered/shuttle, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"ba" = ( +/obj/item/clothing/suit/storage/toggle/labcoat/purple, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bb" = ( +/obj/effect/decal/remains, +/obj/item/clothing/under/rank/scientist, +/obj/item/clothing/suit/storage/toggle/labcoat/blue, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bc" = ( +/obj/structure/closet/secure_closet/scientist{ + name = "scientist locker"; + req_access = list(0) + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bd" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet/blue, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"be" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet/green, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bf" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet/rd, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bg" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"bi" = ( +/obj/structure/table/rack, +/obj/random/firstaid, +/obj/random/firstaid, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"bj" = ( +/obj/structure/table/rack, +/obj/random/unidentified_medicine/scientific, +/obj/random/unidentified_medicine/scientific, +/obj/random/unidentified_medicine/scientific, +/obj/random/unidentified_medicine/scientific, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"bk" = ( +/obj/machinery/door/airlock/command{ + name = "Research Airlock"; + req_one_access = list(0) + }, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bl" = ( +/obj/structure/closet/crate, +/obj/item/stack/material/uranium{ + amount = 11 + }, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"bm" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"bn" = ( +/obj/machinery/power/port_gen/pacman/super, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) +"bo" = ( +/obj/structure/table/reinforced, +/obj/random/slimecore, +/obj/random/slimecore, +/obj/random/slimecore, +/obj/random/slimecore, +/obj/random/slimecore, +/turf/simulated/floor/tiled/white/airless, +/area/tether_away/debrisfield/explored) +"bp" = ( +/obj/item/weapon/tool/prybar/red, +/turf/simulated/floor/airless, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(3,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(4,1,1) = {" +aa +aa +aa +ab +bh +bh +ab +ab +bh +bh +ab +aa +aa +aa +ab +bh +bh +ab +ab +bh +bh +ab +aa +aa +aa +"} +(5,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +bp +ac +ac +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(6,1,1) = {" +aa +aa +aa +ab +as +as +ac +ac +bi +bj +ab +ab +aZ +ab +ab +bl +ac +ac +ac +ac +bm +ab +aa +aa +aa +"} +(7,1,1) = {" +aa +aa +aa +ab +ac +ac +ac +ac +ac +ac +ab +aY +ad +aY +ab +bm +ac +ac +ac +ac +bn +ab +aa +aa +aa +"} +(8,1,1) = {" +aa +aa +aa +ab +ab +ab +ax +ab +ab +ab +ab +ab +aZ +ab +ab +ab +ab +ab +ax +ab +ab +ab +aa +aa +aa +"} +(9,1,1) = {" +aa +aa +aa +ab +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ab +aa +aa +aa +"} +(10,1,1) = {" +aa +aa +aa +ab +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ad +ab +aa +aa +aa +"} +(11,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +at +ab +ab +ad +ad +ad +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(12,1,1) = {" +aa +aa +aa +ab +bc +bc +bc +ad +ad +bg +ab +ad +ad +ad +ab +aP +ad +ad +ab +ad +aT +ab +aa +aa +aa +"} +(13,1,1) = {" +aa +aa +aa +aE +ad +ad +ad +ad +au +ad +ab +ad +ad +ad +ab +aQ +ad +aW +aX +ad +ad +ab +aa +aa +aa +"} +(14,1,1) = {" +aa +aa +aa +aE +ad +ad +ad +ad +ad +ad +ab +ad +ad +ad +ab +aR +aV +ad +ab +ab +ab +ab +aa +aa +aa +"} +(15,1,1) = {" +aa +aa +aa +ab +bd +ad +be +ad +ad +bf +ab +ad +ad +ad +ab +aS +ad +ad +ab +ad +ad +ab +aa +aa +aa +"} +(16,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ad +ad +ad +ab +aB +ad +ad +aX +ad +ad +ab +aa +aa +aa +"} +(17,1,1) = {" +aa +aa +aa +ab +ae +ae +ae +ae +ae +ae +ab +ad +ad +ad +ab +ad +ad +ad +ab +ab +ab +ab +aa +aa +aa +"} +(18,1,1) = {" +aa +aa +aa +ab +ad +ak +ad +ad +ar +ad +ab +ad +ad +ad +ab +aT +ad +aX +ab +ad +ad +ab +aa +aa +aa +"} +(19,1,1) = {" +aa +aa +aa +ab +af +ar +ad +ad +ad +ad +ab +ad +ad +ad +ab +ad +ad +aW +ad +ad +ad +ab +aa +aa +aa +"} +(20,1,1) = {" +aa +aa +aa +ab +ag +ad +am +am +ad +ar +av +ad +ad +ad +ab +ad +ad +ad +ab +ab +ab +ab +aa +aa +aa +"} +(21,1,1) = {" +aa +aa +aa +ab +ah +al +an +ap +aq +ad +at +ad +ad +ad +ab +ad +ad +ad +aw +aw +aw +ab +aa +aa +aa +"} +(22,1,1) = {" +aa +aa +aa +ab +ai +ad +ao +ao +ad +ad +ab +ad +ad +ad +ay +ad +bb +ad +ad +ad +ad +ab +aa +aa +aa +"} +(23,1,1) = {" +aa +aa +aa +ab +aj +aF +ar +ad +ad +ad +ab +ad +ad +ad +at +ad +ad +ad +ad +ad +ad +ab +aa +aa +aa +"} +(24,1,1) = {" +aa +aa +aa +ab +aF +aG +aI +ad +ar +ak +ab +ad +ad +ad +ab +ad +ad +ad +ad +aT +ad +ab +aa +aa +aa +"} +(25,1,1) = {" +aa +aa +aa +ab +ae +ae +ae +ae +ae +ae +ab +aw +ad +aw +ab +az +aA +bo +bo +aC +aD +ab +aa +aa +aa +"} +(26,1,1) = {" +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +bk +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +"} +(27,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +ab +ad +aK +ad +ad +ad +aO +ad +ab +aa +aa +aa +aa +aa +aa +aa +aa +"} +(28,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aE +ad +ad +ad +ad +ad +ad +ad +aE +aa +aa +aa +aa +aa +aa +aa +aa +"} +(29,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aE +aJ +ad +ad +aN +ad +ba +aU +aE +aa +aa +aa +aa +aa +aa +aa +aa +"} +(30,1,1) = {" +aa +aa +aa +aa +aa +aH +aa +aa +ab +ad +ad +aM +aM +aM +ad +ad +ab +aa +aa +aa +aa +aa +aa +aa +aa +"} +(31,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +aL +aE +aE +aE +aE +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +"} +(32,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/tether/submaps/space/pois/ship_sup_exploded.dmm b/maps/tether/submaps/space/pois/ship_sup_exploded.dmm new file mode 100644 index 0000000000..12ca6aa2a2 --- /dev/null +++ b/maps/tether/submaps/space/pois/ship_sup_exploded.dmm @@ -0,0 +1,710 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"ab" = ( +/turf/simulated/shuttle/wall, +/area/tether_away/debrisfield/explored) +"ac" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"ad" = ( +/obj/structure/closet/crate/secure/engineering, +/obj/item/weapon/tool/screwdriver/power, +/obj/item/weapon/tool/crowbar/power, +/obj/item/weapon/tool/screwdriver/power, +/obj/item/weapon/tool/crowbar/power, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"ae" = ( +/obj/structure/closet/crate/trashcart, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"af" = ( +/obj/structure/lattice, +/obj/structure/girder/displaced, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"ag" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"ah" = ( +/obj/structure/lattice, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"ai" = ( +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"aj" = ( +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"ak" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"am" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"an" = ( +/obj/structure/girder/displaced, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"ao" = ( +/obj/structure/girder/displaced, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"ap" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/generic, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"aq" = ( +/obj/item/stack/material/steel, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"ar" = ( +/obj/item/inflatable/torn, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"as" = ( +/obj/structure/shuttle/window, +/obj/structure/grille, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"at" = ( +/obj/item/inflatable/door/torn, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"au" = ( +/obj/structure/inflatable, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"av" = ( +/obj/structure/door_assembly/door_assembly_com, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aw" = ( +/obj/structure/lattice, +/obj/item/stack/material/steel, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"ax" = ( +/obj/structure/lattice, +/obj/item/stack/material/steel, +/obj/item/weapon/material/shard/shrapnel, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"ay" = ( +/obj/item/stack/rods, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"az" = ( +/obj/structure/girder, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aA" = ( +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"aB" = ( +/obj/structure/girder, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"aD" = ( +/obj/structure/girder/displaced, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"aE" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/molten_item, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"aF" = ( +/obj/structure/closet/crate/secure/engineering, +/obj/item/weapon/weldingtool/experimental, +/obj/item/weapon/weldingtool/electric, +/obj/item/weapon/weldingtool/electric, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"aG" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"aH" = ( +/obj/structure/lattice, +/obj/structure/closet/crate/secure/engineering, +/obj/fiftyspawner/plasteel, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"aJ" = ( +/obj/structure/grille, +/obj/item/weapon/material/shard, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"aK" = ( +/obj/item/weapon/material/shard, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/plating/airless, +/area/tether_away/debrisfield/explored) +"aL" = ( +/obj/item/inflatable/torn, +/obj/effect/decal/remains, +/obj/item/clothing/under/rank/cargotech, +/obj/item/clothing/head/soft, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aM" = ( +/obj/structure/closet/secure_closet/cargotech{ + name = "cargotech locker"; + req_access = list() + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"aN" = ( +/obj/structure/closet/emcloset, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"aO" = ( +/obj/item/inflatable/door/torn, +/obj/effect/decal/remains, +/obj/item/clothing/under/rank/cargotech, +/obj/item/clothing/head/soft, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aP" = ( +/obj/machinery/computer/shuttle{ + dir = 4 + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"aQ" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aR" = ( +/obj/structure/closet/secure_closet/quartermaster{ + name = "quartermaster locker"; + req_access = list() + }, +/obj/item/clothing/under/mbill, +/obj/item/clothing/head/soft/mbill, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aS" = ( +/obj/structure/closet/crate/secure/bin, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aT" = ( +/obj/structure/closet/emcloset, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aU" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aV" = ( +/obj/machinery/computer/shuttle{ + dir = 8 + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"aW" = ( +/obj/effect/decal/remains, +/obj/item/clothing/under/mbill, +/obj/item/clothing/head/soft/mbill, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aX" = ( +/obj/structure/bed/chair, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"aY" = ( +/obj/structure/bed/chair/comfy/teal, +/turf/simulated/shuttle/floor/white/airless, +/area/tether_away/debrisfield/explored) +"aZ" = ( +/obj/machinery/computer/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor/airless, +/area/tether_away/debrisfield/explored) +"bb" = ( +/obj/structure/lattice, +/obj/item/weapon/material/shard/shrapnel, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"bc" = ( +/obj/structure/lattice, +/obj/effect/decal/cleanable/molten_item, +/obj/item/weapon/material/shard/shrapnel, +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"bd" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/tether_away/debrisfield/explored) + +(1,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +ab +ab +ab +ab +ag +ak +aa +aa +aa +ah +bb +ah +ah +aB +aJ +as +ab +ab +as +as +ab +aa +aa +aa +aa +aa +aa +"} +(3,1,1) = {" +aa +ac +bd +ag +ad +am +bb +aa +aa +ah +ah +ah +ah +ah +ap +aK +aA +aN +ab +aP +aP +ab +ab +aa +aa +aa +aa +aa +"} +(4,1,1) = {" +aa +aa +aB +ag +am +ah +aw +bc +aa +aa +aa +aa +aH +ah +ah +ai +aj +aj +ab +aQ +aQ +aA +ab +ab +aa +aa +aa +aa +"} +(5,1,1) = {" +aa +aa +aa +af +aa +aa +aa +aa +aa +aa +aG +aa +ay +ah +ag +aB +ab +ab +ab +aj +aj +aj +aA +ab +as +ab +aa +aa +"} +(6,1,1) = {" +aa +aa +ac +bd +am +ah +aa +aw +aa +aa +aa +aa +bb +ah +ag +ag +ar +au +ab +aR +aj +aj +aj +aX +aZ +as +aa +aa +"} +(7,1,1) = {" +aa +aa +ae +ab +am +ax +ah +ah +aa +aa +an +ah +ah +am +ag +ar +aL +au +ab +aj +aj +aj +aj +aj +aZ +as +aa +aa +"} +(8,1,1) = {" +aa +aa +aa +aD +ah +aa +aa +aa +aa +aa +aa +ah +ah +ag +ap +aj +at +aO +av +aj +aj +aj +aW +aY +aZ +as +aa +aa +"} +(9,1,1) = {" +aa +aa +aa +ab +ah +ah +aa +aa +aa +aa +aa +ah +ag +ag +aj +ar +au +au +ab +aS +aj +aj +aj +aj +aZ +as +aa +aa +"} +(10,1,1) = {" +aa +aa +ac +ab +ap +ah +aG +aF +aa +aa +aG +aE +ap +ag +ao +aj +ar +au +ab +aT +aj +aj +aj +aX +aZ +as +aa +aa +"} +(11,1,1) = {" +aa +aa +ac +ab +aq +ag +bb +aa +aa +aa +aG +ag +aq +ag +ao +aj +az +ab +ab +aj +aj +aj +aA +ab +as +ab +aa +aa +"} +(12,1,1) = {" +aa +aa +ac +ab +aA +aD +ah +aa +ay +aa +ag +ag +ag +ab +aj +aj +aj +aj +ab +aU +aU +aA +ab +ab +aa +aa +aa +aa +"} +(13,1,1) = {" +aa +aa +ac +ab +aA +aA +ag +ag +ah +ah +ag +ag +am +ab +aA +aA +aM +aM +ab +aV +aV +ab +ab +aa +aa +aa +aa +aa +"} +(14,1,1) = {" +aa +aa +ab +bd +aB +aB +aD +ag +ag +aB +aB +aB +ab +ab +ab +as +as +ab +ab +as +as +ab +aa +aa +aa +aa +aa +aa +"} +(15,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/tether/submaps/underdark_pois/mechbay.dmm b/maps/tether/submaps/underdark_pois/mechbay.dmm index a1bccc8a69..5e89cbef2d 100644 --- a/maps/tether/submaps/underdark_pois/mechbay.dmm +++ b/maps/tether/submaps/underdark_pois/mechbay.dmm @@ -37,7 +37,7 @@ /turf/simulated/floor/virgo3b, /area/mine/explored/underdark) "k" = ( -/obj/mecha/working/ripley, +/obj/mecha/working/ripley/abandoned, /turf/simulated/mineral/floor/ignore_cavegen/virgo3b, /area/mine/explored/underdark) "l" = ( diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index c059504f7c..3e5b682b20 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -248,4 +248,8 @@ VIRGO3B_TURF_CREATE(/turf/simulated/shuttle/floor/voidcraft) //Goldhall VIRGO3B_TURF_CREATE(/turf/simulated/floor/tiled/kafel_full/yellow) -// \ No newline at end of file +//Mechbay +/obj/mecha/working/ripley/abandoned/Initialize() + ..() + for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents) //Deletes the beacon so it can't be found easily + qdel(B) \ No newline at end of file diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index ae7e40c90f..7b949157a4 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -6363,9 +6363,17 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"akU" = ( +/turf/simulated/wall/r_wall, +/area/engineering/atmos/gas_storage) "akV" = ( /turf/simulated/mineral, /area/vacant/vacant_site) +"akW" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "akX" = ( /turf/simulated/floor/plating, /area/vacant/vacant_site) @@ -6375,6 +6383,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/vacant/vacant_site) +"akZ" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "ala" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -6396,6 +6412,11 @@ "ald" = ( /turf/simulated/floor/tiled, /area/storage/art) +"ale" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "alf" = ( /obj/structure/table/standard, /obj/item/stack/cable_coil/random, @@ -6478,9 +6499,49 @@ }, /turf/simulated/floor/water/pool, /area/tether/surfacebase/atrium_one) +"alq" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "alr" = ( /turf/simulated/wall, /area/maintenance/lower/vacant_site) +"als" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/structure/cable/cyan{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) +"alt" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) +"alu" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/cyan{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "alv" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -6563,6 +6624,14 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/substation/mining) +"alB" = ( +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "alC" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -6642,6 +6711,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/vacant/vacant_site) +"alL" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "alM" = ( /obj/structure/railing{ dir = 8 @@ -6675,6 +6750,17 @@ /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) +"alP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "alQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6807,6 +6893,49 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/lobby) +"ame" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_atmos{ + name = "Canister Storage"; + req_access = list(24) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) +"amf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"amg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "amh" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/table/rack{ @@ -6822,6 +6951,13 @@ /obj/item/weapon/tank/emergency/oxygen/engi, /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) +"ami" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "amj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6845,6 +6981,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) +"amk" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "aml" = ( /obj/random/junk, /turf/simulated/floor/plating, @@ -6859,6 +7001,12 @@ /obj/structure/cable/green, /turf/simulated/floor/plating, /area/vacant/vacant_site) +"amo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "amp" = ( /obj/structure/table/standard, /obj/random/tech_supply, @@ -6881,6 +7029,17 @@ }, /turf/simulated/floor/tiled, /area/storage/primary) +"amr" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_atmos{ + name = "Canister Storage"; + req_access = list(24) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "ams" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -6936,6 +7095,28 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) +"amz" = ( +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/camera/network/engineering{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) +"amA" = ( +/obj/machinery/portable_atmospherics/canister/sleeping_agent, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) +"amB" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 28 + }, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "amC" = ( /obj/structure/ladder/up, /obj/structure/catwalk, @@ -6990,6 +7171,11 @@ }, /turf/simulated/floor, /area/maintenance/substation/mining) +"amJ" = ( +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "amK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -7019,6 +7205,11 @@ }, /turf/simulated/floor/tiled, /area/storage/art) +"amN" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) "amO" = ( /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, @@ -7065,6 +7256,18 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) +"amU" = ( +/obj/machinery/portable_atmospherics/canister/sleeping_agent, +/obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/atmos/gas_storage) +"amV" = ( +/obj/machinery/camera/network/engineering{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/engineering/atmos/intake) "anb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -14486,14 +14689,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/xenobiology/xenoflora_storage) -"aGY" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "aGZ" = ( /obj/structure/table/standard, /obj/machinery/requests_console{ @@ -14565,12 +14760,6 @@ /obj/machinery/portable_atmospherics/canister/sleeping_agent, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/xenobiology/xenoflora_storage) -"aHo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "aHv" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor{ @@ -14766,17 +14955,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"aHZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos) "aId" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -24854,11 +25032,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) -"chB" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "chC" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -25749,12 +25922,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"csS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "cws" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -25813,11 +25980,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) -"cKH" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "cLz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ icon_state = "map"; @@ -25950,17 +26112,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence) -"dby" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_atmos{ - name = "Canister Storage"; - req_access = list(24) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "deS" = ( /obj/structure/railing{ dir = 4 @@ -26061,12 +26212,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/research) -"dCw" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "dCM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26328,12 +26473,6 @@ "epw" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/Dorm_3) -"erR" = ( -/obj/machinery/camera/network/outside{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/engineering/atmos/intake) "euU" = ( /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/apc; @@ -26998,12 +27137,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/public_garden) -"gFH" = ( -/obj/machinery/portable_atmospherics/canister/sleeping_agent, -/obj/machinery/light/small, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "gHF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -27203,11 +27336,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_bar) -"hLA" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "hNn" = ( /obj/structure/table/rack, /obj/random/maintenance/engineering, @@ -27283,11 +27411,6 @@ /obj/machinery/pipedispenser, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) -"ifc" = ( -/obj/machinery/portable_atmospherics/canister/sleeping_agent, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "igB" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -27691,17 +27814,6 @@ /obj/item/weapon/bedsheet/mimedouble, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) -"jcl" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_atmos{ - name = "Canister Storage"; - req_access = list(24) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "jec" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloor/corner{ @@ -28234,12 +28346,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site/east) -"kXi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "kYa" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28553,11 +28659,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"lUB" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "lVl" = ( /obj/structure/railing{ icon_state = "railing0"; @@ -29017,13 +29118,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/showers) -"nod" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "npt" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -29773,14 +29867,6 @@ "pTB" = ( /turf/simulated/wall, /area/crew_quarters/sleep/maintDorm4) -"pTP" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "pUD" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide{ dir = 8; @@ -30093,14 +30179,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) -"rbh" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/camera/network/engineering{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "rbv" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 10 @@ -31632,11 +31710,6 @@ /obj/structure/table/rack, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) -"wDZ" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "wEU" = ( /obj/structure/closet, /obj/random/maintenance/clean, @@ -40869,15 +40942,15 @@ aah aEU aFX rcO -giF -bEX -bEX -bEX -bEX -bEX -bEX -bEX -bEX +akU +akU +akU +akU +akU +akU +akU +akU +akU bEX iVW aJs @@ -40895,7 +40968,7 @@ ajg ajh rab rab -erR +amV aJt aJt aah @@ -41011,15 +41084,15 @@ aah aEU oUO fEe -giF -hLA -hLA -hLA -pTP -nod -rbh -lUB -lUB +akU +akW +akW +als +alB +ami +amz +amJ +amJ bEX tIj fRH @@ -41153,15 +41226,15 @@ aah aEU aFX rcO -giF -aGY -chB -chB -dCw -csS -ifc -ifc -gFH +akU +akZ +alq +alt +alL +amk +amA +amA +amU bEX sVp dAD @@ -41295,15 +41368,15 @@ aah aEU aFX gTS -giF -cKH -cKH -cKH -aHo -kXi -wDZ -wDZ -wDZ +akU +ale +ale +alu +alP +amo +amB +amN +amN bEX soV phh @@ -41437,15 +41510,15 @@ aah aEU roN npw -bEX -bEX -bEX -bEX -jcl -dby -bEX -bEX -bEX +akU +akU +akU +akU +ame +amr +akU +akU +akU bEX tIj bXm @@ -41583,7 +41656,7 @@ bEX aGZ akp aHM -mwy +amf aIk cVX vgd @@ -41725,7 +41798,7 @@ bEX gjQ kwi aHN -aHZ +amg aIl uPe lda diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 87439aa3db..18cfce8ec2 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -11573,6 +11573,24 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) +"wK" = ( +/obj/structure/table/rack, +/obj/item/weapon/circuitboard/telecomms/processor, +/obj/item/weapon/circuitboard/telecomms/processor, +/obj/item/weapon/circuitboard/telecomms/receiver, +/obj/item/weapon/circuitboard/telecomms/server, +/obj/item/weapon/circuitboard/telecomms/server, +/obj/item/weapon/circuitboard/telecomms/bus, +/obj/item/weapon/circuitboard/telecomms/bus, +/obj/item/weapon/circuitboard/telecomms/broadcaster, +/obj/item/weapon/circuitboard/telecomms/exonet_node, +/obj/machinery/light/small, +/obj/item/weapon/circuitboard/ntnet_relay, +/obj/item/weapon/circuitboard/telecomms/relay, +/turf/simulated/floor/tiled/techmaint, +/area/tcomfoyer{ + name = "\improper Telecomms Storage" + }) "wL" = ( /obj/structure/cable/cyan{ d1 = 2; @@ -14541,7 +14559,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass{ - req_access = list(61) + req_access = list(61); + req_one_access = list(12) }, /obj/structure/cable/green{ d1 = 1; @@ -14612,7 +14631,8 @@ "FL" = ( /obj/machinery/door/airlock/hatch{ name = "Telecoms Control Room"; - req_access = list(61) + req_access = list(61); + req_one_access = list(12) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15006,7 +15026,8 @@ id_tag = "server_access_inner"; locked = 1; name = "Telecoms Server Access"; - req_access = list(61) + req_access = list(61); + req_one_access = list(12) }, /turf/simulated/floor/tiled/dark{ nitrogen = 100; @@ -15031,7 +15052,7 @@ /obj/machinery/door/airlock/glass{ name = "Telecomms Storage"; req_access = list(61); - req_one_access = newlist() + req_one_access = list(12) }, /obj/structure/cable/green{ d1 = 1; @@ -15358,22 +15379,6 @@ }) "Ha" = ( /turf/simulated/floor/tiled/techmaint, -/area/tcomfoyer{ - name = "\improper Telecomms Storage" - }) -"Hb" = ( -/obj/structure/table/rack, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/processor, -/obj/item/weapon/circuitboard/telecomms/receiver, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/server, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/bus, -/obj/item/weapon/circuitboard/telecomms/broadcaster, -/obj/item/weapon/circuitboard/telecomms/exonet_node, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" }) @@ -15774,7 +15779,8 @@ "HO" = ( /obj/machinery/door/airlock/highsecurity{ name = "Telecomms Access"; - req_one_access = list(61) + req_access = list(61); + req_one_access = list(12) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15816,7 +15822,8 @@ id_tag = "server_access_outer"; locked = 1; name = "Telecoms Server Access"; - req_access = list(61) + req_access = list(61); + req_one_access = list(12) }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -32752,7 +32759,7 @@ Gl Gx GN GT -Hb +wK Gw Gw ac diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index c70409ea00..bc103c51e8 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -6446,6 +6446,7 @@ /area/tether/surfacebase/north_stairs_three) "ld" = ( /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "le" = ( diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index f5ee5e06f8..7695d483e6 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -19808,9 +19808,6 @@ /turf/simulated/floor, /area/maintenance/station/sec_lower) "EE" = ( -/turf/simulated/floor/tiled, -/area/tether/elevator) -"EF" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, @@ -19819,7 +19816,7 @@ /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) -"EG" = ( +"EF" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_r" @@ -31719,7 +31716,7 @@ fu fu fu fu -EE +fq oS kj eN @@ -32600,10 +32597,10 @@ Ci Bw yY AO +EE +EE +EE EF -EF -EF -EG yY ac ac diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 8797fb9933..5e59588dd7 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -5389,6 +5389,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/item/weapon/storage/box/trackimp, +/obj/item/weapon/storage/box/trackimp, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) "iM" = ( diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index ee464e4ee6..fceb678cb6 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -201,6 +201,10 @@ icon_state = "atmos" sound_env = LARGE_ENCLOSED +/area/engineering/atmos/gas_storage + name = "Atmospherics Gas Storage" + icon_state = "atmos" + /area/engineering/atmos/intake name = "\improper Atmospherics Intake" icon_state = "atmos" diff --git a/vorestation.dme b/vorestation.dme index 595101721d..c15c5326fb 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2070,6 +2070,7 @@ #include "code\modules\mining\money_bag.dm" #include "code\modules\mining\ore.dm" #include "code\modules\mining\ore_datum.dm" +#include "code\modules\mining\ore_datum_vr.dm" #include "code\modules\mining\resonator_vr.dm" #include "code\modules\mining\satchel_ore_boxdm.dm" #include "code\modules\mining\shelter_atoms.dm" @@ -2509,6 +2510,7 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\~defines.dm" #include "code\modules\mob\living\voice\voice.dm" #include "code\modules\mob\new_player\login.dm" +#include "code\modules\mob\new_player\login_vr.dm" #include "code\modules\mob\new_player\logout.dm" #include "code\modules\mob\new_player\new_player.dm" #include "code\modules\mob\new_player\new_player_vr.dm"