diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 32e7668f33..df74398ae0 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -534,7 +534,6 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, "Research Intern", "Security Cadet", "Jr. Cargo Tech", - "Jr. Explorer", "Server", "Electrician", "Barista") diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index acfa32d52f..bbdccb8fc0 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -141,7 +141,7 @@ var/list/radiochannels = list( "Raider" = RAID_FREQ, "Supply" = SUP_FREQ, "Service" = SRV_FREQ, - "Explorer" = EXP_FREQ, + "Away Team" = EXP_FREQ, "AI Private" = AI_FREQ, "Entertainment" = ENT_FREQ, "Medical(I)" = MED_I_FREQ, diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index 8118ff0ab1..c3db6833d7 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -26,7 +26,6 @@ containername = "eva hardsuit crate" access = list(access_mining, access_eva, - access_explorer, access_pilot) one_access = TRUE @@ -125,12 +124,11 @@ access = list(access_mining, access_xenoarch, access_eva, - access_explorer, access_pilot) one_access = TRUE /datum/supply_pack/randomised/misc/explorer_shield - name = "Explorer shield" + name = "Away Team shield" num_contained = 2 contains = list( /obj/item/weapon/shield/riot/explorer, @@ -139,8 +137,7 @@ cost = 75 containertype = /obj/structure/closet/crate/secure/gear containername = "exploration shield crate" - access = list(access_explorer, - access_eva, + access = list(access_eva, access_pilot) one_access = TRUE @@ -171,7 +168,7 @@ containertype = /obj/structure/closet/crate/secure/gear containername = "exploration radio headsets crate" access = list( - access_explorer, + access_awayteam, access_eva, access_pilot ) diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index d53a496928..45a3eaacf5 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -7,7 +7,7 @@ cost = 35 containertype = /obj/structure/closet/crate/secure containername = "frontier phaser crate" - access = access_explorer + access = access_security /datum/supply_pack/munitions/expeditionbows name = "Frontier bows (station-locked) crate" @@ -17,7 +17,7 @@ cost = 20 containertype = /obj/structure/closet/crate/secure containername = "phaser handbow crate" - access = access_explorer + access = access_security /datum/supply_pack/munitions/ofd_charge_emp name = "OFD Charge - EMP" diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 70f8386a91..16ff0355dd 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -157,7 +157,7 @@ containername = "Cargo Train Trolley Crate" /datum/supply_pack/explorergear - name="Explorer gear" + name="Away Team gear" contains = list ( /obj/item/device/cataloguer, /obj/item/device/geiger, @@ -178,8 +178,8 @@ ) cost=25 containertype = /obj/structure/closet/crate/secure/xion - containername = "Explorer equipment" - access = access_explorer + containername = "Away Team equipment" + access = list(access_eva, access_awayteam) /datum/supply_pack/pilotgear name= "Pilot gear" @@ -192,16 +192,15 @@ /obj/item/stack/marker_beacon/thirty, /obj/item/device/gps/explorer, /obj/item/clothing/gloves/fingerless, - /obj/item/device/cataloguer/compact, /obj/item/clothing/suit/storage/toggle/bomber/pilot, /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/device/flashlight, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/clothing/head/pilot_vr, /obj/item/clothing/under/rank/pilot1, + /obj/item/clothing/suit/storage/toggle/bomber/pilot ) cost=20 containertype = /obj/structure/closet/crate/secure/xion containername = "Pilot equipment" access = access_pilot - diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index a769cc805d..2ac1059161 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -1,5 +1,5 @@ /datum/supply_pack/voidsuits/explorer - name = "Exploration voidsuits" + name = "Away Team voidsuits" contains = list( /obj/item/clothing/suit/space/void/exploration = 2, /obj/item/clothing/head/helmet/space/void/exploration = 2, @@ -9,11 +9,11 @@ ) cost = 45 containertype = /obj/structure/closet/crate/secure - containername = "Exploration voidsuit crate" - access = access_explorer + containername = "Away Team voidsuit crate" + access = list(access_eva, access_awayteam) /datum/supply_pack/voidsuits/explorer_medic - name = "Expedition Medic voidsuits" + name = "Away Team Medic voidsuits" contains = list( /obj/item/clothing/suit/space/void/exploration = 2, /obj/item/clothing/head/helmet/space/void/exploration = 2, @@ -23,8 +23,8 @@ ) cost = 45 containertype = /obj/structure/closet/crate/secure - containername = "Expedition Medic voidsuit crate" - access = access_explorer + containername = "Away Team Medic voidsuit crate" + access = access_medical /datum/supply_pack/voidsuits/pilot name = "Pilot voidsuits" @@ -53,9 +53,15 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov mining voidsuit crate" access = access_mining +<<<<<<< HEAD /datum/supply_pack/voidsuits/solgov_anomaly name = "Solgov anomaly suit" +======= + +/datum/supply_pack/voidsuits/com_anomaly + name = "Commonwealth anomaly suit" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo contains = list( /obj/item/clothing/suit/space/anomaly/alt, /obj/item/clothing/head/helmet/space/anomaly/alt @@ -64,9 +70,15 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov anomaly suit crate" access = access_xenoarch +<<<<<<< HEAD /datum/supply_pack/voidsuits/solgov_riot name = "Solgov riot voidsuit" +======= + +/datum/supply_pack/voidsuits/com_riot + name = "Commonwealth riot voidsuit" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo contains = list( /obj/item/clothing/suit/space/void/security/riot/alt, /obj/item/clothing/head/helmet/space/void/security/riot/alt @@ -75,9 +87,15 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov riot voidsuit crate" access = access_brig +<<<<<<< HEAD /datum/supply_pack/voidsuits/solgov_pilot name = "Solgov pilot voidsuit" +======= + +/datum/supply_pack/voidsuits/com_pilot + name = "Commonwealth pilot voidsuit" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo contains = list( /obj/item/clothing/suit/space/void/pilot/alt2, /obj/item/clothing/head/helmet/space/void/pilot/alt2 @@ -86,9 +104,15 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov pilot voidsuit crate" access = access_pilot +<<<<<<< HEAD /datum/supply_pack/voidsuits/solgov_medical name = "Solgov medical voidsuit" +======= + +/datum/supply_pack/voidsuits/com_medical + name = "Commonwealth medical voidsuit" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo contains = list( /obj/item/clothing/suit/space/void/medical/alt2, /obj/item/clothing/head/helmet/space/void/medical/alt2 @@ -105,11 +129,19 @@ ) cost = 150 containertype = /obj/structure/closet/crate/secure +<<<<<<< HEAD name = "Solgov exploration voidsuit crate" access = access_explorer /datum/supply_pack/voidsuits/solgov_engineer name = "Solgov engineering voidsuit" +======= + name = "Commonwealth exploration voidsuit crate" + access = list(access_eva, access_awayteam) + +/datum/supply_pack/voidsuits/com_engineer + name = "Commonwealth engineering voidsuit" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo contains = list( /obj/item/clothing/suit/space/void/engineering/alt2, /obj/item/clothing/head/helmet/space/void/engineering/alt2 @@ -118,9 +150,15 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov engineering voidsuit crate" access = access_engine +<<<<<<< HEAD /datum/supply_pack/voidsuits/solgov_atmos name = "Solgov atmos voidsuit" +======= + +/datum/supply_pack/voidsuits/com_atmos + name = "Commonwealth atmos voidsuit" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo contains = list( /obj/item/clothing/suit/space/void/atmos/alt2, /obj/item/clothing/head/helmet/space/void/atmos/alt2 @@ -129,9 +167,15 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov atmos voidsuit crate" access = access_atmospherics +<<<<<<< HEAD /datum/supply_pack/voidsuits/solgov_captain name = "Solgov captain voidsuit" +======= + +/datum/supply_pack/voidsuits/com_captain + name = "Commonwealth captain voidsuit" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo contains = list( /obj/item/clothing/suit/space/void/captain/alt, /obj/item/clothing/head/helmet/space/void/captain/alt @@ -140,5 +184,8 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov captain voidsuit crate" access = access_captain +<<<<<<< HEAD -// CHOMPStation EDIT End \ No newline at end of file +// CHOMPStation EDIT End +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo diff --git a/code/game/jobs/access_datum_vr.dm b/code/game/jobs/access_datum_vr.dm index 4500e061a5..2aa71208b2 100644 --- a/code/game/jobs/access_datum_vr.dm +++ b/code/game/jobs/access_datum_vr.dm @@ -1,16 +1,16 @@ //Moved from southern_cross_jobs.vr to fix a runtime -var/const/access_explorer = 43 -/datum/access/explorer - id = access_explorer - desc = "Explorer" +var/const/access_awayteam = 43 +/datum/access/awayteam + id = access_awayteam + desc = "Away Team" region = ACCESS_REGION_GENERAL - +/* /var/const/access_pathfinder = 44 /datum/access/pathfinder id = access_pathfinder desc = "Pathfinder" region = ACCESS_REGION_GENERAL - +*/ var/const/access_pilot = 67 /datum/access/pilot id = access_pilot diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index 1aa1f7cb55..883bdae440 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -21,7 +21,6 @@ "Lab Assistant" = /datum/alt_title/intern_sci, //CHOMPEdit "Security Cadet" = /datum/alt_title/intern_sec, "Jr. Cargo Tech" = /datum/alt_title/intern_crg, - "Jr. Explorer" = /datum/alt_title/intern_exp, "Server" = /datum/alt_title/server, "Assistant" = /datum/alt_title/assistant) job_description = "An Intern does whatever is requested of them, often doing so in process of learning \ @@ -58,13 +57,13 @@ title_blurb = "A Jr. Cargo Tech attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \ often in training to become a Cargo Technician. A Jr. Cargo Tech has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/cargo - +/* /datum/alt_title/intern_exp title = "Jr. Explorer" title_blurb = "A Jr. Explorer attempts to provide whatever the Exploration department needs. They are not proper Explorers, and are \ often in training to become an Explorer. A Jr. Explorer has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/explorer - +*/ /datum/alt_title/server title = "Server" title_blurb = "A Server helps out kitchen and diner staff with various tasks, primarily food delivery. A Server has no real authority." diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 9c5de6d54b..69fcb66bcd 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -214,8 +214,8 @@ departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN faction = "Station" - total_positions = 5 - spawn_positions = 5 + total_positions = 2 + spawn_positions = 2 supervisors = "the Head of Personnel" selection_color = "#515151" economic_modifier = 5 diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 8c2140c5a0..f9f7d4bd4e 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -80,7 +80,13 @@ /datum/job/paramedic pto_type = PTO_MEDICAL +<<<<<<< HEAD alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder) //CHOMPedit: Removed SAR because that's an actual job here +======= + alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder, "Search and Rescue" = /datum/alt_title/sar) + total_positions = 3 + spawn_positions = 3 +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /datum/alt_title/medical_responder title = "Medical Responder" diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index 11a1b3d526..e9ba0bb99d 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -80,7 +80,7 @@ outfit_type = /decl/hierarchy/outfit/job/assistant/scientist job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_SCIENCE - economic_modifier = 5 + economic_modifier = 5 /datum/job/offduty_security title = "Off-duty Officer" diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 9ee8ad6f6e..c8a980c2ce 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -663,14 +663,12 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /datum/suit_cycler_choice/department/emag ) can_repair = 1 - /obj/machinery/suit_cycler/exploration name = "Explorer suit cycler" model_text = "Exploration" limit_departments = list( /datum/suit_cycler_choice/department/exp ) - /obj/machinery/suit_cycler/pilot name = "Pilot suit cycler" model_text = "Pilot" diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 8eab955554..5704a0906d 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,7 +1,8 @@ // Old Exploration is too WIP to use right now + /obj/machinery/suit_cycler/exploration req_access = null - req_one_access = list(access_explorer,access_medical_equip) + req_one_access = list(access_awayteam,access_medical_equip) /obj/machinery/suit_cycler/pilot req_access = list(access_pilot) diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 974b34a93f..73d0bd39d8 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -44,12 +44,14 @@ name = "Cargo Technician" /obj/effect/landmark/start/miner name = "Shaft Miner" +/* //VOREStation Removal /obj/effect/landmark/start/pf name = "Pathfinder" /obj/effect/landmark/start/explorer name = "Explorer" /obj/effect/landmark/start/fieldmedic name = "Field Medic" +*/ /obj/effect/landmark/start/bartender name = "Bartender" /obj/effect/landmark/start/botanist diff --git a/code/game/objects/effects/semirandom_mobs_vr.dm b/code/game/objects/effects/semirandom_mobs_vr.dm index e6b26da087..63be43d6af 100644 --- a/code/game/objects/effects/semirandom_mobs_vr.dm +++ b/code/game/objects/effects/semirandom_mobs_vr.dm @@ -534,7 +534,6 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/vore/oregrub = 5, /mob/living/simple_mob/vore/oregrub/lava = 1 ) = 15, - list(/mob/living/simple_mob/vore/alienanimals/teppi) = 15, list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish) = 5, list(/mob/living/simple_mob/vore/alienanimals/space_ghost) = 5, list( diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index a944d8c172..d8be1b8c2c 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -12,7 +12,7 @@ var/global/list/radio_channels_by_freq = list( num2text(SCI_FREQ) = "Science", num2text(SUP_FREQ) = "Supply", num2text(SRV_FREQ) = "Service", - num2text(EXP_FREQ) = "Explorer" + num2text(EXP_FREQ) = "Away Team" ) GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) diff --git a/code/game/objects/items/devices/radio/encryptionkey_vr.dm b/code/game/objects/items/devices/radio/encryptionkey_vr.dm index 92a5ed142b..8a638208c0 100644 --- a/code/game/objects/items/devices/radio/encryptionkey_vr.dm +++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm @@ -1,18 +1,22 @@ /obj/item/device/encryptionkey/heads/hop //YW Edit: removes Explorer channel access, not in line with our chain of command. name = "head of personnel's encryption key" icon_state = "hop_cypherkey" +<<<<<<< HEAD channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1) +======= + channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Away Team" = 1) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /obj/item/device/encryptionkey/heads/ai_integrated name = "ai integrated encryption key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1) + channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Away Team" = 1) /obj/item/device/encryptionkey/heads/captain name = "site manager's encryption key" icon_state = "cap_cypherkey" - channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) + channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1) /obj/item/device/encryptionkey/heads/rd //YW Edit: adds Explorer channel access, to come in line with our chain of command. name = "research director's encryption key" @@ -20,15 +24,19 @@ channels = list("Command" = 1, "Science" = 1, "Explorer" = 1) /obj/item/device/encryptionkey/ert - channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) + channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1) /obj/item/device/encryptionkey/omni //Literally only for the admin intercoms - channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) + channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1) /obj/item/device/encryptionkey/pathfinder //YW Edit: removes command channel access, not in line with our chain of command. name = "pathfinder's encryption key" icon_state = "com_cypherkey" +<<<<<<< HEAD channels = list("Explorer" = 1) +======= + channels = list("Command" = 1, "Away Team" = 1) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /obj/item/device/encryptionkey/qm //YW Edit: removes command channel access, not in line with our chain of command. name = "quartermaster's encryption key" @@ -38,17 +46,17 @@ /obj/item/device/encryptionkey/pilot name = "pilot's encryption key" icon_state = "cypherkey" - channels = list("Explorer" = 1) + channels = list("Away Team" = 1) /obj/item/device/encryptionkey/explorer - name = "explorer's encryption key" + name = "away team's encryption key" icon_state = "rob_cypherkey" - channels = list("Explorer" = 1) + channels = list("Away Team" = 1) /obj/item/device/encryptionkey/sar name = "fm's encryption key" icon_state = "med_cypherkey" - channels = list("Medical" = 1, "Explorer" = 1) + channels = list("Medical" = 1, "Away Team" = 1) /obj/item/device/encryptionkey/talon channels = list("Talon" = 1) diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index 59259dc7d4..ea952cc515 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -91,15 +91,15 @@ icon_state = "pilot_headset_alt" /obj/item/device/radio/headset/explorer - name = "explorer's headset" - desc = "Headset used by explorers for exploring. Access to the explorer channel." + name = "away team member's headset" + desc = "Headset used by the away team for exploring. Access to the away team channel." icon_state = "exp_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/explorer /obj/item/device/radio/headset/explorer/alt - name = "explorer's bowman headset" - desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." + name = "away team's bowman headset" + desc = "Bowman headset used by the away team for exploring. Access to the away team channel." icon_state = "exp_headset_alt" /obj/item/device/radio/headset/sar @@ -114,12 +114,14 @@ desc = "A bowman headset for field medics." icon_state = "sar_headset_alt" +/* //They're all volunteers now. /obj/item/device/radio/headset/volunteer name = "volunteer's headset" - desc = "A headset used by volunteers to expedition teams, has access to the exploration channel." + desc = "A headset used by volunteers to expedition teams, has access to the Away Team channel." icon_state = "pilot_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/explorer +*/ /obj/item/device/radio/headset/talon name = "talon headset" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 147b7327e8..2ed503a59c 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -14,7 +14,7 @@ var/global/list/default_internal_channels = list( num2text(SCI_FREQ) = list(access_tox, access_robotics, access_xenobiology), num2text(SUP_FREQ) = list(access_cargo, access_mining_station), num2text(SRV_FREQ) = list(access_janitor, access_library, access_hydroponics, access_bar, access_kitchen), - num2text(EXP_FREQ) = list(access_explorer, access_pilot) + num2text(EXP_FREQ) = list(access_awayteam) //VOREStation Edit ) var/global/list/default_medbay_channels = list( diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index a311a74089..baa4f94afa 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -22,7 +22,7 @@ /obj/item/weapon/shield/riot/explorer - name = "green explorer shield" + name = "green away team shield" desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention." icon = 'icons/obj/weapons_vr.dmi' icon_state = "explorer_shield" @@ -74,7 +74,7 @@ icon_state = "explorer_shield" /obj/item/weapon/shield/riot/explorer/purple - name = "purple explorer shield" + name = "purple away team shield" desc = "A shield issued to exploration teams to help protect them when advancing into the unknown. It is lighter and cheaper but less protective than some of its counterparts. It has a flashlight straight in the middle to help draw attention. This one is POURPEL" icon_state = "explorer_shield_P" diff --git a/code/game/objects/items/weapons/storage/boxes_vr.dm b/code/game/objects/items/weapons/storage/boxes_vr.dm index 5b93d14456..dd5ff003f4 100644 --- a/code/game/objects/items/weapons/storage/boxes_vr.dm +++ b/code/game/objects/items/weapons/storage/boxes_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/storage/box/explorerkeys name = "box of volunteer headsets" desc = "A box full of volunteer headsets, for issuing out to exploration volunteers." - starts_with = list(/obj/item/device/radio/headset/volunteer = 7) + starts_with = list(/obj/item/device/radio/headset/explorer = 7) /obj/item/weapon/storage/box/commandkeys name = "box of command keys" diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 73becfc093..cca49ff7a1 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -24,7 +24,7 @@ /obj/structure/closet/secure_closet/guncabinet/rifle name = "rifle cabinet" - req_one_access = list(access_explorer,access_brig) + req_one_access = list(access_brig) starts_with = list( /obj/item/ammo_magazine/clip/c762/hunter = 9, @@ -38,8 +38,8 @@ return ..() /obj/structure/closet/secure_closet/guncabinet/phase - name = "explorer weapon cabinet" - req_one_access = list(access_explorer,access_brig) + name = "away team weapon cabinet" + req_one_access = list(access_brig) starts_with = list( /obj/item/weapon/gun/energy/locked/phasegun = 2, @@ -51,8 +51,8 @@ * Explorer */ /obj/structure/closet/secure_closet/explorer - name = "explorer locker" - req_access = list(access_explorer) + name = "away team locker" + req_access = list(access_awayteam) closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer starts_with = list( @@ -93,7 +93,7 @@ */ /obj/structure/closet/secure_closet/pathfinder name = "pathfinder locker" - req_access = list(access_pathfinder) + req_access = list(access_heads) closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder starts_with = list( @@ -197,7 +197,6 @@ starts_with = list( /obj/item/weapon/storage/backpack/parachute, /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/gun/energy/locked/frontier/holdout, /obj/item/clothing/head/pilot_vr, /obj/item/clothing/under/rank/pilot1, /obj/item/clothing/suit/storage/toggle/bomber/pilot, @@ -215,7 +214,7 @@ /obj/item/weapon/cell/device, /obj/item/device/radio, /obj/item/device/gps/explorer, - /obj/item/device/cataloguer/compact) + /obj/item/weapon/gun/energy/taser) /obj/structure/closet/secure_closet/pilot/Initialize() if(prob(50)) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm index b5e3e39150..e1b39c5b99 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm @@ -52,7 +52,7 @@ //VOREStation Add Start /obj/structure/closet/secure_closet/guncabinet/excursion name = "expedition weaponry cabinet" - req_one_access = list(access_explorer,access_armory) + req_one_access = list(access_armory) /obj/structure/closet/secure_closet/guncabinet/excursion/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 652544d7e0..631bde5d47 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -57,10 +57,11 @@ path = /obj/item/clothing/accessory/collar/holo/indigestible /datum/gear/accessory/holster - display_name = "holster selection (Security, SM, HoP, Exploration)" - allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Field Medic","Explorer","Pathfinder","Talon Captain","Talon Guard") + display_name = "holster selection (Security, SM, HoP)" + allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Talon Captain","Talon Guard") /datum/gear/accessory/brown_vest +<<<<<<< HEAD display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS @@ -83,18 +84,46 @@ /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white (Medical)" allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") +======= + display_name = "webbing, brown (Eng, Sec, Med, Miner)" + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + +/datum/gear/accessory/black_vest + display_name = "webbing, black (Eng, Sec, Med, Miner)" + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + +/datum/gear/accessory/white_vest + display_name = "webbing, white (Medical)" + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Talon Doctor") + +/datum/gear/accessory/brown_drop_pouches + display_name = "drop pouches, brown (Eng, Sec, Med, Miner)" + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + +/datum/gear/accessory/black_drop_pouches + display_name = "drop pouches, black (Eng, Sec, Med, Miner)" + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + +/datum/gear/accessory/white_drop_pouches + display_name = "drop pouches, white (Medical)" + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Talon Doctor") +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /datum/gear/accessory/bluespace - display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner, Pilot)" + display_name = "bluespace badge (Eng, Sec, Med, Miner, Pilot)" path = /obj/item/clothing/accessory/storage/bluespace - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard","Talon Miner","Pilot") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard","Talon Miner","Pilot") cost = 2 /datum/gear/accessory/webbing cost = 1 /datum/gear/accessory/stethoscope +<<<<<<< HEAD allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") +======= + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor") +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /datum/gear/accessory/khcrystal display_name = "Life Crystal" @@ -110,7 +139,7 @@ display_name = "pilot qualification pin" description = "An iron pin denoting the qualification to fly USG spacecraft." path = /obj/item/clothing/accessory/solgov/specialty/pilot - allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot") + allowed_roles = list("Pilot","Talon Pilot") /datum/gear/accessory/flops display_name = "drop straps" @@ -138,4 +167,4 @@ Talon pin /datum/gear/accessory/altevian_badge display_name = "altevian badge" - path = /obj/item/clothing/accessory/altevian_badge \ No newline at end of file + path = /obj/item/clothing/accessory/altevian_badge diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index e444dcaa85..bc545291de 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -1,9 +1,9 @@ /datum/gear/eyes/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/eyes/meson - display_name = "Optical Meson Scanners (Eng, Sci, Explo)" - allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") + display_name = "Optical Meson Scanners (Eng, Sci)" + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director") /datum/gear/eyes/arglasses display_name = "AR glasses" @@ -38,7 +38,7 @@ /datum/gear/eyes/arglasses/med display_name = "AR-M glasses (Medical)" path = /obj/item/clothing/glasses/omnihud/med - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/eyes/arglasses/all display_name = "AR-B glasses (SM, HoP)" diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 7dccf2dc13..a03ce63f93 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -649,7 +649,7 @@ display_name = "Kenzie's Hypospray" ckeywhitelist = list("lm40") character_name = list("Kenzie Houser") - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") /datum/gear/fluff/brianna_backpack path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana @@ -1289,7 +1289,7 @@ slot = slot_glasses ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic", "Off-duty Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Off-duty Medic") /datum/gear/fluff/tempest_hypospray path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest @@ -1297,7 +1297,7 @@ slot = slot_belt ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic", "Off-duty Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Off-duty Medic") /datum/gear/fluff/tempest_backpack path = /obj/item/weapon/storage/backpack/saddlebag/tempest diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 3ddc8c5388..43f8451dbe 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -1,7 +1,7 @@ /datum/gear/head/cap/med display_name = "cap, medical (Medical)" path = /obj/item/clothing/head/soft/med - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") /*/datum/gear/head/cap/sol display_name = "cap, sol" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm index 66e93fbbf6..dab191f306 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm @@ -1,5 +1,5 @@ /datum/gear/shoes/boots/winter/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/shoes/black/cuffs display_name = "legwraps, black" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 14cc60208d..72e7987648 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -390,12 +390,12 @@ /datum/gear/suit/wintercoat/medical display_name = "winter coat, medical" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/wintercoat/medical/alt display_name = "winter coat, medical alt" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/wintercoat/medical/viro display_name = "winter coat, virologist" @@ -420,7 +420,11 @@ /datum/gear/suit/wintercoat/medical/sar display_name = "winter coat, search and rescue" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar +<<<<<<< HEAD allowed_roles = list("Chief Medical Officer", "Field Medic") +======= + allowed_roles = list("Chief Medical Officer","Paramedic") +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /datum/gear/suit/wintercoat/science display_name = "winter coat, science" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 70bfe855cd..c1e706a7d6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -1,5 +1,5 @@ /datum/gear/suit/snowsuit/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/labcoat_colorable display_name = "labcoat, colorable" @@ -74,7 +74,7 @@ /datum/gear/suit/roles/medical/ems_jacket display_name = "first responder jacket" path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic") + allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor") //imo-superior 'martian' style jacket with the star-of-life design /datum/gear/suit/roles/medical/ems_jacket/alt @@ -85,7 +85,7 @@ /datum/gear/suit/roles/medical/paramedic_vest display_name = "paramedic vest" path = /obj/item/clothing/suit/storage/toggle/paramedic - allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic") + allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor") //greek thing /datum/gear/suit/chiton @@ -113,7 +113,7 @@ Talon winter coat /datum/gear/suit/armor/combat/crusader_explo display_name = "knight, explo" path = /obj/item/clothing/suit/armor/combat/crusader_explo - allowed_roles = list("Explorer","Field Medic","Pathfinder") + allowed_roles = list("Explorer","Pathfinder") /datum/gear/suit/armor/combat/crusader_explo/FM display_name = "knight, Field Medic" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index da716f5f6e..ddf9a39569 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -20,7 +20,7 @@ /datum/gear/uniform/job_turtle/medical display_name = "turtleneck, medical" path = /obj/item/clothing/under/rank/medical/turtleneck - allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Field Medic", "Chemist") + allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Chemist") //KHI Uniforms /datum/gear/uniform/job_khi/cmd @@ -36,7 +36,7 @@ /datum/gear/uniform/job_khi/med display_name = "ge uniform, med" //CHOMPedit: changed to GE suit path = /obj/item/clothing/under/rank/khi/med - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist") /datum/gear/uniform/job_khi/eng display_name = "ge uniform, eng" //CHOMPedit: changed to GE suit @@ -66,7 +66,7 @@ /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist","Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist") /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" @@ -83,7 +83,7 @@ /datum/gear/uniform/job_trek/medsci/tos display_name = "TOS uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") /datum/gear/uniform/job_trek/eng/tos display_name = "TOS uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value. @@ -101,7 +101,7 @@ /datum/gear/uniform/job_trek/medsci/tng display_name = "TNG uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/next - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") /datum/gear/uniform/job_trek/eng/tng display_name = "TNG uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value. @@ -119,7 +119,7 @@ /datum/gear/uniform/job_trek/medsci/voy display_name = "VOY uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/voy - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") /datum/gear/uniform/job_trek/eng/voy display_name = "VOY uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value. @@ -136,7 +136,11 @@ allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director", "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician", +<<<<<<< HEAD "Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS +======= + "Engineer","Warden","Detective","Security Officer") +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /datum/gear/uniform/job_trek/cmd/ds9 @@ -147,7 +151,7 @@ /datum/gear/uniform/job_trek/medsci/ds9 display_name = "DS9 uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/ds9 - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") /datum/gear/uniform/job_trek/eng/ds9 display_name = "DS9 uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value. @@ -165,7 +169,7 @@ /datum/gear/uniform/job_trek/medsci/ent display_name = "ENT uniform, med/sci" path = /obj/item/clothing/under/rank/trek/medsci/ent - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist") /datum/gear/uniform/job_trek/eng/ent display_name = "ENT uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value. diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 3755d62c1e..c740381f3b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -35,7 +35,7 @@ /datum/gear/utility/dufflebag/med display_name = "medical dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/med - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Field Medic") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist") /datum/gear/utility/dufflebag/med/emt display_name = "EMT dufflebag" @@ -57,9 +57,8 @@ allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist") /datum/gear/utility/dufflebag/explorer - display_name = "explorer dufflebag" + display_name = "away team dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/explorer - allowed_roles = list("Pathfinder","Explorer") /datum/gear/utility/dufflebag/talon display_name = "Talon dufflebag" diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index 4ee4395109..886364a44f 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -169,7 +169,7 @@ icon_state = "winterboots_hydro" /obj/item/clothing/shoes/boots/winter/explorer - name = "explorer winter boots" + name = "away team winter boots" desc = "Steel-toed winter boots for mining or exploration in hazardous environments. Very good at keeping toes warm and uncrushed." icon_state = "explorer" armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) diff --git a/code/modules/clothing/under/accessories/permits_vr.dm b/code/modules/clothing/under/accessories/permits_vr.dm index 2e3d15fb7c..425d3d2d21 100644 --- a/code/modules/clothing/under/accessories/permits_vr.dm +++ b/code/modules/clothing/under/accessories/permits_vr.dm @@ -2,5 +2,5 @@ desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolGov space, by law." //YW EDIT: SolGov /obj/item/clothing/accessory/permit/gun/planetside - name = "explorer gun permit" - desc = "A card indicating that the owner is allowed to carry a firearm during active exploration missions." + name = "away team gun permit" + desc = "A card indicating that the owner is allowed to carry a firearm during active missions." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index ad70b62ac5..ba1a5a4ea0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1114,7 +1114,7 @@ /obj/item/clothing/under/explorer desc = "A green uniform for operating in hazardous environments." - name = "explorer's jumpsuit" + name = "away team's jumpsuit" icon_state = "explorer" /obj/item/clothing/under/explorer/armored @@ -1501,4 +1501,8 @@ /obj/item/clothing/under/christmas/croptop/green name = "green crop-top christmas suit" desc = "A simple green christmas suit that doesn't quite looks like Mrs Claus'. Smells minty!" +<<<<<<< HEAD icon_state = "christmascroppedgreen" +======= + icon_state = "christmascroppedgreen" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 14bac95bf3..50a0012e62 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -54,9 +54,13 @@ EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50), EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), +<<<<<<< HEAD EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 400), //CHOMPEDIT EQUIPMENT("Defense Equipment - Frontier Phaser", /obj/item/weapon/gun/energy/locked/frontier, 150), //CHOMPADD EQUIPMENT("Defense Equipment - Holdout Phaser", /obj/item/weapon/gun/energy/locked/frontier/holdout, 100), //CHOMPADD +======= +// EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), //VOREStation removal +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger", /obj/item/weapon/kinetic_crusher/machete/dagger, 75), EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete", /obj/item/weapon/kinetic_crusher/machete, 250), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 9367044c0d..9d476fb0ec 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -16,8 +16,8 @@ var/list/department_radio_keys = list( ":u" = "Supply", ".u" = "Supply", ":v" = "Service", ".v" = "Service", ":p" = "AI Private", ".p" = "AI Private", - ":y" = "Explorer", ".y" = "Explorer", - ":a" = "Talon", ".a" = "Talon", //VOREStation Add, + ":a" = "Away Team", ".a" = "Away Team", //VOREStation Edit + ":y" = "Talon", ".y" = "Talon", //VOREStation Add, ":g" = "Casino", ".g" = "Casino", ":R" = "right ear", ".R" = "right ear", @@ -36,8 +36,8 @@ var/list/department_radio_keys = list( ":U" = "Supply", ".U" = "Supply", ":V" = "Service", ".V" = "Service", ":P" = "AI Private", ".P" = "AI Private", - ":Y" = "Explorer", ".Y" = "Explorer", - ":A" = "Talon", ".A" = "Talon", //VOREStation Add, + ":A" = "Away Team", ".A" = "Away Team", + ":Y" = "Talon", ".Y" = "Talon", //VOREStation Add, ":G" = "Casino", ".G" = "Casino", // Cyrillic characters on the same keys on the Russian QWERTY (phonetic) layout @@ -58,8 +58,8 @@ var/list/department_radio_keys = list( ":г" = "Supply", ".г" = "Supply", ":м" = "Service", ".м" = "Service", ":з" = "AI Private", ".з" = "AI Private", - ":н" = "Explorer", ".н" = "Explorer", - ":ф" = "Talon", ".ф" = "Talon", //VOREStation Add + ":ф" = "Away Team", ".ф" = "Away Team", + ":н" = "Talon", ".н" = "Talon", //VOREStation Add ":п" = "Casino", ".п" = "Casino", ) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 35474383a1..7c428d6695 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -172,7 +172,7 @@ var/global/list/robot_modules = list( "Supply" = 1, "Science" = 1, "Command" = 1, - "Explorer" = 1 + "Away Team" = 1 ) // Cyborgs (non-drones), default loadout. This will be given to every module. diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm index fb4cee24c2..23302b36bd 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm @@ -11,7 +11,7 @@ var/list/decals var/list/available_decals = list( - "Stripe" = "stripe", + "Stripe" = "stripe", "Vertical Stripe" = "stripe_vertical" ) @@ -31,7 +31,7 @@ var/new_pupil_color = input(usr, "Select a pupil colour.", "Pupil Colour Selection") as color|null if(usr.incapacitated() || QDELETED(usr) || QDELETED(src) || loc != usr) return - + pupil_color = new_pupil_color || initial(pupil_color) usr.update_icon() @@ -44,7 +44,7 @@ ) channels = list( "Science" = 1, - "Explorer" = 1 + "Away Team" = 1 ) /obj/item/weapon/robot_module/robot/platform/explorer/New() @@ -64,7 +64,11 @@ modules += bandaid synths += medicine +<<<<<<< HEAD var/obj/item/weapon/gun/energy/locked/phasegun/unlocked/mounted/cyborg/phasegun = new(src) +======= + var/obj/item/weapon/gun/energy/phasegun/mounted/cyborg/phasegun = new(src) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo modules += phasegun emag = new /obj/item/weapon/chainsaw(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 5081c63b8e..399a2851b3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -843,6 +843,53 @@ mob_radio.recalculateChannels(1) mobcard.access |= get_all_station_access() +//Pilot Catslug + +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug + name = "Navigator Purrverick" + desc = "A black-furred noodley bodied creature with thin arms and legs, and gloomy dark eyes. This one exudes an aura of coolness, they're so cool that their pilot's liscense was suspended." + tt_desc = "Mollusca Felis Mischefterous" + color = "#2b2b2b" + catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/pilotslug) + say_list_type = /datum/say_list/catslug/custom/pilotslug + +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug/Initialize() + . = ..() + if(prob(25)) + var/list/possible_targets = list() + for(var/obj/machinery/computer/ship/helm/h in world) + if(h.z in using_map.player_levels) + possible_targets |= h + var/final = pick(possible_targets) + forceMove(get_turf(final)) + ghostjoin = TRUE + +/datum/category_item/catalogue/fauna/catslug/custom/pilotslug + name = "Alien Wildlife - Catslug - Navigator Purrverick" + desc = "A resident at NSB Rascal's Pass, Navigator Purrverick \ + is a catslug who is known to dream big and seek the sky.\ + Purrverick has proved to be quite capable of utilizing shuttle\ + controls with excellent grace and skill. Purrverick can however\ + be rather self assured, which has on more than one occasion\ + lead to unfortunate mistakes and incidents.\ + Purrverick's provisionary piloting liscense is marked as suspended.\ + There are however still more records of the catslug's piloting escapades\ + dated afer their suspension.\ + \ + The Catslug is an omnivorous terrestrial creature.\ + Exhibiting properties of both a cat and a slug (hence its name)\ + it moves somewhat awkwardly. However, the unique qualities of\ + its body make it exceedingly flexible and smooth, allowing it to\ + wiggle into and move effectively in even extremely tight spaces.\ + Additionally, it has surprisingly capable hands, and moves quite\ + well on two legs or four. Caution is advised when interacting\ + with these creatures, they are quite intelligent, and proficient\ + tool users." + value = CATALOGUER_REWARD_TRIVIAL + +/datum/say_list/catslug/custom/pilotslug + speak = list("In the pipe, five my five.","Kick the tires and light the fires!","Bogeys on my tail!","GOOSE!","I'm really good at the stick.","I'm not doing nothing.","Heh.","Can you keep up?","Can't keep the sky from me.") + //============================= //Admin-spawn only catslugs end //============================= diff --git a/code/modules/pda/pda_vr.dm b/code/modules/pda/pda_vr.dm index f354ade3d3..d469efea07 100644 --- a/code/modules/pda/pda_vr.dm +++ b/code/modules/pda/pda_vr.dm @@ -3,8 +3,8 @@ /obj/item/device/pda/multicaster/exploration/New() ..() - owner = "Exploration Department" - name = "Exploration Department (Relay)" + owner = "Away Team" + name = "Away Team (Relay)" cartridges_to_send_to = exploration_cartridges /obj/item/device/pda/centcom diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm index 2b394135f0..5bf9e512c2 100644 --- a/maps/gateway_vr/eggnogtown.dmm +++ b/maps/gateway_vr/eggnogtown.dmm @@ -1406,12 +1406,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/eggnogtown/stokeswashere/bathroom) -"ma" = ( -/obj/effect/overmap/visitable/sector/common_gateway/eggnogtown, -/turf/simulated/mineral/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/caves) "mc" = ( /obj/structure/table/marble, /obj/machinery/reagentgrinder, @@ -4691,7 +4685,7 @@ Xb Xb Xb Xb -ma +Xb hj "} (4,1,1) = {" diff --git a/maps/gateway_vr/isle_de_monch.dmm b/maps/gateway_vr/isle_de_monch.dmm index 501945adeb..b15337cbf5 100644 --- a/maps/gateway_vr/isle_de_monch.dmm +++ b/maps/gateway_vr/isle_de_monch.dmm @@ -1,317 +1,21145 @@ -"ah" = (/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"aj" = (/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"bh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/closet/walllocker_double/south{name = "Uniform Locker"},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"bE" = (/obj/structure/table/steel,/obj/machinery/light,/obj/item/weapon/storage/toolbox/electrical{pixel_x = -3; pixel_y = -2},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"bR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"cq" = (/turf/simulated/floor/water/beach{dir = 8},/area/tether_away/beach/coast) -"cA" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"cK" = (/obj/structure/bed/chair/bay/comfy{dir = 4},/obj/item/trash/spacercake_wrap,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"cR" = (/turf/simulated/floor/water/beach/corner{dir = 8},/area/tether_away/beach/coast) -"dZ" = (/turf/simulated/floor/water/beach{dir = 5},/area/tether_away/beach/coast) -"en" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"ey" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"eI" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) -"eQ" = (/obj/machinery/door/airlock/hatch{req_one_access = list(160)},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"fC" = (/turf/simulated/floor/water/beach{dir = 6},/area/tether_away/beach/coast) -"fH" = (/turf/simulated/floor/water/deep/ocean,/area/tether_away/beach/water) -"fO" = (/obj/effect/overlay/palmtree_r,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) -"gu" = (/obj/structure/hull_corner{dir = 1},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"gC" = (/obj/tether_away_spawner/beach_outside,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) -"gD" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) -"gV" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"hj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/item/trash/syndi_cakes,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"hC" = (/obj/structure/girder,/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"im" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/item/weapon/melee/baton/cattleprod{desc = "Metal rod with wire attached to it."; name = "jury-rigged antenna"; pixel_x = 5; pixel_y = 4},/turf/simulated/floor/outdoors/grass,/area/tether_away/beach/resort) -"iM" = (/obj/structure/barricade,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) -"jk" = (/turf/simulated/floor/water/beach{dir = 10},/area/tether_away/beach/coast) -"jo" = (/obj/structure/salvageable/machine,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"ju" = (/obj/structure/girder,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) -"jy" = (/turf/simulated/floor/water/beach/corner,/area/tether_away/beach/coast) -"jH" = (/obj/random/multiple/corp_crate,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"jJ" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/bed,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"jX" = (/obj/structure/salvageable/console{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"kj" = (/obj/machinery/atmospherics/binary/pump/fuel{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"kk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"ks" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/salvageable/console{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"kx" = (/obj/machinery/gateway{dir = 5},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"kJ" = (/turf/simulated/floor/water/beach,/area/tether_away/beach/coast) -"kQ" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/wall/shull,/area/tether_away/beach/resort) -"lJ" = (/obj/structure/table/rack,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"mp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"mr" = (/obj/structure/barricade,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) -"mt" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{dir = 4; id_tag = "salamander_docking_star"; name = "Starboard Airlock Control"; pixel_x = -22; req_one_access = list(160)},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"mA" = (/obj/structure/railing/grey{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"mV" = (/obj/machinery/atmospherics/unary/engine/bigger{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"nL" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/hatch{req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"nV" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"oe" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; req_one_access = list(160)},/obj/machinery/door/firedoor/multi_tile{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"oB" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 1},/obj/structure/catwalk,/obj/machinery/light/small{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"oI" = (/obj/machinery/gateway{dir = 9},/obj/effect/floor_decal/industrial/warning{dir = 9},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"oS" = (/turf/simulated/floor/water/ocean,/area/tether_away/beach/water) -"oY" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"pB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"pJ" = (/obj/structure/salvageable/console{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"pX" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"qf" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/item/clothing/ears/earmuffs,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"qQ" = (/obj/structure/hull_corner{dir = 4},/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) -"rd" = (/obj/effect/map_helper/airlock/sensor/int_sensor,/obj/machinery/airlock_sensor{dir = 8; pixel_x = 21; req_one_access = list(160)},/obj/structure/handrail{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"rN" = (/obj/machinery/door/airlock/glass_external/public,/obj/effect/map_helper/airlock/door/int_door,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"rS" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/railing/grey{dir = 1},/obj/machinery/atmospherics/portables_connector/fuel{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"sk" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"so" = (/obj/item/broken_device/random,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"sF" = (/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"tG" = (/obj/structure/bed/chair/bay/chair{dir = 4},/obj/machinery/button/remote/blast_door{id = "trade"; name = "Shop Shutters"; pixel_y = -26; req_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"tO" = (/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"ue" = (/obj/effect/landmark/gateway_scatter,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) -"up" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable,/obj/structure/railing/grey{dir = 8},/obj/machinery/light,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"uL" = (/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"vx" = (/obj/machinery/gateway{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"vy" = (/turf/simulated/floor/water/beach/corner{dir = 4},/area/tether_away/beach/coast) -"vN" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"vT" = (/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 10},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"wo" = (/obj/structure/handrail{dir = 1},/obj/machinery/alarm/alarms_hidden{dir = 4; pixel_x = -26},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light{dir = 8},/obj/structure/closet/autolok_wall{dir = 1; pixel_y = -32},/obj/structure/railing/grey{dir = 4},/obj/structure/bed/chair/bay/comfy{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"wp" = (/obj/machinery/atmospherics/pipe/manifold/visible{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"ww" = (/mob/living/simple_mob/vore/aggressive/deathclaw,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) -"wY" = (/turf/simulated/floor/water/beach/corner{dir = 1},/area/tether_away/beach/coast) -"xc" = (/obj/machinery/gateway{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"xe" = (/obj/structure/handrail,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"xf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"xM" = (/obj/item/stack/cable_coil,/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/item/weapon/melee/baton/cattleprod{desc = "Metal rod with wire attached to it."; name = "jury-rigged antenna"; pixel_x = 5; pixel_y = 4},/obj/item/weapon/cell/emergency_light{pixel_x = -4},/obj/item/device/radio/off{channels = list("Talon" = 1); pixel_x = 4; pixel_y = -3},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"xS" = (/obj/item/clothing/head/soft/black,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"xU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"xZ" = (/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) -"yc" = (/obj/structure/barricade,/obj/structure/barricade/planks,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) -"yd" = (/turf/simulated/wall/shull,/area/tether_away/beach/resort) -"yn" = (/obj/structure/table/steel_reinforced,/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "trade"; name = "Shop Shutters"; opacity = 0},/obj/structure/railing/grey{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{layer = 2.9; open_layer = 2.9; req_access = list(); req_one_access = list(160)},/obj/random/mug,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"yw" = (/obj/structure/closet/autolok_wall{pixel_y = 32},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"zX" = (/obj/structure/salvageable/computer,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Af" = (/obj/machinery/door/airlock/glass_external/public,/obj/effect/map_helper/airlock/door/ext_door,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"Aq" = (/obj/machinery/gateway{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"As" = (/obj/tether_away_spawner/beach_outside,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) -"AE" = (/obj/effect/map_helper/airlock/sensor/chamber_sensor,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/machinery/airlock_sensor{dir = 4; pixel_x = -21; req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"AI" = (/turf/simulated/floor/water/beach{dir = 1},/area/tether_away/beach/coast) -"Cd" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Cw" = (/obj/machinery/alarm/alarms_hidden{dir = 8; pixel_x = 26},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Cx" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 6},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Dt" = (/obj/machinery/gateway{dir = 10},/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"DJ" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"DW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/effect/catwalk_plated,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Em" = (/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) -"ET" = (/turf/simulated/floor/outdoors/grass,/area/tether_away/beach/resort) -"Fr" = (/obj/structure/barricade,/obj/structure/barricade/planks,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) -"Ft" = (/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"FK" = (/obj/structure/hull_corner,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) -"FP" = (/obj/effect/decal/remains,/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"FX" = (/obj/structure/bed/chair/bay/comfy{dir = 4},/obj/effect/decal/remains,/obj/item/clothing/under/utility,/obj/item/clothing/shoes/boots/workboots,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"Gv" = (/obj/effect/floor_decal/industrial/warning{dir = 9},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/railing/grey{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Gy" = (/obj/machinery/light,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"GX" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Hg" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Ht" = (/obj/structure/handrail{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Hx" = (/obj/effect/decal/remains,/turf/simulated/floor/outdoors/newdirt,/area/tether_away/beach/resort) -"HH" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"HN" = (/obj/effect/overlay/coconut,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) -"HY" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"IZ" = (/obj/machinery/gateway,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"Jd" = (/obj/machinery/gateway{dir = 6},/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"Jr" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 5},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"JB" = (/obj/machinery/gateway/centeraway{calibrated = 0},/turf/simulated/floor/reinforced,/area/tether_away/beach/resort) -"Km" = (/obj/effect/floor_decal/industrial/warning{dir = 5},/obj/structure/railing/grey{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"KH" = (/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Lt" = (/obj/effect/overmap/visitable/sector/virgo4,/turf/simulated/floor/water/deep/ocean,/area/tether_away/beach/water) -"Mm" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/voidcraft{req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"Mr" = (/obj/structure/bed/chair,/obj/effect/decal/remains,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"MI" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/industrial/outline,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"MM" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"MO" = (/obj/structure/table/steel,/obj/machinery/light_switch{dir = 8; pixel_x = -22},/obj/structure/closet/walllocker_double/kitchen/south,/obj/item/device/multitool{pixel_x = 4; pixel_y = 2},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"NH" = (/obj/machinery/light/small{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"NY" = (/obj/effect/overlay/palmtree_r,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) -"Od" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"OJ" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"OR" = (/obj/structure/handrail{dir = 1},/obj/structure/closet/walllocker_double/south{name = "Storage Locker"},/obj/random/multiple/corp_crate,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Pd" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Po" = (/obj/structure/table/standard,/obj/item/weapon/pen,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"PI" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"Qo" = (/turf/simulated/floor/water/beach{dir = 4},/area/tether_away/beach/coast) -"Qx" = (/obj/structure/bed/chair/bay/chair,/obj/structure/handrail,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/closet/autolok_wall{dir = 8; pixel_x = -32},/obj/effect/decal/remains,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"QK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"QZ" = (/obj/effect/overlay/coconut,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) -"Rs" = (/turf/simulated/wall/r_wall,/area/tether_away/beach/resort) -"RJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"Sk" = (/obj/structure/handrail{dir = 1},/obj/random/trash_pile,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Sp" = (/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) -"Ss" = (/obj/machinery/light_switch{dir = 4; pixel_x = 22},/obj/structure/bed,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"SC" = (/obj/structure/railing/grey{dir = 8},/obj/structure/handrail{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/closet/walllocker_double/south{name = "Voidsuit Locker"},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"SG" = (/obj/effect/decal/remains,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) -"Th" = (/obj/structure/table,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"TB" = (/obj/effect/landmark/gateway_scatter,/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach) -"TQ" = (/obj/structure/salvageable/console,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"TR" = (/obj/machinery/power/port_gen/pacman,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"TW" = (/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -28},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/structure/handrail,/obj/machinery/light{dir = 8},/obj/structure/closet/autolok_wall{pixel_y = 32},/obj/structure/railing/grey{dir = 4},/obj/item/weapon/gun/projectile/pistol,/obj/item/ammo_magazine/m9mm/compact,/obj/item/ammo_magazine/m9mm/compact,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"Uk" = (/obj/structure/catwalk,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Uu" = (/obj/machinery/light,/obj/structure/closet/walllocker_double/south{name = "Storage Locker"},/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Uy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"UB" = (/turf/simulated/floor/beach/sand/desert/outdoors,/area/tether_away/beach/resort) -"Ve" = (/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "trade"; name = "Shop Shutters"; opacity = 0},/obj/structure/table/steel_reinforced,/obj/machinery/door/window/brigdoor/eastright{layer = 2.9; open_layer = 2.9; req_access = list(); req_one_access = list(160)},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"Vs" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"VD" = (/obj/structure/salvageable/server,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Wb" = (/turf/simulated/floor/water/beach{dir = 9},/area/tether_away/beach/coast) -"Wm" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"WJ" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"WS" = (/obj/structure/barricade,/obj/structure/barricade/planks,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Xf" = (/obj/machinery/door/airlock/glass_external/public,/obj/effect/map_helper/airlock/door/ext_door,/obj/effect/map_helper/airlock/sensor/ext_sensor,/obj/machinery/airlock_sensor/airlock_exterior/shuttle{pixel_x = 24; pixel_y = -11},/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"Xl" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"Xo" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/structure/handrail{dir = 1},/obj/structure/closet/walllocker_double/south{name = "Storage Locker"},/obj/structure/closet/crate/secure/loot,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Xw" = (/obj/item/weapon/circuitboard/broken,/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"Xx" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/blue,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"XA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/outdoors/grass,/area/tether_away/beach/resort) -"XJ" = (/obj/random/multiple/corp_crate,/turf/simulated/floor/outdoors/grass/forest,/area/tether_away/beach/resort) -"XT" = (/turf/unsimulated/wall/planetary/normal/virgo4,/area/tether_away/beach/water) -"Yj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/obj/effect/map_helper/airlock/atmos/chamber_pump,/obj/structure/closet/walllocker/emerglocker/east,/turf/simulated/floor/tiled/techmaint,/area/tether_away/beach/resort) -"YD" = (/obj/structure/handrail{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/tether_away/beach/resort) -"YN" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/tether_away/beach/resort) -"ZX" = (/turf/simulated/mineral/ignore_mapgen,/area/tether_away/beach/resort) -"ZZ" = (/obj/effect/decal/cleanable/blood,/turf/simulated/mineral/floor/cave{name = "dirt"},/area/tether_away/beach/resort) +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"aj" = ( +/obj/structure/closet/crate/secure/loot, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"bh" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"bE" = ( +/obj/structure/table/steel, +/obj/machinery/light, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -3; + pixel_y = -2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"bR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"cq" = ( +/turf/simulated/floor/water/beach{ + dir = 8 + }, +/area/tether_away/beach/coast) +"cA" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"cK" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/obj/item/trash/spacercake_wrap, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"cR" = ( +/turf/simulated/floor/water/beach/corner{ + dir = 8 + }, +/area/tether_away/beach/coast) +"dZ" = ( +/turf/simulated/floor/water/beach{ + dir = 5 + }, +/area/tether_away/beach/coast) +"en" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"ey" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"eI" = ( +/obj/effect/overlay/palmtree_l, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach) +"eQ" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list(160) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"fC" = ( +/turf/simulated/floor/water/beach{ + dir = 6 + }, +/area/tether_away/beach/coast) +"fH" = ( +/turf/simulated/floor/water/deep/ocean, +/area/tether_away/beach/water) +"fO" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"gu" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"gC" = ( +/obj/tether_away_spawner/beach_outside, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach) +"gD" = ( +/obj/effect/overlay/palmtree_l, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"gV" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"hj" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/item/trash/syndi_cakes, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"hC" = ( +/obj/structure/girder, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"im" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/item/weapon/melee/baton/cattleprod{ + desc = "Metal rod with wire attached to it."; + name = "jury-rigged antenna"; + pixel_x = 5; + pixel_y = 4 + }, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/resort) +"iM" = ( +/obj/structure/barricade, +/turf/simulated/floor/outdoors/newdirt, +/area/tether_away/beach/resort) +"jk" = ( +/turf/simulated/floor/water/beach{ + dir = 10 + }, +/area/tether_away/beach/coast) +"jo" = ( +/obj/structure/salvageable/machine, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"ju" = ( +/obj/structure/girder, +/turf/simulated/floor/outdoors/newdirt, +/area/tether_away/beach/resort) +"jy" = ( +/turf/simulated/floor/water/beach/corner, +/area/tether_away/beach/coast) +"jH" = ( +/obj/random/multiple/corp_crate, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"jJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/bed, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"jX" = ( +/obj/structure/salvageable/console{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"kj" = ( +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 1 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"kk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"ks" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/salvageable/console{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"kx" = ( +/obj/machinery/gateway{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"kJ" = ( +/turf/simulated/floor/water/beach, +/area/tether_away/beach/coast) +"kQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/wall/shull, +/area/tether_away/beach/resort) +"lJ" = ( +/obj/structure/table/rack, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"mp" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"mr" = ( +/obj/structure/barricade, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/resort) +"mt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 4; + id_tag = "salamander_docking_star"; + name = "Starboard Airlock Control"; + pixel_x = -22; + req_one_access = list(160) + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"mA" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"mV" = ( +/obj/machinery/atmospherics/unary/engine/bigger{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"nL" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/hatch{ + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"nV" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"oe" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2; + req_one_access = list(160) + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"oB" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"oI" = ( +/obj/machinery/gateway{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"oS" = ( +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/water) +"oY" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"pB" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"pJ" = ( +/obj/structure/salvageable/console{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"pX" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"qf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/item/clothing/ears/earmuffs, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"qQ" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/floor/outdoors/newdirt, +/area/tether_away/beach/resort) +"rd" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 21; + req_one_access = list(160) + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"rN" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"rS" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"sk" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"so" = ( +/obj/item/broken_device/random, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"sF" = ( +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"tG" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "trade"; + name = "Shop Shutters"; + pixel_y = -26; + req_access = list(160) + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"tO" = ( +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"ue" = ( +/obj/effect/landmark/gateway_scatter, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"up" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"uL" = ( +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"vx" = ( +/obj/machinery/gateway{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"vy" = ( +/turf/simulated/floor/water/beach/corner{ + dir = 4 + }, +/area/tether_away/beach/coast) +"vN" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"vT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"wo" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/autolok_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"wp" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"ww" = ( +/mob/living/simple_mob/vore/aggressive/deathclaw, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/resort) +"wY" = ( +/turf/simulated/floor/water/beach/corner{ + dir = 1 + }, +/area/tether_away/beach/coast) +"xc" = ( +/obj/machinery/gateway{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"xe" = ( +/obj/structure/handrail, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"xf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"xM" = ( +/obj/item/stack/cable_coil, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/item/weapon/melee/baton/cattleprod{ + desc = "Metal rod with wire attached to it."; + name = "jury-rigged antenna"; + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/weapon/cell/emergency_light{ + pixel_x = -4 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1); + pixel_x = 4; + pixel_y = -3 + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"xS" = ( +/obj/item/clothing/head/soft/black, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"xU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"xZ" = ( +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/resort) +"yc" = ( +/obj/structure/barricade, +/obj/structure/barricade/planks, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/resort) +"yd" = ( +/turf/simulated/wall/shull, +/area/tether_away/beach/resort) +"yn" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 4; + icon_state = "shutter0"; + id = "trade"; + name = "Shop Shutters"; + opacity = 0 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/brigdoor/eastleft{ + layer = 2.9; + open_layer = 2.9; + req_access = list(); + req_one_access = list(160) + }, +/obj/random/mug, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"yw" = ( +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"zX" = ( +/obj/structure/salvageable/computer, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Af" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"Aq" = ( +/obj/machinery/gateway{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"As" = ( +/obj/tether_away_spawner/beach_outside, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"AE" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -21; + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"AI" = ( +/turf/simulated/floor/water/beach{ + dir = 1 + }, +/area/tether_away/beach/coast) +"Cd" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Cw" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Cx" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Dt" = ( +/obj/machinery/gateway{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"DJ" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"DW" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Em" = ( +/turf/simulated/floor/outdoors/newdirt, +/area/tether_away/beach/resort) +"ET" = ( +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/resort) +"Fr" = ( +/obj/structure/barricade, +/obj/structure/barricade/planks, +/turf/simulated/floor/outdoors/newdirt, +/area/tether_away/beach/resort) +"Ft" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"FK" = ( +/obj/structure/hull_corner, +/turf/simulated/floor/outdoors/newdirt, +/area/tether_away/beach/resort) +"FP" = ( +/obj/effect/decal/remains, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"FX" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/obj/effect/decal/remains, +/obj/item/clothing/under/utility, +/obj/item/clothing/shoes/boots/workboots, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"Gv" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Gy" = ( +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"GX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Hg" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Ht" = ( +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Hx" = ( +/obj/effect/decal/remains, +/turf/simulated/floor/outdoors/newdirt, +/area/tether_away/beach/resort) +"HH" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"HN" = ( +/obj/effect/overlay/coconut, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach) +"HY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"IZ" = ( +/obj/machinery/gateway, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"Jd" = ( +/obj/machinery/gateway{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"Jr" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"JB" = ( +/obj/machinery/gateway/centeraway{ + calibrated = 0 + }, +/turf/simulated/floor/reinforced, +/area/tether_away/beach/resort) +"Km" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"KH" = ( +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Mm" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"Mr" = ( +/obj/structure/bed/chair, +/obj/effect/decal/remains, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"MI" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"MM" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"MO" = ( +/obj/structure/table/steel, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = -22 + }, +/obj/structure/closet/walllocker_double/kitchen/south, +/obj/item/device/multitool{ + pixel_x = 4; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"NH" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"NY" = ( +/obj/effect/overlay/palmtree_r, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach) +"Od" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"OJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"OR" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, +/obj/random/multiple/corp_crate, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Pd" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Po" = ( +/obj/structure/table/standard, +/obj/item/weapon/pen, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"PI" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"Qo" = ( +/turf/simulated/floor/water/beach{ + dir = 4 + }, +/area/tether_away/beach/coast) +"Qx" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/handrail, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/closet/autolok_wall{ + dir = 8; + pixel_x = -32 + }, +/obj/effect/decal/remains, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"QK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"QZ" = ( +/obj/effect/overlay/coconut, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"Rs" = ( +/turf/simulated/wall/r_wall, +/area/tether_away/beach/resort) +"RJ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"Sk" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Sp" = ( +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach) +"Ss" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/obj/structure/bed, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"SC" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"SG" = ( +/obj/effect/decal/remains, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/resort) +"Th" = ( +/obj/structure/table, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"TB" = ( +/obj/effect/landmark/gateway_scatter, +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach) +"TQ" = ( +/obj/structure/salvageable/console, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"TR" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"TW" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/item/weapon/gun/projectile/pistol, +/obj/item/ammo_magazine/m9mm/compact, +/obj/item/ammo_magazine/m9mm/compact, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"Uk" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Uu" = ( +/obj/machinery/light, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, +/obj/structure/closet/crate/secure/loot, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Uy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"UB" = ( +/turf/simulated/floor/beach/sand/desert/outdoors, +/area/tether_away/beach/resort) +"Ve" = ( +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 4; + icon_state = "shutter0"; + id = "trade"; + name = "Shop Shutters"; + opacity = 0 + }, +/obj/structure/table/steel_reinforced, +/obj/machinery/door/window/brigdoor/eastright{ + layer = 2.9; + open_layer = 2.9; + req_access = list(); + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"Vs" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"VD" = ( +/obj/structure/salvageable/server, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Wb" = ( +/turf/simulated/floor/water/beach{ + dir = 9 + }, +/area/tether_away/beach/coast) +"Wm" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"WJ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"WS" = ( +/obj/structure/barricade, +/obj/structure/barricade/planks, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Xf" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + pixel_x = 24; + pixel_y = -11 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"Xl" = ( +/obj/item/weapon/circuitboard/broken, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"Xo" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Storage Locker" + }, +/obj/structure/closet/crate/secure/loot, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Xw" = ( +/obj/item/weapon/circuitboard/broken, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"Xx" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"XA" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/grass, +/area/tether_away/beach/resort) +"XJ" = ( +/obj/random/multiple/corp_crate, +/turf/simulated/floor/outdoors/grass/forest, +/area/tether_away/beach/resort) +"XT" = ( +/turf/unsimulated/wall/planetary/normal/virgo4, +/area/tether_away/beach/water) +"Yj" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/floor/tiled/techmaint, +/area/tether_away/beach/resort) +"YD" = ( +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether_away/beach/resort) +"YN" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort) +"ZX" = ( +/turf/simulated/mineral/ignore_mapgen, +/area/tether_away/beach/resort) +"ZZ" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/resort) (1,1,1) = {" -XTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbAIAIAIAIdZoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpSpSpcRdZoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbAIvySpSpSpSpSpSpcRdZoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpSpSpUBUBSpSpSpQooSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbAIvySpSpSpUBZXZXZXZXSpSpcRdZoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpSpSpUBZXZXZXZXZXUBSpSpcRdZoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpSpUBZXZXZXZXZXZXZXZXSpSpSpQooSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSWbAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpSpUBZXZXZXZXZXZXZXZXZXUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSWbvySpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpSpZXZXZXZXZXZXZXZXZXZXZXZXSpSpcRAIdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoScqSpSpSpSpSpSpcRAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpSpcRAIAIAIdZoSoSfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoScqSpTBUBUBSpSpSpSpcRAIAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpSpSpSpSpSpcRdZoSoSfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBSpSpSpSpSpSpSpSpSpcRAIAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSWbvySpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpSpSpSpSpcRdZoSfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBueUBUBSpSpSpSpSpSpSpSpSpSpSpSpSpcRAIAIAIAIAIAIAIdZoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBSpSpSpQooSoSoSfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpSpSpSpSpSpSpcRAIAIdZoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBSpSpSpQooSoSoSoSfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBETETETETETETETETUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpSpSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpUBETETETETETETETETETETETETETETETUBUBUBUBUBfOUBUBUBUBSpSpSpSpeIcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBgDQZUBUBSpSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIAIvySpSpSpETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpSpUBETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBgCSpcRdZoSoSoSoSfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpUBUBETETETETETETETETETETETETETsFsFsFsFsFsFETETETETETUBUBUBUBUBUBUBUBfOUBSpSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBETETETETETETETETsFsFsFsFEmydydydydydydydEmETETETETETUBUBUBUBUBUBUBQZUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoScqSpSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBETETETETETETETsFsFsFsFEmEmEmKHKHxeajKHjHEmEmEmETETETETETETETETUBUBUBUBUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSjkwYSpSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpQooSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBETETETETETETETsFsFsFsFEmEmEmEmEmuLUkUkUkUkKHEmsFsFsFETETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSjkwYSpSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpQooSoSoSoSoSoSoSoSoSoSoSWbAIvySpSpSpUBUBETETETETETETETsFsFsFsFsFsFsFsFsFEmydnLydydydEmsFsFsFydsFETETETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSjkkJwYSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpSpQooSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpUBUBETETETETETETFKydydydjuydsFsFsFhCsFsFsFsFsFsFsFFPsFydydydsFhCsFETETydydETETUBUBUBSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXSpjyfCoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBETETETETEmEmydydydNHKHYNXxsFsFsFsFKHsFKHEmEmEmsFsFsFXJsFsFsFsFEmKHSsydETETUBUBUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBZXZXZXZXZXZXZXZXZXZXZXSpSpjyfCoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBETETETEmEmEmEmKHoYMMFtvTJrwpsFEmEmEmEmEmEmEmjuEmEmEmEmsFEmEmEmEmEmUyCwydydenenWmUBUBSpSpQooSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBZXZXZXZXZXZXZXZXZXSpSpjyfCoSoSoSoSoSoSoSoSoSoSWbvySpSpSpUBUBUBUBETETETETEmEmEmmVGyCdKHkjOJOdajsFsFsFEmydydydydEmEmjusFsFKHsFEmEmKHHYydydTWjJTQPdWmUBSpSpcRdZoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBZXZXZXZXZXZXZXSpSpQooSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBETETETETETETsFEmjuydydrSpXsFsFsFsFhCsFsFKHsFsFsFsFsFsFydydsFEmEmbRKHpBtOxUhjkkFXpJHHUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpUBZXZXZXZXZXUBSpSpQooSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFEmEmEmEmKHKHKHsFsFsFEmEmEmEmEmxfDWbhoeqfKHcKpJHHUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBETETETETsFsFEmEmKHsFsFEmEmEmEmHxEmEmEmKHKHKHKHKHKHKHsFsFsFsFsFEmEmydMmydydwoxSjXPdgVUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBETETETETETEmEmKHKHKHKHEmEmEmEmKHmAYDKHKHGvGXahKmeyyntOtOSCHtsFEmEmEmKHWJCwydydcAcAgVUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpSpSpQooSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBETETETETsFsFEmmVKHuLEmEmEmKHKHKHupahydPIORSkUuXotGVetOrdydydQKKHEmEmEmKHsFETETETETETUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbAIAIAIAIAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSWbvySpSpUBfOUBUBUBUBETETETETsFEmEmEmHgjuEmEmEmEmEmKHydydydeQydydydydydydrNrNydQxWJKHKHsFsFsFsFETETETETUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpHNSpSpSpcRAIAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJkJkJkJfCoSoSoSoSoSoSoSoSoSWbvySpSpgCUBUBQZUBUBETETETETsFsFsFsFEmEmEmEmEmEmEmEmydydajywKHUkKHUkCxoBkQAEYjydMOksbEsFsFTRsFsFETETETETUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpNYSpSpSpSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpUBUBUBUBUBUBETETETETsFsFsFsFsFsFsFsFsFEmEmEmEmydydskUkjHajjHDJMIydmtYjydydnVydsFsFRJsFsFETETETETUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpUBUBUBUBSpSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIvySpeISpUBUBUBUBUBUBUBETETETETsFsFsFsFsFsFsFsFsFsFsFsFEmqQydydjujuydydHgydydAfXfydgusFsFsFsFRJsFsFETETETUBUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBfOUBUBUBUBSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIvySpSpSpSpUBUBUBUBUBUBUBUBETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFEmEmEmEmEmsFsFsFsFsFsFsFsFsFsFsFsFxMVsmpXAXAimETUBUBUBUBUBSpSpQooSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpeIUBAsUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbAIvySpSpSpSpUBUBUBUBgDUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpQooSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBUBUBUBUBUBUBfOSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpSpSpUBAsUBUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpUBUBUBUBZXZXUBUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpeIUBUBUBUBUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBfOUBUBZXZXZXZXZXUBUBUBSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSWbvySpSpSpQZUBUBUBgDUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpQZUBUBZXZXZXZXZXZXUBUBUBUBSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBUBUBUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXUBUBgDUBSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBUBUBUBETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpUBETZXZXZXZXZXZXZXZXZXUBQZUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBUBUBETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpSpUBETZXZXZXZXZXZXZXZXZXUBUBUBUBNYSpSpQooSoSoSoSoSoSoSoSoSoScqSpSpUBUBUBUBUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpUBETETZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSoScqSpSpUBUBfOUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbvySpSpUBETETETZXZXZXZXZXZXZXZXZXZXUBUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSWbvySpSpUBUBUBUBUBUBETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETETUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSWbAIvySpSpSpUBETETETZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpSpQooSoSoSoSoSoSoScqSpSpSpUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFsFETETETETsFsFETETETETETETETsFsFsFsFETETETETsFsFsFsFsFsFETETETETETETETETUBUBUBUBUBSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbAIvySpSpSpSpUBETETETETZXZXZXZXZXZXZXZXZXZXZXUBUBgDUBUBSpSpQooSoSoSoSoSoSoScqSpSpUBUBUBUBUBUBUBETETETETETsFsFsFsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETsFsFETETETETETETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSWbvySpSpSpSpUBUBETETETETETZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpQooSoSoSoSoSoSWbvySpSpUBUBUBUBUBUBUBUBETETETETsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpSpUBUBUBETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpcRdZoSoSoSoSoScqSpSpSpUBUBUBUBUBUBUBUBETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpSpUBETETETETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpcRAIdZoSWbAIvySpSpUBUBUBUBUBUBUBUBUBUBETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpSpUBETETETETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpSpSpcRAIvySpSpSpSpUBUBUBUBUBUBUBUBUBUBUBETETETETETETETETETETETETETUBUBUBUBUBETETETETETETETETUBUBUBUBUBUBETETETETETETETETETETETETUBUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpUBETETETETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBSpSpSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBUBUBETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBETETETETETETETETETETUBUBUBSpSpSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBETETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBueUBUBUBUBUBUBUBETETETUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBETETETETETETETUBUBUBSpSpSpjykJfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpETETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpSpSpSpSpSpSpSpNYUBQZUBfOUBUBUBUBETETETETUBUBUBSpSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpETETZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBUBUBUBUBETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpjykJkJkJkJkJkJkJwYSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpETETZXZXZXZXZXRsRsRsRsRsRsRsRsRsRsZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBUBUBETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpjykJkJfCoSoSoSoSoSoSoSjkkJwYSpSpSpSpUBUBUBfOUBUBUBUBUBUBSpSpjyfCoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBETETZXZXZXZXZXRsoIxckxKHRszXVDjoRsZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXUBETETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpSpSpSpjykJfCoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpUBUBUBUBUBUBueUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHoSoSoSWbvySpSpUBETZXZXZXZXZXZXRsAqJBvxXwKHahahKHRsZXSGxZZXZXZXZXZXZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFETETETETETETETETUBUBUBUBUBUBUBUBSpSpSpSpjykJkJkJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHoSoSoScqSpSpSpUBZXZXZXZXZXZXZXRsDtIZJdahKHKHsoKHWSxZxZxZxZxZZXZXZXZXZXZXZXZXZXZXZXZXETETsFsFsFsFsFsFsFETETETETETETETETUBUBUBUBUBUBSpSpSpjykJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoScqSpNYSpUBueUBUBUBUBgDSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBZXZXZXZXZXZXZXZXRsahKHKHKHKHKHKHKHWSxZxZxZSGxZZXZXZXZXZXZXZXZXZXZXZXETETETsFsFsFsFsFsFsFETETETETETETETETETUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpUBUBUBUBUBUBSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBZXZXZXZXZXZXZXZXRsRsRsRsRsKHXlMrThRsZXZXZXxZxZxZZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFETETETETETETETETUBUBUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpQZfOUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXRslJvNvNPoRsZXZXZXZXycycZXZXZXZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSWbAIdZoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpSpSpSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXRsRsRsRsRsRsZXZXZXZXxZxZZXZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSWbAIAIvySpcRdZoSoSoSoSoSWbAIAIdZoSoSjkwYSpSpSpSpSpSpjyfCoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZZXZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpcRAIAIdZoSoSoSoSoSWbvySpSpSpSpSpcRdZoSoSoSWbvySpSpQooSoSoSjkkJkJkJkJkJkJfCoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZZZxZxZxZxZZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFETETETETETETUBUBUBSpSpSpSpSpcRAIAIAIAIAIvySpSpSpSpSpSpSpQooSoSWbvyHNeIjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZxZxZxZxZZXZXZXZXZXZXZXZXETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBSpSpSpSpSpSpSpSpSpSpNYSpSpSpSpSpNYSpcRdZoSjkwYSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqNYSpUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZSGxZxZxZxZxZxZSGZXZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBUBUBUBfOSpgCSpSpSpSpSpSpSpeISpSpgCSpSpQooSoSjkkJkJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZZZxZxZxZxZxZxZZZxZxZxZZXZXZXZXZXZXZXETETETETsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBUBUBUBUBSpSpSpSpSpSpSpSpSpgCSpSpSpSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZwwxZxZxZxZxZxZZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBUBSpSpSpSpSpSpSpSpNYHNSpSpSpSpSpNYSpSpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZxZxZZZxZxZZZxZZXZXZXZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBSpSpSpjykJwYSpSpjykJwYSpSpSpSpSpHNSpSpNYjykJfCoSoSoSfHfHfHoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpgDUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZZZZZxZxZxZxZxZxZxZZXZXZXZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBSpSpjyfCoSjkkJkJfCoSjkkJwYSpSpSpSpSpjykJfCoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZZZxZxZxZxZxZxZZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBUBSpSpQooSoSoSoSoSoSoSoSoSjkkJkJkJkJkJfCoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZSGxZxZxZxZZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZxZxZxZxZiMZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXxZxZmrFrFrEmETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpNYQZUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXiMFrEmEmETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpSpUBUBUBUBUBZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXZXEmETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETUBSpSpSpQooSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHoSoSoSjkwYSpSpSpUBUBUBUBUBETETETETZXZXZXZXZXZXZXZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpUBUBUBUBUBETETETETETZXZXZXZXZXZXZXZXZXZXZXETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpQooSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpeISpUBfOUBUBUBUBETETETETETETZXZXZXZXZXZXETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpcRdZoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpSpSpHNSpUBUBETETETETETETETETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBSpSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkwYSpSpSpSpSpSpSpUBUBETETETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETUBUBUBSpSpcRdZoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSjkkJkJkJkJwYSpSpSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpcRAIdZoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSjkkJwYSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETUBUBUBSpSpSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSjkwYSpSpUBETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBUBSpSpSpcRdZoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoScqSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETsFsFsFsFsFsFETETETETETETUBUBUBUBSpSpSpcRdZoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoScqSpSpUBETETETETETsFsFsFsFsFsFsFsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBSpSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSjkwYSpSpUBETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETETETETETETETETETETETETETETETETETETETETETETUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoScqSpSpUBETETETETsFsFsFsFsFsFsFsFsFsFsFETETETETETUBUBETETETETETETETETETETETETETETETETETETUBUBUBUBUBgDUBUBUBSpSpcRdZoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBETETETETETETsFsFsFsFsFsFsFETETETETETUBUBUBUBUBUBUBUBETETETETETETETETETETETETUBUBUBUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoScqSpSpUBETETETETETETsFsFsFsFsFsFETETETETETUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpUBETETETETETETsFsFsFsFsFETETETETETUBUBgDUBSpSpSpSpUBUBfOUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBAsUBSpSpQooSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSjkwYSpSpETETETETETETETsFsFsFETETETETETETUBQZSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBfOUBUBUBUBUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoScqSpSpETETETETETETETETETETETETETETETUBUBSpSpSpjykJwYSpSpUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBfOUBUBSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBETETETETETETETETETETETETETETUBUBSpSpjyfCoScqSpSpSpSpSpUBUBUBUBUBUBUBUBAsUBUBUBfOUBUBUBUBUBUBUBUBSpSpSpQooSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBETETETETETETETETETETETETETUBSpSpSpQooSoSjkwYSpSpSpSpSpSpSpHNgDUBUBUBUBUBUBUBUBUBUBUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoScqSpSpUBUBUBETETETETETETETETETETETUBfOSpSpjyfCoSoSoSjkkJkJwYSpSpSpSpSpSpSpUBUBUBUBUBUBUBUBUBUBgDQZUBUBSpSpjyfCoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBUBUBETETETETETETETETETETUBUBSpSpSpQooSoSoSoSoSoSoSjkkJkJkJkJwYSpSpSpSpUBUBUBUBAsUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYSpSpUBUBETETETETETETETETUBUBUBUBSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpUBUBUBUBUBUBUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBUBETETETETETETETUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkwYSpSpUBUBUBUBUBUBUBUBAsUBfOSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpUBUBUBETETETUBUBUBUBUBUBfOSpSpSpQooSoSoSoSoSWbAIAIAIAIAIdZoSoSoSoSjkwYSpSpUBUBUBUBfOUBUBUBUBUBSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoScqSpSpUBUBUBUBUBUBUBUBUBfOUBUBSpSpSpjyfCoSoSoSWbAIvySpSpSpSpSpcRdZoSoSoSoScqSpSpSpSpSpSpQZUBUBUBUBSpSpSpQooSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoScqSpSpUBUBUBUBUBUBUBUBUBQZUBUBSpSpjyfCoSoSoSWbvySpSpSpSpSpSpSpSpcRdZoSoSoSjkwYSpSpSpSpSpSpSpSpSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoScqSpNYSpUBUBUBUBUBUBUBUBUBgDSpSpjyfCoSoSoSoScqSpSpHNeISpSpSpNYSpSpcRdZoSoSoSjkkJkJkJwYSpSpSpSpSpSpjykJfCoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSjkwYSpSpUBUBUBUBgDUBUBUBUBSpSpSpQooSoSoSoSoSjkwYSpSpSpSpNYTBSpHNSpSpcRAIdZoSoSoSoSoSjkkJkJkJkJkJkJfCoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYSpSpUBUBUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSjkkJwYSpSpSpSpSpSpSpSpSpSpcRAIdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpNYUBUBUBUBUBSpSpSpjyfCoSoSoSoSoSoSoSoSoSjkkJkJkJwYSpSpTBSpeISpSpSpcRdZoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYHNSpSpSpSpSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSjkkJwYSpSpSpSpSpSpjyfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoScqSpSpSpSpSpSpSpjykJfCoSoSoSoSoSfHfHfHoSoSoSoSoSoSoSoSoSjkwYSpSpSpSpSpQooSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkwYSpSpSpSpSpSpQooSoSoSoSoSfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSjkkJkJkJkJkJfCoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSjkkJkJkJkJkJkJfCoSoSoSfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSoSfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTLtfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHfHXT -XTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXTXT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +"} +(2,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(3,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(4,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(5,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(6,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(7,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(8,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(9,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(10,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(11,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(12,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(13,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(14,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +cq +cq +cq +cq +cq +cq +cq +cq +cq +cq +cq +cq +cq +cq +jk +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(15,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +NY +Sp +Sp +Sp +Sp +Sp +Sp +wY +cq +cq +cq +jk +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(16,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +Wb +cq +cq +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(17,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +ZX +ZX +ZX +ZX +UB +UB +UB +UB +UB +gD +UB +UB +Sp +Sp +NY +Sp +Sp +wY +cq +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(18,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +UB +UB +UB +UB +UB +QZ +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(19,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +Sp +UB +ET +ET +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +UB +UB +UB +Sp +Sp +eI +Sp +wY +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(20,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +Sp +UB +ET +ET +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(21,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(22,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +fO +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(23,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +ET +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +UB +HN +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(24,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +ET +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(25,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(26,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +UB +ET +ET +ET +ET +ZX +ZX +ZX +Rs +Rs +Rs +Rs +Rs +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +UB +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(27,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +cq +cq +vy +Sp +Sp +Sp +Sp +UB +ET +ET +ET +ET +ET +ZX +ZX +ZX +Rs +oI +Aq +Dt +ah +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +UB +Sp +Sp +wY +cq +cq +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(28,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +Wb +cq +cq +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +ET +ET +ET +ET +ET +ET +ZX +ZX +ZX +Rs +xc +JB +IZ +KH +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +UB +Sp +Sp +Sp +Sp +Sp +wY +cq +cq +cq +cq +jk +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(29,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +ET +ET +ET +ET +ET +ET +ET +ZX +ZX +ZX +ZX +Rs +kx +vx +Jd +KH +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +wY +cq +cq +cq +cq +cq +jk +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(30,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +eI +Sp +Sp +UB +QZ +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +Rs +KH +Xw +ah +KH +Rs +Rs +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +ET +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +wY +cq +cq +cq +cq +cq +jk +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(31,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +UB +UB +fO +UB +UB +ET +ET +ET +ET +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Rs +Rs +KH +KH +KH +KH +lJ +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(32,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +AI +Sp +NY +UB +UB +As +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Rs +zX +ah +KH +KH +Xl +vN +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +NY +Sp +wY +cq +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(33,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +HN +Sp +UB +UB +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Rs +VD +ah +so +KH +Mr +vN +Rs +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +wY +cq +jk +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(34,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +fO +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Rs +jo +KH +KH +KH +Th +Po +Rs +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +HN +Sp +wY +jk +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(35,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Rs +Rs +Rs +WS +WS +Rs +Rs +Rs +ZX +ZX +ZX +xZ +xZ +xZ +xZ +xZ +xZ +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +NY +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(36,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +xZ +ZX +ZX +ZX +ZX +ZX +xZ +xZ +ZZ +xZ +xZ +xZ +xZ +xZ +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(37,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +SG +xZ +xZ +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +xZ +xZ +ZZ +xZ +xZ +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(38,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +ZX +ZX +ZX +ZX +xZ +xZ +SG +xZ +xZ +xZ +ZZ +ZZ +xZ +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +gD +UB +UB +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(39,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +Wb +cq +cq +cq +cq +cq +cq +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +SG +xZ +ZX +ZX +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +ZX +ZX +ZX +ZX +ZX +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(40,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +Sp +Sp +wY +cq +cq +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +fO +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +yc +xZ +xZ +ZZ +xZ +xZ +xZ +ww +xZ +xZ +xZ +SG +xZ +ZX +ZX +ZX +ZX +ZX +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(41,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +Wb +cq +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +yc +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +ZX +ZX +ZX +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +jy +Qo +fC +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(42,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +UB +gD +QZ +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +xZ +xZ +xZ +ZZ +xZ +xZ +xZ +xZ +xZ +iM +ZX +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +fO +QZ +UB +UB +Sp +Sp +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(43,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +ZZ +xZ +xZ +xZ +xZ +xZ +xZ +mr +Fr +Em +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +gD +Sp +Sp +Sp +jy +fC +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(44,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +xZ +Fr +Em +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +Sp +jy +fC +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(45,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +NY +UB +UB +UB +gD +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +SG +xZ +xZ +ZZ +xZ +ZX +ZX +iM +Fr +Em +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +fO +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(46,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +xZ +xZ +xZ +ZX +ZX +ZX +ZX +Em +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +Sp +jy +Qo +fC +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(47,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +Sp +wY +cq +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +UB +UB +fO +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(48,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +AI +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(49,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +Wb +vy +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +QZ +Sp +Sp +Sp +Sp +Sp +jy +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(50,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +Wb +vy +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +Qo +Qo +cR +Sp +Sp +Sp +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +UB +UB +gD +Sp +Sp +Sp +Sp +jy +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(51,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +AI +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ET +ET +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +UB +UB +UB +Sp +Sp +jy +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(52,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +AI +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +UB +ZX +ZX +ZX +ET +ET +ET +ET +ET +ZX +ZX +ZX +ZX +ZX +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +UB +UB +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +Wb +cq +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(53,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +AI +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ZX +ZX +ZX +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +wY +jk +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(54,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +AI +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +UB +UB +Sp +Sp +wY +cq +jk +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(55,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +dZ +cR +Sp +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +ET +ET +ET +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +UB +UB +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +Wb +vy +Sp +HN +Sp +wY +jk +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(56,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +ET +ET +ET +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +UB +UB +UB +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +AI +Sp +Sp +eI +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(57,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +Sp +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +UB +UB +UB +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +AI +Sp +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(58,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +cq +vy +Sp +Sp +Sp +Sp +UB +UB +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +fO +UB +UB +Sp +Sp +wY +jk +oS +oS +AI +Sp +Sp +Sp +NY +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(59,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +dZ +Qo +Qo +cR +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +UB +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +cq +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +AI +Sp +Sp +Sp +TB +Sp +wY +jk +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(60,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +AI +Sp +Sp +NY +Sp +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(61,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +Sp +Sp +Sp +Sp +jy +Qo +fC +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +dZ +cR +Sp +Sp +HN +Sp +Sp +wY +jk +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(62,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +ZX +Sp +jy +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +dZ +cR +Sp +Sp +Sp +TB +Sp +wY +jk +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(63,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +AI +Sp +Sp +UB +UB +Sp +Sp +Sp +UB +UB +Sp +ZX +ZX +ZX +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +HN +Sp +wY +jk +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(64,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +AI +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +UB +UB +fO +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +gD +Sp +Sp +kJ +oS +oS +oS +oS +dZ +cR +Sp +eI +Sp +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(65,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +dZ +cR +Sp +Sp +Sp +Sp +jy +cR +Sp +Sp +jy +Qo +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +QZ +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +AI +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(66,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +dZ +cR +Sp +Sp +jy +fC +dZ +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +eI +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +wY +jk +oS +oS +oS +dZ +cR +Sp +Sp +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(67,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +dZ +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +wY +cq +jk +oS +oS +AI +Sp +Sp +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(68,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +UB +UB +UB +UB +UB +ue +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +As +UB +UB +UB +Sp +Sp +Sp +Sp +wY +jk +oS +dZ +cR +jy +Qo +fC +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(69,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +gD +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +dZ +fC +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(70,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +As +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(71,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +eI +Sp +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(72,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +fO +UB +UB +As +UB +UB +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(73,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(74,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +Sp +gC +UB +UB +UB +gD +UB +UB +UB +ET +ET +ET +ET +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +fO +QZ +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(75,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +fO +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(76,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +Sp +UB +UB +fO +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +Qo +cR +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +gD +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(77,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +QZ +UB +UB +UB +UB +UB +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +Sp +jy +Qo +cR +Sp +Sp +Sp +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +Qo +fC +oS +dZ +Qo +cR +Sp +Sp +Sp +UB +UB +UB +gD +UB +UB +UB +UB +UB +UB +UB +QZ +UB +UB +As +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(78,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +jy +fC +oS +dZ +cR +Sp +Sp +UB +UB +Sp +Sp +jy +Qo +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(79,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +jy +fC +oS +oS +oS +AI +Sp +Sp +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +fO +UB +UB +UB +UB +UB +fO +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(80,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +AI +Sp +Sp +fO +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +UB +UB +UB +As +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(81,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +vy +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(82,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +AI +Sp +gC +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +Qo +Qo +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(83,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(84,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +Qo +Qo +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(85,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +NY +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(86,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +ET +ET +ET +ET +Em +ET +ET +ET +sF +Em +sF +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +HN +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(87,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +UB +UB +ET +ET +ET +ET +ET +Em +Em +ET +sF +sF +Em +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +Wb +vy +NY +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(88,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +UB +ET +ET +ET +ET +ET +Em +Em +Em +sF +sF +Em +KH +mV +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +gC +Sp +Sp +wY +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(89,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +Wb +cq +cq +vy +Sp +Sp +Sp +UB +ET +ET +ET +ET +ET +ET +Em +Em +Em +Em +sF +Em +KH +KH +Hg +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(90,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +Wb +cq +cq +vy +Sp +Sp +Sp +Sp +Sp +ET +ET +ET +ET +ET +ET +ET +FK +yd +KH +mV +ju +sF +KH +KH +uL +ju +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +eI +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(91,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +ET +ET +ET +ET +ET +ET +ET +ET +yd +yd +oY +Gy +yd +sF +sF +KH +Em +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +Wb +vy +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(92,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +TB +Sp +Sp +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +sF +yd +yd +MM +Cd +yd +sF +sF +Em +Em +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +Sp +Sp +Sp +NY +HN +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(93,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +ET +sF +sF +yd +NH +Ft +KH +rS +sF +Em +Em +Em +Em +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +NY +gC +Sp +Sp +Sp +Sp +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(94,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +UB +ET +ET +ET +ET +ET +ET +sF +sF +sF +ju +KH +vT +kj +pX +sF +Em +Em +KH +Em +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(95,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +ue +UB +UB +ET +ET +ET +ET +ET +ET +sF +sF +sF +yd +YN +Jr +OJ +sF +sF +Em +Em +KH +Em +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +NY +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(96,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +UB +UB +ET +ET +ET +ET +ET +ET +sF +sF +sF +sF +sF +Xx +wp +Od +sF +sF +Em +KH +KH +KH +yd +Em +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +jy +fC +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(97,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +UB +ET +ET +ET +ET +ET +ET +sF +sF +Em +sF +sF +sF +sF +aj +sF +sF +Hx +mA +up +yd +yd +yd +qQ +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +cR +kJ +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(98,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +ET +ET +ET +ET +ET +ET +sF +Em +Em +sF +sF +sF +Em +sF +sF +sF +Em +YD +ah +yd +aj +yd +yd +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +Wb +jk +oS +oS +dZ +fC +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(99,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +ET +ET +ET +ET +ET +ET +sF +Em +Em +sF +hC +sF +Em +sF +hC +sF +Em +KH +yd +yd +yw +sk +yd +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +Wb +vy +wY +jk +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(100,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +ET +ET +ET +ET +ET +ET +Em +Em +Em +sF +sF +sF +Em +sF +sF +Em +Em +KH +PI +eQ +KH +Uk +ju +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +NY +Sp +wY +jk +oS +oS +oS +oS +oS +Wb +vy +HN +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(101,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +ET +ET +ET +ET +ET +ET +yd +KH +Em +Em +sF +KH +Em +Em +sF +Em +KH +Gv +OR +yd +Uk +jH +ju +Em +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +AI +Sp +eI +Sp +kJ +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(102,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +ET +ET +ET +ET +ET +sF +yd +KH +uL +yd +sF +sF +Em +yd +KH +Em +KH +GX +Sk +yd +KH +aj +yd +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +QZ +Sp +Sp +wY +jk +oS +oS +oS +oS +AI +Sp +jy +Qo +fC +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(103,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +ET +ET +ET +ET +ET +sF +yd +xe +Uk +nL +sF +KH +Em +yd +sF +Em +KH +ah +Uu +yd +Uk +jH +yd +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +wY +cq +jk +oS +oS +dZ +Qo +fC +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(104,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +ET +ET +ET +ET +sF +yd +aj +Uk +yd +sF +Em +Em +yd +sF +KH +KH +Km +Xo +yd +Cx +DJ +Hg +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +fO +UB +Sp +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(105,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +ET +ET +ET +ET +sF +yd +KH +Uk +yd +sF +Em +ju +yd +sF +KH +KH +ey +tG +yd +oB +MI +yd +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +NY +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(106,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +ET +ET +ET +ET +sF +yd +jH +Uk +yd +sF +Em +Em +Em +sF +KH +KH +yn +Ve +yd +kQ +yd +yd +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(107,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +ET +ET +ET +ET +sF +yd +Em +KH +Em +FP +sF +Em +Em +sF +sF +KH +tO +tO +rN +AE +mt +Af +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +wY +jk +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(108,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +ET +ET +ET +ET +Em +Em +Em +sF +sF +sF +Em +ju +sF +sF +sF +tO +rd +rN +Yj +Yj +Xf +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +UB +UB +fO +UB +UB +ue +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(109,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +ET +ET +ET +ET +ET +Em +sF +sF +yd +sF +Em +sF +yd +sF +sF +SC +yd +yd +yd +yd +yd +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +QZ +Sp +Sp +kJ +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(110,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +ET +ET +ET +ET +ET +sF +sF +yd +XJ +sF +sF +yd +Em +sF +Ht +yd +Qx +MO +yd +gu +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +fO +Sp +Sp +kJ +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(111,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +UB +ET +ET +ET +ET +ET +sF +yd +yd +sF +Em +KH +sF +Em +sF +sF +QK +WJ +ks +nV +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +ue +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(112,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +ET +ET +ET +ET +ET +sF +sF +sF +Em +sF +Em +Em +sF +Em +KH +KH +bE +yd +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(113,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +AI +Sp +Sp +fO +UB +UB +UB +UB +ET +ET +ET +ET +hC +sF +Em +Em +Em +Em +Em +Em +Em +KH +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +gD +UB +Sp +Sp +Sp +kJ +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(114,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +UB +UB +ET +ET +ET +sF +sF +Em +Em +bR +Em +Em +Em +Em +sF +sF +sF +sF +xM +sF +sF +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(115,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +Em +Em +KH +KH +xf +yd +KH +Em +sF +TR +RJ +RJ +Vs +sF +sF +sF +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(116,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +UB +UB +ET +ET +ET +ET +KH +Uy +HY +pB +DW +Mm +WJ +KH +sF +sF +sF +sF +mp +sF +sF +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +jy +Qo +fC +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(117,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +UB +gD +UB +UB +UB +UB +ET +ET +ET +yd +Ss +Cw +yd +tO +bh +yd +Cw +sF +sF +sF +sF +sF +XA +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +Sp +Sp +Sp +jy +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(118,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +Sp +QZ +UB +UB +UB +UB +UB +ET +ET +yd +yd +yd +yd +xU +oe +yd +yd +ET +ET +ET +ET +ET +XA +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(119,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +dZ +cR +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +ET +ET +ET +yd +TW +hj +qf +wo +yd +ET +ET +ET +ET +ET +im +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(120,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +ET +ET +en +jJ +kk +KH +xS +cA +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(121,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +AI +Sp +Sp +Sp +UB +UB +fO +QZ +UB +UB +UB +UB +UB +en +TQ +FX +cK +jX +cA +ET +ET +ET +ET +UB +UB +ET +ET +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +kJ +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(122,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +dZ +cR +eI +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +Wm +Pd +pJ +pJ +Pd +gV +ET +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(123,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +dZ +cR +Sp +Sp +gC +Sp +UB +UB +UB +UB +UB +UB +UB +Wm +HH +HH +gV +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +jy +Qo +fC +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(124,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +dZ +cR +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +fC +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(125,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +dZ +Qo +cR +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +UB +UB +UB +UB +UB +UB +UB +UB +UB +UB +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(126,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +dZ +Qo +Qo +Qo +Qo +Qo +cR +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +Qo +Qo +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(127,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +Qo +cR +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +Sp +jy +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(128,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +dZ +Qo +Qo +Qo +Qo +Qo +Qo +Qo +Qo +Qo +Qo +Qo +fC +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(129,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(130,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(131,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(132,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(133,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +oS +oS +oS +oS +oS +oS +oS +oS +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(134,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(135,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(136,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(137,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(138,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(139,1,1) = {" +XT +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +fH +XT +"} +(140,1,1) = {" +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT +XT "} diff --git a/maps/gateway_vr/snowfield.dmm b/maps/gateway_vr/snowfield.dmm index 1912a56992..f99eb69984 100644 --- a/maps/gateway_vr/snowfield.dmm +++ b/maps/gateway_vr/snowfield.dmm @@ -1642,14 +1642,6 @@ temperature = 243.15 }, /area/awaymission/snowfield/restricted) -"Bw" = ( -/obj/effect/overmap/visitable/sector/common_gateway/snowfield, -/turf/simulated/floor/outdoors/snow{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, -/area/awaymission/snowfield/restricted) (1,1,1) = {" aa @@ -1932,7 +1924,7 @@ ab ab ab ab -Bw +ab aa "} (3,1,1) = {" diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index 8f08ec212b..f86e2d484b 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -1174,10 +1174,6 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) -"sl" = ( -/obj/effect/overmap/visitable/sector/common_gateway/arynthilake, -/turf/simulated/mineral/ignore_cavegen/cave, -/area/gateway/arynthilake/caves) "sA" = ( /obj/structure/table/rack/steel, /obj/item/clothing/shoes/flats/blue, @@ -1343,9 +1339,11 @@ /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/gateway/arynthilake/dome) "wm" = ( -/obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/floor/tiled/eris/dark/brown_platform, -/area/gateway/arynthilake/dome) +/obj/random/mob/semirandom_mob_spawner/monster/c, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, +/area/gateway/arynthilake/caves) "wq" = ( /obj/random/mob/semirandom_mob_spawner/animal/c, /turf/simulated/floor/outdoors/grass, @@ -2050,8 +2048,8 @@ /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "NK" = ( -/obj/random/mob/semirandom_mob_spawner/monster/e, -/turf/simulated/floor/beach/sand/desert, +/obj/random/mob/semirandom_mob_spawner/monster/d, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "Oc" = ( /obj/structure/table/marble, @@ -2945,7 +2943,7 @@ Qr Qr Qr Qr -sl +Qr aa "} (4,1,1) = {" @@ -3322,7 +3320,7 @@ jI jI jI jI -We +jI jI jI jI @@ -5056,7 +5054,7 @@ aG ap aI ap -NK +aG aG Qr Qr @@ -5193,7 +5191,7 @@ jI jI jI Qr -We +jI aG ap ap @@ -5799,7 +5797,7 @@ an an aZ bc -wm +bc bc tS yY @@ -15471,7 +15469,7 @@ Qr jI jI gu -gu +wm gu gu jI @@ -17480,7 +17478,7 @@ Qr Qr jI jI -jI +NK jI jI jI @@ -19476,7 +19474,7 @@ jI au jI jI -jI +NK Qr Qr Qr @@ -20291,7 +20289,7 @@ QI yb nx FW -FW +ek jz ag al @@ -20427,7 +20425,7 @@ se jK ag FW -ek +FW WV FW FW diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index 5538a63096..ebc411fec0 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -131,6 +131,7 @@ /obj/structure/bed/chair/comfy/brown{ dir = 8 }, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/tiled/eris/white/brown_platform{ outdoors = 1 }, @@ -207,9 +208,9 @@ }, /area/gateway/arynthilake/dome) "dC" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/tiled/eris/white/techfloor, -/area/gateway/arynthilake/dome) +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/outdoors/grass, +/area/gateway/arynthilake) "dR" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/reagent_containers/food/condiment/enzyme{ @@ -314,10 +315,6 @@ outdoors = 1 }, /area/gateway/arynthilake/dome) -"fC" = ( -/obj/effect/overmap/visitable/sector/common_gateway/arynthilake, -/turf/simulated/mineral/ignore_cavegen/cave, -/area/gateway/arynthilake/caves) "fX" = ( /obj/structure/table/standard{ color = "#b8e4ff" @@ -413,7 +410,7 @@ /turf/simulated/floor/outdoors/grass, /area/gateway/arynthilake/engine) "hP" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/gateway/arynthilake/dome) "hR" = ( @@ -557,6 +554,7 @@ /obj/structure/bed/chair/comfy/brown{ dir = 4 }, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "ku" = ( @@ -589,9 +587,9 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/gateway/arynthilake/dome) "lk" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/tiled/eris/white/brown_platform, -/area/gateway/arynthilake/dome) +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/outdoors/grass/forest, +/area/gateway/arynthilake) "ll" = ( /turf/simulated/floor/wood/sif, /area/gateway/arynthilake/oldcabin) @@ -673,9 +671,9 @@ /turf/simulated/floor/tiled/eris/dark/monofloor, /area/gateway/arynthilake/dome) "mv" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/tiled/eris, -/area/gateway/arynthilake/engine) +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/outdoors/grass/forest, +/area/gateway/arynthilake/dome) "mx" = ( /obj/machinery/light, /turf/simulated/floor/carpet, @@ -718,6 +716,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "nB" = ( @@ -810,7 +809,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/random/mob/semirandom_mob_spawner/monster, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "pa" = ( @@ -1005,8 +1003,8 @@ }, /area/gateway/arynthilake/dome) "uj" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/carpet/sblucarpet, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/carpet, /area/gateway/arynthilake/dome) "um" = ( /obj/machinery/light{ @@ -1119,11 +1117,9 @@ /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "xj" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/tiled/eris{ - outdoors = 1 - }, -/area/gateway/arynthilake/engine) +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/outdoors/newdirt, +/area/gateway/arynthilake) "xk" = ( /obj/machinery/light/small{ dir = 1 @@ -1140,8 +1136,8 @@ /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) "xr" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/carpet, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/outdoors/sidewalk/side, /area/gateway/arynthilake/dome) "xz" = ( /obj/machinery/seed_extractor, @@ -1202,9 +1198,10 @@ }, /area/gateway/arynthilake) "zk" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/outdoors/grass/forest, -/area/gateway/arynthilake) +/obj/structure/table/bench/marble, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/tiled/eris/white/techfloor, +/area/gateway/arynthilake/dome) "zo" = ( /turf/simulated/floor/outdoors/sidewalk/slab, /area/gateway/arynthilake/dome) @@ -1256,6 +1253,7 @@ dir = 1 }, /obj/structure/bed/chair/sofa/brown, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/carpet, /area/gateway/arynthilake/dome) "AI" = ( @@ -1375,8 +1373,8 @@ }, /area/gateway/arynthilake/dome) "EG" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/outdoors/grass/forest, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) "EP" = ( /obj/machinery/door/airlock/sandstone{ @@ -2082,6 +2080,7 @@ /area/gateway/arynthilake/dome) "Sc" = ( /obj/structure/bed/chair/office/light, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/gateway/arynthilake/dome) "Si" = ( @@ -2097,7 +2096,6 @@ req_access = list(); start_charge = 0 }, -/obj/random/mob/semirandom_mob_spawner/monster, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/underground/maintenance) "Sq" = ( @@ -2107,8 +2105,9 @@ /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "Sr" = ( -/obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/floor/outdoors/grass, +/obj/item/weapon/stool/padded, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, +/turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "St" = ( /obj/structure/table/rack, @@ -2267,7 +2266,7 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/random/mob/semirandom_mob_spawner/humanoid, +/obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "Vm" = ( @@ -2441,7 +2440,7 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/arynthilake/gateway) "Zg" = ( -/obj/random/mob/semirandom_mob_spawner/robot, +/obj/random/mob/semirandom_mob_spawner/robot/retaliate, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "Zn" = ( @@ -2919,7 +2918,7 @@ ek ek ek ek -fC +ek nF "} (4,1,1) = {" @@ -4493,7 +4492,7 @@ ek ek fs St -mv +nk nk mX Ui @@ -4503,7 +4502,7 @@ nB ZE mX nk -mv +ZY SP fs sP @@ -5770,7 +5769,7 @@ Vo Vo Vo fs -xj +uI nk nk nk @@ -5922,7 +5921,7 @@ Zg nk nk rj -xj +uI fs nd fs @@ -6805,7 +6804,7 @@ ek ek Hw Hw -Uq +Hw ek ek ek @@ -6911,7 +6910,7 @@ Oo sP sP sP -sP +dC Vo CD Vo @@ -7376,7 +7375,7 @@ Hw Hw Hw Hw -Uq +Hw Hw ek ek @@ -9055,7 +9054,7 @@ ek ek ek pS -LR +Hw Hw Hw Hw @@ -10044,7 +10043,7 @@ ek ek Hw Hw -LR +Hw Hw ek ek @@ -13509,7 +13508,7 @@ CD CD CD Vo -Oo +Vo CD Vo CD @@ -14307,7 +14306,7 @@ xW yv hl CD -CD +xj Vo Vo Vo @@ -14472,7 +14471,7 @@ Vo Vo Vo Vo -CD +xj CD Vo Vo @@ -15574,7 +15573,7 @@ Vo Vo Vo Vo -zk +Vo Vo Vo Vo @@ -15858,7 +15857,7 @@ Vo Vo Vo Vo -Vo +lk Vo Vo sP @@ -15890,7 +15889,7 @@ Vo Vo Vo Vo -Vo +lk Vo Vo Vo @@ -16296,7 +16295,7 @@ lQ lQ lQ lQ -EG +lQ lQ nC iG @@ -16602,7 +16601,7 @@ Ia sP sP Vo -zk +Vo Vo Vo Vo @@ -16731,7 +16730,7 @@ lQ hH Dy vv -xr +vv vv Ty Ia @@ -17155,7 +17154,7 @@ zo nC nC nC -Sr +nC nC iG ng @@ -18002,7 +18001,7 @@ lQ lQ lQ nC -iG +xr zo iG Ky @@ -18011,7 +18010,7 @@ cu cu zU BH -BH +EG nT BH Dk @@ -18417,7 +18416,7 @@ tC Ia lQ lQ -lQ +mv lQ hH Ft @@ -18572,7 +18571,7 @@ lQ nC iG zo -iG +xr nC nC hH @@ -18590,7 +18589,7 @@ lF PF bw MJ -PF +Sr eT hH nC @@ -19501,7 +19500,7 @@ ek ek ek Hw -Ta +rz rz rz Hw @@ -19656,7 +19655,7 @@ ek rz rz rz -Ta +rz ek ek ek @@ -19844,7 +19843,7 @@ NI NI NI NI -lk +NI Kw Ia lQ @@ -20221,7 +20220,7 @@ Hw ek ek rz -Ta +rz rz rz ek @@ -20274,7 +20273,7 @@ nC nC nC nC -Sr +nC iG nC nC @@ -20835,9 +20834,9 @@ nC hH nH vv +uj vv vv -xr mx hH hH @@ -20850,7 +20849,7 @@ hH AO sA sA -uj +sA sA sA HK @@ -21048,7 +21047,7 @@ rz Hw Hw Hw -NX +Hw Hw Hw Hw @@ -21119,7 +21118,7 @@ Qm Qm vv vS -xr +vv vv vv vv @@ -21176,7 +21175,7 @@ zI zI zI zI -gB +zI zI Jn zI @@ -21269,7 +21268,7 @@ Dk TY TY TY -dC +TY TY TY Dk @@ -21327,7 +21326,7 @@ Hw rz rz rz -Ta +rz rz rz rz @@ -21467,7 +21466,7 @@ mc Hw Hw Hw -NX +Hw rz rz rz @@ -21552,7 +21551,7 @@ cL hH Py CY -Pn +zk Pn gT Yh @@ -21763,7 +21762,7 @@ ek Hw Hw Hw -NX +Hw Hw Hw Hw diff --git a/maps/gateway_vr/variable/arynthilakeunderground_a.dmm b/maps/gateway_vr/variable/arynthilakeunderground_a.dmm index 9c1e9f7982..5fbf117bbd 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_a.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_a.dmm @@ -112,7 +112,7 @@ /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) "mj" = ( -/obj/random/mob/semirandom_mob_spawner/monster, +/obj/random/mob/semirandom_mob_spawner/monster/d, /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "mV" = ( @@ -129,6 +129,7 @@ /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "oM" = ( +/obj/random/mob/semirandom_mob_spawner/monster, /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "pT" = ( @@ -136,9 +137,9 @@ /turf/simulated/floor/tiled/eris/steel/monofloor, /area/gateway/arynthilake/engine) "qe" = ( -/obj/random/mob/semirandom_mob_spawner/monster/b, -/turf/simulated/floor/tiled/eris/techmaint, -/area/gateway/arynthilake/engine) +/obj/random/mob/semirandom_mob_spawner/monster/c, +/turf/simulated/floor/plating/eris/under, +/area/gateway/arynthilake/underground/maintenance) "qp" = ( /obj/structure/table/rack/shelf/steel, /obj/random/tool, @@ -238,10 +239,6 @@ "BN" = ( /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) -"Cj" = ( -/obj/random/mob/semirandom_mob_spawner/robot/retaliate, -/turf/simulated/floor/tiled/eris/steel/orangecorner, -/area/gateway/arynthilake/engine) "CE" = ( /obj/machinery/light/small{ dir = 1 @@ -335,10 +332,6 @@ }, /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) -"Rh" = ( -/obj/random/mob/semirandom_mob_spawner/monster/c, -/turf/simulated/floor/plating/eris/under, -/area/gateway/arynthilake/underground/maintenance) "Sg" = ( /turf/simulated/floor/tiled/eris/techmaint, /area/gateway/arynthilake/engine) @@ -377,10 +370,6 @@ /obj/random/mob/semirandom_mob_spawner/monster/b, /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) -"YC" = ( -/obj/random/mob/semirandom_mob_spawner/monster/d, -/turf/simulated/mineral/floor/ignore_cavegen/cave, -/area/gateway/arynthilake/underground) "ZY" = ( /obj/structure/table/rack/shelf/steel, /obj/item/weapon/cell/void, @@ -891,9 +880,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -1033,9 +1022,9 @@ Vm Vm Vm Vm -oM +LF qX -oM +LF Vm gh gh @@ -1110,18 +1099,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh @@ -1130,54 +1119,54 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -mj -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -1196,7 +1185,7 @@ gh gh nO nO -YC +nO nO nO nO @@ -1222,7 +1211,7 @@ gh gh gh gh -Bj +nO nO nO nO @@ -1252,18 +1241,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -1272,54 +1261,54 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -mj -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF Vm gh gh @@ -1376,7 +1365,7 @@ gh gh nO nO -Bj +nO nO nO nO @@ -1394,18 +1383,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -1414,54 +1403,54 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF zL -mj +LF Vm gh gh @@ -1519,7 +1508,7 @@ nO nO nO nO -nO +Bj nO nO nO @@ -1536,44 +1525,44 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -1583,18 +1572,18 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -1663,7 +1652,7 @@ nO nO nO nO -Bj +nO nO gh gh @@ -1678,65 +1667,65 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -1820,65 +1809,65 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF BJ -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -1962,26 +1951,26 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -mj -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -1989,47 +1978,47 @@ Vm gh gh Vm -oM +LF qX -oM +LF Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -2054,7 +2043,7 @@ nO nO nO nO -YC +nO nO gh gh @@ -2104,26 +2093,26 @@ gh gh gh Vm +LF +LF +LF +LF +LF +LF oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF qX Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -2131,47 +2120,47 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM +LF BJ -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF nO nO gh @@ -2226,7 +2215,7 @@ nO gh gh nO -Bj +nO nO nO nO @@ -2246,26 +2235,26 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -2281,39 +2270,39 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF nO nO nO @@ -2388,26 +2377,26 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm ly -oM -oM +LF +LF Vm gh gh @@ -2423,39 +2412,39 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF BJ -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF nO nO nO @@ -2530,26 +2519,26 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh nO gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -2565,39 +2554,39 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF nO nO nO @@ -2672,26 +2661,26 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm nO Vm -oM -oM -oM +LF +LF +LF Vm gh Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -2707,9 +2696,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -2719,28 +2708,28 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -nO +LF +LF +LF +Bj nO nO nO @@ -2814,74 +2803,74 @@ gh gh gh Vm -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF lz Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM +LF +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Ek -oM +LF Vm Vm Vm -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF nO gh nO @@ -2909,7 +2898,7 @@ gh gh gh gh -Bj +nO nO gh gh @@ -2957,73 +2946,73 @@ gh gh Vm ly -oM -oM +LF +LF qX -oM +LF MV Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -mj -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX Vm gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -mj +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF nO gh gh @@ -3062,7 +3051,7 @@ nO nO nO nO -nO +Bj nO nO LY @@ -3098,65 +3087,65 @@ gh gh gh Vm -oM -mj -oM -oM -oM +LF +LF +LF +LF +LF lz Vm nO Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -3164,8 +3153,8 @@ gh gh Vm ly -oM -oM +LF +LF nO gh gh @@ -3240,33 +3229,33 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -3275,15 +3264,15 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm @@ -3305,9 +3294,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -3382,9 +3371,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO @@ -3392,23 +3381,23 @@ gh gh Vm ly -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -3417,15 +3406,15 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -mj -oM -oM +LF +LF +LF Vm gh gh @@ -3447,9 +3436,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -3524,33 +3513,33 @@ gh gh gh Vm -oM +LF qX -oM +LF Vm nO gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM +LF qX -oM +LF Vm Vm Vm @@ -3559,15 +3548,15 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM +LF qX -oM +LF Vm gh Vm @@ -3589,9 +3578,9 @@ Vm Vm Vm Vm -oM -mj -oM +LF +LF +LF Vm gh gh @@ -3675,9 +3664,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -3695,15 +3684,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -3713,27 +3702,27 @@ Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -3765,7 +3754,7 @@ gh gh gh nO -Bj +nO gh gh gh @@ -3817,9 +3806,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -3837,15 +3826,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -3855,27 +3844,27 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX -oM +LF Vm gh gh @@ -3929,7 +3918,7 @@ gh gh gh nO -Bj +nO nO nO nO @@ -3959,9 +3948,9 @@ Vm Vm Vm Vm -mj -oM -oM +LF +LF +LF Vm Vm Vm @@ -3979,15 +3968,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -3997,27 +3986,27 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -4088,42 +4077,42 @@ Ft gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF lz Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -4133,15 +4122,15 @@ Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -4157,18 +4146,18 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh -YC +nO nO nO nO @@ -4230,42 +4219,42 @@ Ft gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX -oM +LF MV Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -4275,15 +4264,15 @@ gh gh gh Vm -oM -oM -oM -mj -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -4299,15 +4288,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -4372,42 +4361,42 @@ Ft gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -mj -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF lz Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -4417,15 +4406,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -4441,15 +4430,15 @@ gh gh gh Vm -oM +LF zL -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -4514,9 +4503,9 @@ Ft gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -4547,21 +4536,21 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -4574,9 +4563,9 @@ gh gh gh Vm -oM +LF qX -oM +LF Vm gh gh @@ -4589,12 +4578,12 @@ Vm Vm Vm Vm -oM -mj -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm nO nO @@ -4633,7 +4622,7 @@ xh nO nO nO -Bj +nO nO gh gh @@ -4658,7 +4647,7 @@ gh Vm ly zh -oM +LF Vm gh gh @@ -4671,9 +4660,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -4691,19 +4680,19 @@ gh Vm ly oM -oM +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -4716,9 +4705,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -4731,12 +4720,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh nO @@ -4798,9 +4787,9 @@ Ft gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -4813,9 +4802,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -4831,21 +4820,21 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -4858,9 +4847,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -4873,12 +4862,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -4888,7 +4877,7 @@ nO nO nO nO -YC +nO nO nO nO @@ -4955,9 +4944,9 @@ gh gh gh Vm -oM -oM -oM +LF +mj +LF Vm gh gh @@ -4973,18 +4962,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -4992,17 +4981,17 @@ Vm gh Vm lz -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Ek -oM -oM -mj -oM +LF +LF +LF +LF Vm gh gh @@ -5018,9 +5007,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -5097,9 +5086,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -5115,18 +5104,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5134,15 +5123,15 @@ gh gh Vm MV -oM +LF qX -oM -mj -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF oM WN Vm @@ -5160,9 +5149,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -5196,7 +5185,7 @@ nO nO nO nO -Bj +nO nO nO nO @@ -5239,9 +5228,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -5257,18 +5246,18 @@ gh gh gh Vm -oM -mj -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5276,17 +5265,17 @@ gh gh Vm lz -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -5302,9 +5291,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -5378,15 +5367,15 @@ gh gh gh Vm -oM -oM -oM -oM -YB -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5399,15 +5388,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -5426,30 +5415,30 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5520,15 +5509,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5541,15 +5530,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5568,18 +5557,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5587,11 +5576,11 @@ gh gh Vm ly -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh @@ -5621,7 +5610,7 @@ nO nO nO nO -nO +Bj nO nO nO @@ -5662,15 +5651,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM +LF +LF +LF +LF zL -oM -oM -oM -oM +LF +LF +LF +LF Vm Vm Vm @@ -5683,15 +5672,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -5710,30 +5699,30 @@ Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5801,21 +5790,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5831,39 +5820,39 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -5873,9 +5862,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -5906,7 +5895,7 @@ xh nO nO nO -Bj +nO nO nO nO @@ -5943,21 +5932,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -5973,39 +5962,39 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -6015,9 +6004,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -6042,7 +6031,7 @@ nO nO nO nO -Bj +nO nO nO nO @@ -6060,7 +6049,7 @@ nO nO nO nO -Bj +nO nO nO nO @@ -6085,21 +6074,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -6115,51 +6104,51 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm +LF +LF +LF +Vm +Vm +Vm +Vm +Vm +Vm +Vm +Vm +Vm +LF oM -oM -oM -Vm -Vm -Vm -Vm -Vm -Vm -Vm -Vm -Vm -oM -oM -oM +LF Vm Vm Vm @@ -6227,9 +6216,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -6239,78 +6228,78 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM +LF Ek -oM +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -mj -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -6326,7 +6315,7 @@ gh gh nO nO -nO +Bj nO nO nO @@ -6369,9 +6358,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -6381,84 +6370,84 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +mj +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF BJ -oM +LF Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh nO -YC +nO nO nO nO @@ -6511,9 +6500,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -6523,78 +6512,78 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF sq -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF zL -oM +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -6647,15 +6636,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -6668,15 +6657,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -6689,27 +6678,27 @@ Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM +LF +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -6725,18 +6714,18 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -6789,15 +6778,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -6810,15 +6799,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF qX -oM +LF Vm gh gh @@ -6831,27 +6820,27 @@ gh gh gh Vm -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF BJ -oM -oM +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -6867,18 +6856,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -6931,15 +6920,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -6952,15 +6941,15 @@ gh gh gh Vm -oM -oM +LF +LF zL -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -6973,27 +6962,27 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM +LF +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7009,18 +6998,18 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -7054,7 +7043,7 @@ gh gh gh nO -Bj +nO nO nO gh @@ -7073,9 +7062,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -7100,12 +7089,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7115,27 +7104,27 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -7148,12 +7137,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7161,8 +7150,8 @@ gh gh Vm ly -oM -oM +LF +LF Vm gh gh @@ -7215,18 +7204,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7242,12 +7231,12 @@ gh gh nO Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7257,27 +7246,27 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF BJ -oM +LF Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -7290,21 +7279,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -7357,18 +7346,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM +LF +LF +LF +LF BJ -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -7384,12 +7373,12 @@ Vm Vm Vm Vm -oM +LF zL -oM -oM -oM -oM +LF +LF +LF +LF Vm Vm Vm @@ -7399,27 +7388,27 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -7432,21 +7421,21 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -7499,84 +7488,84 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -7586,12 +7575,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7641,71 +7630,71 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM +LF +LF BJ -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm nO gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX Vm gh Vm ly -oM -oM -oM -oM +LF +LF +LF +LF qX Vm gh @@ -7713,12 +7702,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7728,12 +7717,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -7742,7 +7731,7 @@ gh gh gh nO -Eb +nO nO gh gh @@ -7754,7 +7743,7 @@ nO nO nO nO -Bj +nO nO nO nO @@ -7783,84 +7772,84 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm nO gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM +LF +LF +LF +LF Vm gh Vm -oM -oM -mj -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM -oM +LF +LF +LF +LF zL -oM +LF Vm gh gh @@ -7870,12 +7859,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -7907,7 +7896,7 @@ gh gh gh gh -nO +Bj nO gh gh @@ -7925,31 +7914,31 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM +LF +LF +LF +LF BJ -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -7958,12 +7947,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -7973,9 +7962,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -7985,21 +7974,21 @@ Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -8015,17 +8004,17 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh nO -nO +Eb nO gh gh @@ -8067,31 +8056,31 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -8100,12 +8089,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -8115,9 +8104,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8127,21 +8116,21 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -8157,12 +8146,12 @@ Vm Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -8209,9 +8198,9 @@ gh gh gh Vm -YB -oM -oM +LF +LF +LF Vm Vm Vm @@ -8222,18 +8211,18 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -8242,12 +8231,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -8257,9 +8246,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8278,33 +8267,33 @@ gh gh gh Vm -oM -mj -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -8351,31 +8340,31 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -8387,21 +8376,21 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8420,9 +8409,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -8432,21 +8421,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8493,31 +8482,31 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -8529,21 +8518,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8562,9 +8551,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8574,21 +8563,21 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF BJ -oM -oM +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8635,31 +8624,31 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -8671,21 +8660,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -8704,9 +8693,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8716,27 +8705,27 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh nO -Eb +nO nO nO nO @@ -8777,9 +8766,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -8787,9 +8776,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -8799,9 +8788,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO @@ -8816,27 +8805,27 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -8846,9 +8835,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8858,21 +8847,21 @@ gh gh gh Vm -oM +LF BJ -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -8919,9 +8908,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8929,9 +8918,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -8941,9 +8930,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh nO @@ -8958,27 +8947,27 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -8988,9 +8977,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -9000,21 +8989,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -9061,9 +9050,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -9071,21 +9060,21 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh Vm -oM +LF qX -oM +LF Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -9100,26 +9089,26 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -mj +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF WN Vm gh @@ -9142,21 +9131,21 @@ Vm Vm gh Vm -oM -oM -oM +LF +LF +LF BJ -oM -oM +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -9203,9 +9192,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -9214,37 +9203,37 @@ Vm Vm Vm ly -oM -oM +LF +LF Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -9260,45 +9249,45 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -9325,7 +9314,7 @@ gh gh gh nO -Bj +nO nO gh gh @@ -9345,48 +9334,48 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -9402,45 +9391,45 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -9488,47 +9477,47 @@ gh gh Vm ly -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF qX Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -9550,21 +9539,21 @@ sq Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -9577,12 +9566,12 @@ Vm Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -9629,26 +9618,26 @@ gh gh gh Vm -oM -oM -oM -oM -YB -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +mj +LF Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF zL -oM +LF Vm Vm Vm @@ -9660,41 +9649,41 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -9704,12 +9693,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -9719,9 +9708,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -9777,9 +9766,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -9803,40 +9792,40 @@ gh gh Vm ly -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +mj +LF +LF +LF +LF +LF +LF +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm nO nO @@ -9846,12 +9835,12 @@ nO nO gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -9861,9 +9850,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -9944,41 +9933,41 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -9988,12 +9977,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -10004,8 +9993,8 @@ gh gh Vm ly -oM -oM +LF +LF Vm Vm Vm @@ -10061,9 +10050,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -10086,9 +10075,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -10133,33 +10122,33 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF nO nO gh @@ -10200,37 +10189,37 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -10254,9 +10243,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -10275,32 +10264,32 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF nO nO nO @@ -10342,37 +10331,37 @@ gh gh gh Vm -oM -oM -oM -oM -oM +LF +LF +LF +YB +LF qX Vm gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -10396,9 +10385,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -10417,33 +10406,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF nO nO nO -oM -oM -oM -oM +LF +LF +LF +LF nO nO nO @@ -10484,37 +10473,37 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -10532,15 +10521,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +YB +LF Vm gh gh @@ -10562,21 +10551,21 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm nO @@ -10626,9 +10615,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -10636,27 +10625,27 @@ Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -10674,24 +10663,24 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM +LF Ek -oM +LF Vm Vm Vm @@ -10704,21 +10693,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -10769,8 +10758,8 @@ gh gh Vm ly -oM -oM +LF +LF Vm gh gh @@ -10778,27 +10767,27 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -10816,29 +10805,29 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF lz Vm gh @@ -10846,21 +10835,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -10883,7 +10872,7 @@ gh gh nO nO -Eb +nO nO gh gh @@ -10910,9 +10899,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -10920,24 +10909,24 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -10952,15 +10941,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -10971,16 +10960,16 @@ Vm gh Vm qX -oM -oM -oM -YB -oM -oM -oM -oM +LF +LF +LF +qe +LF +LF +LF +LF qX -oM +LF MV Vm gh @@ -10991,21 +10980,21 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11014,7 +11003,7 @@ nO nO nO nO -Eb +nO nO gh gh @@ -11052,34 +11041,34 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm nO gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11094,14 +11083,14 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -YB +LF +LF +LF +LF +LF +LF +LF +LF WN Vm gh @@ -11112,17 +11101,17 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF lz Vm gh @@ -11133,21 +11122,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11157,7 +11146,7 @@ nO nO gh nO -nO +Eb gh gh gh @@ -11194,34 +11183,34 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh nO gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11236,15 +11225,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11257,9 +11246,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -11275,21 +11264,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11336,34 +11325,34 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh nO nO gh Vm -oM -YB -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11375,18 +11364,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11399,9 +11388,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11420,18 +11409,18 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11488,9 +11477,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11498,14 +11487,14 @@ nO nO Vm ly -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11517,18 +11506,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -11541,9 +11530,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11562,18 +11551,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11630,24 +11619,24 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11659,24 +11648,24 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -11684,17 +11673,17 @@ gh gh Vm ly -oM -oM +LF +LF Vm gh gh gh gh Vm -oM +LF qX -oM +LF Vm gh gh @@ -11704,18 +11693,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11772,8 +11761,8 @@ Vm Vm Vm Vm -oM -oM +LF +LF WN Vm gh @@ -11781,9 +11770,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -11801,42 +11790,42 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11846,18 +11835,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11901,31 +11890,31 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11943,42 +11932,42 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -11988,18 +11977,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -12043,31 +12032,31 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm @@ -12085,9 +12074,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -12100,27 +12089,27 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh @@ -12130,18 +12119,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -12185,51 +12174,51 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF BJ Vm gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -12242,27 +12231,27 @@ nO gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -12275,15 +12264,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -12327,9 +12316,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -12340,38 +12329,38 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm gh gh Vm ly -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh @@ -12384,27 +12373,27 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -12418,14 +12407,14 @@ gh gh Vm ly -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -12470,8 +12459,8 @@ gh gh Vm ly -oM -oM +mj +LF Vm gh gh @@ -12482,59 +12471,59 @@ gh gh gh Vm -oM +LF qX -oM -oM -oM -oM -oM -oM -YB -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm BJ -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh nO Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -12544,9 +12533,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -12559,15 +12548,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -12594,7 +12583,7 @@ gh gh nO nO -Eb +nO nO gh gh @@ -12611,9 +12600,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -12624,35 +12613,35 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -12662,21 +12651,21 @@ gh gh nO Vm -oM -YB -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX -oM +LF Vm gh gh @@ -12686,9 +12675,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -12701,9 +12690,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -12736,7 +12725,7 @@ gh gh nO nO -nO +Eb nO gh gh @@ -12753,48 +12742,48 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO nO @@ -12804,21 +12793,21 @@ nO nO nO Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -12828,9 +12817,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -12843,9 +12832,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -12860,7 +12849,7 @@ gh gh gh nO -Eb +nO nO xh nO @@ -12895,48 +12884,48 @@ gh gh gh Vm -YB -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF BJ Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO nO @@ -12946,9 +12935,9 @@ nO nO nO Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -12958,36 +12947,36 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -13005,7 +12994,7 @@ nO nO nO nO -Eb +nO nO gh nO @@ -13037,48 +13026,48 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh nO @@ -13088,9 +13077,9 @@ nO nO gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13100,36 +13089,36 @@ nO nO nO Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX -oM +LF Vm gh gh @@ -13192,8 +13181,8 @@ Vm Vm Vm Vm -oM -oM +LF +LF WN Vm gh @@ -13201,26 +13190,26 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO nO Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -13230,9 +13219,9 @@ nO gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13242,11 +13231,11 @@ nO nO nO Vm -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF WN Vm nO @@ -13254,24 +13243,24 @@ gh gh gh Vm -oM +LF zL -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -13334,35 +13323,35 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO nO gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -13372,9 +13361,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13387,9 +13376,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm nO nO @@ -13411,15 +13400,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -13476,35 +13465,35 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -13515,8 +13504,8 @@ gh gh Vm ly -oM -oM +LF +LF Vm gh gh @@ -13529,9 +13518,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm nO nO @@ -13553,15 +13542,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +qe +LF +LF +LF +LF Vm gh gh @@ -13603,33 +13592,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -13644,9 +13633,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13656,9 +13645,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13671,9 +13660,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -13695,15 +13684,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -13745,33 +13734,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX Vm gh Vm -oM -oM -oM +LF +LF +LF Vm nO gh @@ -13786,9 +13775,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13798,9 +13787,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13813,18 +13802,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh @@ -13837,18 +13826,18 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -13887,33 +13876,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -13928,9 +13917,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13940,9 +13929,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -13955,18 +13944,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX -oM +LF Vm gh gh @@ -13976,21 +13965,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14029,16 +14018,16 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -14053,12 +14042,12 @@ Vm Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14070,9 +14059,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14082,9 +14071,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -14097,18 +14086,18 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14118,21 +14107,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF WN Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14171,16 +14160,16 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14195,12 +14184,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14212,9 +14201,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -14224,33 +14213,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14260,21 +14249,21 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14313,16 +14302,16 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14337,12 +14326,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -14354,57 +14343,57 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh nO nO Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -14414,9 +14403,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14455,16 +14444,16 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO Vm -oM +LF qX -oM +LF Vm gh gh @@ -14482,12 +14471,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14497,35 +14486,35 @@ gh gh Vm ly -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh nO @@ -14541,12 +14530,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14556,9 +14545,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14597,9 +14586,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO @@ -14624,12 +14613,12 @@ Vm Vm nO Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14638,12 +14627,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14657,9 +14646,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -14683,12 +14672,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14698,9 +14687,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14739,9 +14728,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO @@ -14760,18 +14749,18 @@ Vm lz MV lz -oM -oM -oM +LF +LF +LF Vm nO Vm -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -14783,9 +14772,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14799,9 +14788,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14822,12 +14811,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -14840,9 +14829,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14881,9 +14870,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh nO @@ -14900,23 +14889,23 @@ gh gh Vm qX -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14925,9 +14914,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14941,9 +14930,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -14964,12 +14953,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -14982,9 +14971,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15023,9 +15012,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -15041,24 +15030,24 @@ Vm Vm gh Vm -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15067,9 +15056,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -15083,9 +15072,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15106,12 +15095,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15124,9 +15113,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15165,42 +15154,42 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -15209,12 +15198,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15225,9 +15214,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15245,12 +15234,12 @@ nO nO nO Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -15266,9 +15255,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15284,7 +15273,7 @@ gh gh gh gh -Eb +nO nO nO nO @@ -15307,29 +15296,29 @@ gh gh gh Vm -oM +LF +LF +LF +LF +LF +LF +LF +LF YB -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM +LF +LF +LF +LF +LF +LF Vm gh gh gh gh Vm -oM -oM +LF +LF WN Vm gh @@ -15340,23 +15329,23 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -YB -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15367,9 +15356,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15387,12 +15376,12 @@ nO nO nO Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15408,9 +15397,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15449,30 +15438,30 @@ gh gh gh Vm -oM -oM -oM -oM +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF zL -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15482,23 +15471,23 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -15509,9 +15498,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15529,12 +15518,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15550,9 +15539,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15598,9 +15587,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm LF @@ -15612,9 +15601,9 @@ LF LF LF LF -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15624,26 +15613,26 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15651,9 +15640,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15665,15 +15654,15 @@ nO nO nO Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -15692,9 +15681,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15711,7 +15700,7 @@ gh gh nO nO -Eb +nO gh gh nO @@ -15740,9 +15729,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm LF @@ -15754,9 +15743,9 @@ LF LF LF LF -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15766,9 +15755,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -15780,12 +15769,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15793,9 +15782,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15807,15 +15796,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +qe +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15834,9 +15823,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15882,9 +15871,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm LF @@ -15896,9 +15885,9 @@ LF LF LF LF -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -15908,9 +15897,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -15922,12 +15911,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -15936,8 +15925,8 @@ gh gh Vm ly -oM -oM +LF +LF Vm Vm Vm @@ -15949,15 +15938,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -15970,15 +15959,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16024,9 +16013,9 @@ Uh Uh Uh Uh -oM -oM -oM +LF +LF +LF Uh Uh Uh @@ -16038,21 +16027,21 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -16067,33 +16056,33 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -16112,15 +16101,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16135,7 +16124,7 @@ nO nO nO nO -nO +Eb nO nO nO @@ -16166,9 +16155,9 @@ BN BN Xq Uh -oM -oM -oM +LF +LF +LF Uh eD BN @@ -16180,21 +16169,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +YB +LF Vm gh Vm @@ -16209,33 +16198,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16254,15 +16243,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16308,9 +16297,9 @@ EY BN Xq Uh -oM -oM -oM +LF +LF +LF Uh ez BN @@ -16322,27 +16311,27 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -16351,33 +16340,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF sq -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16390,15 +16379,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -16447,7 +16436,7 @@ gh Uh hK Js -ra +BN mV Uh Hk @@ -16476,15 +16465,15 @@ sq Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM +LF qX -oM +LF Vm gh gh @@ -16496,21 +16485,21 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -16532,15 +16521,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16612,21 +16601,21 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm ly -oM -oM +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -16638,21 +16627,21 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF qX -oM -oM -oM -oM +LF +LF +LF +LF YB -oM +LF Vm gh gh @@ -16674,15 +16663,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16754,21 +16743,21 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -YB -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -16780,21 +16769,21 @@ gh gh gh Vm -oM -oM -oM -oM +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF zL -oM -oM +LF +LF Vm gh gh @@ -16810,15 +16799,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -Rh -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -16877,7 +16866,7 @@ Uh Uh Uh Gb -Cj +Gb Gb Uh Uh @@ -16896,24 +16885,24 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -16952,15 +16941,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -17038,24 +17027,24 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm ly -Rh -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh @@ -17094,15 +17083,15 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF zL -oM +LF Vm gh gh @@ -17122,7 +17111,7 @@ gh gh nO nO -Eb +nO nO nO gh @@ -17156,7 +17145,7 @@ gh gh Uh Ok -qe +Sg Sg bL uZ @@ -17166,7 +17155,7 @@ Gb hB Mj Sg -qe +Sg Mj Uh gh @@ -17180,24 +17169,24 @@ Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -17233,12 +17222,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -17272,7 +17261,7 @@ gh gh gh gh -Eb +nO nO nO nO @@ -17316,54 +17305,54 @@ gh gh gh Vm -oM +LF qX -oM +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM +LF qX -oM +LF Vm gh Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM +LF Vm Vm lz -oM -oM -oM +LF +LF +LF Vm gh gh @@ -17375,12 +17364,12 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -17458,15 +17447,15 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm @@ -17479,33 +17468,33 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm MV -oM +LF qX -oM +LF Vm Vm Vm @@ -17517,12 +17506,12 @@ Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF Vm gh gh @@ -17600,15 +17589,15 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -17622,46 +17611,46 @@ gh gh Vm ly -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm lz -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm Vm Vm @@ -17687,7 +17676,7 @@ gh gh gh nO -Eb +nO nO nO gh @@ -17742,18 +17731,18 @@ gh gh gh Vm -oM -Rh -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -17763,9 +17752,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -17781,29 +17770,29 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -Rh -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -17824,7 +17813,7 @@ nO nO xh nO -Eb +nO gh gh gh @@ -17885,17 +17874,17 @@ gh gh Vm ly -oM -oM -oM -oM -oM -oM -Rh -oM -oM -oM -oM +qe +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -17905,9 +17894,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -17923,29 +17912,29 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -Rh +LF +LF WN Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -18018,7 +18007,7 @@ Uh Uh Uh jO -pT +jO we Uh gh @@ -18026,18 +18015,18 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM +LF +LF +LF +LF Vm Vm Vm @@ -18047,9 +18036,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -18065,20 +18054,20 @@ Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -18091,15 +18080,15 @@ Vm Vm gh Vm -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF BJ -oM -oM -oM +LF +LF +LF Vm gh nO @@ -18168,59 +18157,59 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF lz Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -18233,15 +18222,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh nO @@ -18310,59 +18299,59 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -Rh -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +qe qX -oM +LF MV Vm gh Vm -oM +LF qX -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm @@ -18375,15 +18364,15 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh nO @@ -18418,7 +18407,7 @@ gh gh gh nO -Eb +nO nO gh gh @@ -18452,8 +18441,8 @@ gh gh gh Vm -oM -oM +LF +LF WN Vm gh @@ -18461,71 +18450,71 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF lz Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM +LF qX -oM +LF Vm gh gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -18594,9 +18583,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -18633,41 +18622,41 @@ Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF BJ -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF Vm gh gh @@ -18736,9 +18725,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -18775,41 +18764,41 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -18821,7 +18810,7 @@ nO nO nO nO -Eb +nO nO nO nO @@ -18878,9 +18867,9 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -18917,41 +18906,41 @@ Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm gh Vm -oM -oM +LF +LF WN Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -19017,83 +19006,83 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM +LF +LF +LF +LF lz Vm gh Vm -oM +LF Ek -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF Ek -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh gh @@ -19104,7 +19093,7 @@ nO nO nO nO -nO +Eb nO nO nO @@ -19160,82 +19149,82 @@ gh gh Vm qX -oM -oM -Rh -oM -oM -oM -oM -oM -oM -oM -oM -oM -Rh -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF qX MV Vm gh Vm -oM -Rh -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -Rh -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF BJ -oM -oM -oM +LF +LF +LF Vm gh gh @@ -19301,57 +19290,57 @@ gh gh gh Vm -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF zL -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF lz Vm gh Vm -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM -oM +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF +LF zL -oM +LF Vm gh Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -19464,18 +19453,18 @@ Vm Vm gh Vm -oM +LF qX -oM +LF Vm Vm Vm Vm Vm Vm -oM -oM -oM +LF +LF +LF Vm Vm Vm @@ -19491,9 +19480,9 @@ Vm Vm gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -19531,7 +19520,7 @@ gh nO nO nO -Eb +nO nO nO xh @@ -19606,18 +19595,18 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -19633,9 +19622,9 @@ gh gh gh Vm -oM -oM -oM +LF +LF +LF Vm gh gh @@ -19757,9 +19746,9 @@ gh gh gh Vm -oM +LF qX -oM +LF Vm gh gh @@ -19775,9 +19764,9 @@ gh gh gh Vm -oM +LF qX -oM +LF Vm gh gh diff --git a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm index 5acb316d64..8934cbb35e 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm @@ -24,7 +24,7 @@ /turf/unsimulated/mineral, /area/gateway/arynthilake/underground) "cE" = ( -/obj/random/mob/semirandom_mob_spawner/monster, +/obj/random/mob/semirandom_mob_spawner/monster/c, /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "cH" = ( @@ -95,9 +95,9 @@ /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) "iR" = ( -/obj/random/mob/semirandom_mob_spawner/robot, -/turf/simulated/floor/plating/eris/under, -/area/gateway/arynthilake/underground/maintenance) +/obj/random/mob/semirandom_mob_spawner/monster, +/turf/simulated/floor/tiled/eris/steel/monofloor, +/area/gateway/arynthilake/engine) "iU" = ( /obj/structure/table/steel_reinforced, /obj/random/awayloot, @@ -154,15 +154,12 @@ /turf/simulated/floor/tiled/eris/dark/monofloor, /area/gateway/arynthilake/underground/maintenance) "sg" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/random/mob/semirandom_mob_spawner/monster/d, +/obj/random/mob/semirandom_mob_spawner/monster, /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "sn" = ( -/obj/random/mob/semirandom_mob_spawner/robot, -/turf/simulated/floor/tiled/eris/steel/monofloor, +/obj/random/mob/semirandom_mob_spawner/robot/retaliate, +/turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) "uc" = ( /obj/machinery/gear_dispenser/adventure_box/weapon{ @@ -186,14 +183,13 @@ /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) "vG" = ( -/obj/random/awayloot, -/obj/random/mob/semirandom_mob_spawner/monster/f, -/turf/simulated/mineral/floor/ignore_cavegen/cave, -/area/gateway/arynthilake/underground) +/obj/random/mob/semirandom_mob_spawner/monster/d, +/turf/simulated/floor/plating/eris/under, +/area/gateway/arynthilake/underground/maintenance) "wg" = ( /obj/random/mob/semirandom_mob_spawner/monster/e, -/turf/simulated/mineral/floor/ignore_cavegen/cave, -/area/gateway/arynthilake/underground) +/turf/simulated/floor/plating/eris/under, +/area/gateway/arynthilake/underground/maintenance) "wi" = ( /turf/simulated/wall/r_wall, /area/gateway/arynthilake/underground/maintenance) @@ -227,9 +223,9 @@ /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "yK" = ( -/obj/random/mob/semirandom_mob_spawner/monster/c, -/turf/simulated/floor/plating/eris/under, -/area/gateway/arynthilake/underground/maintenance) +/obj/random/mob/semirandom_mob_spawner/monster/e, +/turf/simulated/mineral/floor/ignore_cavegen/cave, +/area/gateway/arynthilake/underground) "zV" = ( /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) @@ -256,10 +252,6 @@ }, /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) -"EX" = ( -/obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/floor/tiled/eris/techmaint, -/area/gateway/arynthilake/engine) "Ff" = ( /turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) @@ -286,10 +278,6 @@ "Il" = ( /turf/simulated/floor/tiled/eris/steel/monofloor, /area/gateway/arynthilake/engine) -"ID" = ( -/obj/random/mob/semirandom_mob_spawner/monster/b, -/turf/simulated/floor/plating/eris/under, -/area/gateway/arynthilake/underground/maintenance) "JL" = ( /obj/structure/table/steel_reinforced, /obj/random/tool, @@ -300,11 +288,6 @@ /obj/random/tool/power, /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) -"JS" = ( -/obj/machinery/light/small, -/obj/random/mob/semirandom_mob_spawner/robot, -/turf/simulated/floor/tiled/eris/steel/monofloor, -/area/gateway/arynthilake/engine) "Kx" = ( /obj/machinery/light/small{ dir = 1 @@ -318,7 +301,7 @@ /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "LQ" = ( -/obj/random/mob/semirandom_mob_spawner/monster/d, +/obj/random/mob/semirandom_mob_spawner/monster/b, /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "LR" = ( @@ -910,7 +893,7 @@ oZ oZ oZ oZ -oZ +sg oZ wi oZ @@ -921,7 +904,7 @@ oZ oZ oZ oZ -cE +oZ oZ oZ oZ @@ -1003,7 +986,7 @@ Ff Ff Ff Ff -LR +Ff Ff Ff bL @@ -1021,7 +1004,7 @@ bL wi oZ oZ -cE +oZ oZ oZ oZ @@ -1046,7 +1029,7 @@ Ej oZ oZ oZ -cE +oZ oZ oZ oZ @@ -1079,7 +1062,6 @@ wi wi oZ oZ -yK oZ oZ oZ @@ -1099,7 +1081,8 @@ oZ oZ oZ oZ -iR +oZ +vG oZ oZ oZ @@ -1164,7 +1147,7 @@ wi oZ cH oZ -oZ +sg oZ oZ oZ @@ -1217,7 +1200,7 @@ oZ oZ oZ oZ -cE +oZ wi oZ oZ @@ -1445,7 +1428,7 @@ bX bL bL wi -cE +oZ oZ oZ wi @@ -1496,7 +1479,7 @@ oZ oZ oZ wi -cE +oZ oZ oZ oZ @@ -1549,7 +1532,7 @@ wi bL bL Ff -LR +Ff bL bL bL @@ -1589,7 +1572,7 @@ bL wi oZ oZ -cE +oZ wi bL bL @@ -1607,7 +1590,7 @@ oZ oZ oZ oZ -cE +oZ oZ oZ oZ @@ -1646,7 +1629,7 @@ oZ oZ wi oZ -yK +oZ oZ oZ oZ @@ -1811,7 +1794,7 @@ oZ oZ oZ oZ -yK +oZ wi bL bL @@ -1854,7 +1837,7 @@ Ff Ff bL Ff -LR +Ff Ff bL Ff @@ -2085,7 +2068,7 @@ oZ oZ oZ oZ -yK +oZ oZ oZ wi @@ -2244,7 +2227,7 @@ oZ oZ oZ oZ -yK +oZ oZ oZ oZ @@ -2330,7 +2313,7 @@ oZ oZ oZ oZ -cE +oZ oZ wi oZ @@ -2371,7 +2354,7 @@ oZ oZ oZ oZ -yK +oZ wi oZ oZ @@ -2410,7 +2393,7 @@ Ff Ff Ff Ff -LR +Ff Ff Ff bL @@ -2584,7 +2567,7 @@ bL bL bL kb -sn +Il Il Il kb @@ -2596,7 +2579,7 @@ kb kb Il Il -JS +GB kb bL wi @@ -2727,7 +2710,7 @@ bL bL kb Il -Il +iR Il Il kb @@ -2846,12 +2829,12 @@ bL Ff Ff Ff -LR +Ff Ff Ff QA Ff -LR +Ff Ff bL bL @@ -2896,7 +2879,6 @@ Oe oZ cH oZ -cE oZ oZ oZ @@ -2906,7 +2888,8 @@ oZ oZ oZ oZ -cE +oZ +oZ oZ wi bL @@ -2945,7 +2928,7 @@ oZ oZ oZ wi -yK +oZ oZ oZ Ej @@ -3026,7 +3009,7 @@ Il kb bL wi -cE +oZ oZ oZ wi @@ -3205,7 +3188,7 @@ cH oZ oZ oZ -yK +oZ oZ oZ oZ @@ -3260,7 +3243,7 @@ Ff Ff Ff Ff -Ff +LR Ff Ff Ff @@ -3437,7 +3420,7 @@ bL bL kb iU -EX +UC UC Dj QT @@ -3447,14 +3430,14 @@ zV xP Cp UC -EX +UC Cp kb bL wi oZ cH -cE +oZ wi oZ oZ @@ -3528,7 +3511,7 @@ wi oZ oZ oZ -yK +oZ oZ oZ oZ @@ -3547,7 +3530,7 @@ Ff Ff Ff Ff -LR +Ff Ff Ff Ff @@ -3598,7 +3581,7 @@ oZ oZ oZ wi -cE +oZ oZ oZ oZ @@ -3757,7 +3740,7 @@ oZ oZ oZ oZ -cE +oZ oZ oZ oZ @@ -3765,7 +3748,7 @@ Ej wi Mg oZ -cE +oZ oZ oZ cH @@ -3775,7 +3758,7 @@ wi Mg oZ oZ -yK +oZ oZ cH oZ @@ -3845,7 +3828,7 @@ bL bL bL Ff -LR +Ff bL bL Ff @@ -3911,7 +3894,7 @@ oZ oZ oZ oZ -cE +oZ Ej wi oZ @@ -4025,7 +4008,7 @@ oZ oZ oZ KZ -cE +oZ oZ oZ oZ @@ -4069,7 +4052,7 @@ Ej oZ oZ oZ -yK +oZ oZ oZ oZ @@ -4274,7 +4257,7 @@ bL bL bL bL -Ff +LR Ff bL bL @@ -4299,7 +4282,7 @@ oZ kb XA oL -oL +sn mj kb bL @@ -4312,7 +4295,7 @@ oZ oZ oZ oZ -cE +oZ oZ oZ Ej @@ -4355,7 +4338,7 @@ oZ oZ Vj oZ -yK +oZ oZ oZ oZ @@ -4378,7 +4361,7 @@ oZ oZ oZ oZ -yK +oZ oZ oZ oZ @@ -4417,7 +4400,7 @@ bL bL bL Ff -vG +eQ Ff bL bX @@ -4483,7 +4466,7 @@ oZ oZ oZ oZ -ID +oZ oZ oZ oZ @@ -4578,7 +4561,7 @@ kb kb kb oZ -cE +oZ oZ kb kb @@ -4675,7 +4658,7 @@ bL bL Ff Ff -LR +Ff Ff Ff bL @@ -4686,7 +4669,7 @@ Ff Ff Ff Ff -LR +Ff Ff Ff Ff @@ -4877,7 +4860,7 @@ oZ oZ wi oZ -cE +oZ oZ oZ oZ @@ -4973,7 +4956,7 @@ Ff Ff Ff Ff -LR +Ff bL bL Ff @@ -5031,11 +5014,11 @@ oZ cH oZ oZ +sg oZ oZ oZ oZ -cE oZ Oe wi @@ -5146,7 +5129,7 @@ oZ oZ oZ oZ -oZ +sg oZ oZ oZ @@ -5236,12 +5219,12 @@ oZ oZ oZ oZ -yK +oZ oZ wi bL Ff -LR +Ff Ff bL bL @@ -5282,7 +5265,6 @@ bL bL wi oZ -cE oZ oZ oZ @@ -5294,7 +5276,8 @@ oZ oZ oZ oZ -cE +oZ +oZ oZ wi wi @@ -5339,7 +5322,7 @@ oZ oZ oZ oZ -ID +oZ oZ oZ oZ @@ -5356,7 +5339,7 @@ bL bL wi oZ -yK +oZ oZ oZ oZ @@ -5405,7 +5388,7 @@ bL Ff Ff Ff -LR +Ff bL bL bL @@ -5686,7 +5669,7 @@ bL bL Ff Ff -Ff +LR Ff bL bL @@ -5905,7 +5888,7 @@ wi bL wi oZ -ID +oZ oZ wi oZ @@ -5931,7 +5914,7 @@ bL wi oZ oZ -yK +oZ oZ oZ Ej @@ -6019,7 +6002,7 @@ oZ oZ oZ oZ -cE +oZ wi oZ oZ @@ -6171,7 +6154,7 @@ bL wi oZ oZ -ID +oZ oZ oZ oZ @@ -6179,7 +6162,7 @@ wi oZ KZ oZ -ID +oZ oZ oZ oZ @@ -6226,7 +6209,7 @@ oZ wi bL wi -yK +oZ oZ oZ oZ @@ -6299,7 +6282,7 @@ oZ oZ oZ oZ -cE +oZ oZ oZ Vj @@ -6323,7 +6306,7 @@ oZ oZ oZ oZ -oZ +vG oZ oZ oZ @@ -6348,7 +6331,7 @@ oZ oZ oZ oZ -ID +oZ oZ wi wi @@ -6477,7 +6460,7 @@ oZ oZ wi oZ -ID +oZ oZ oZ oZ @@ -6528,14 +6511,14 @@ bL bL bL bL -LR Ff Ff Ff Ff Ff Ff -LR +Ff +Ff Ff Ff Ff @@ -6565,7 +6548,7 @@ oZ oZ oZ oZ -cE +oZ oZ oZ oZ @@ -6647,7 +6630,7 @@ oZ oZ oZ oZ -yK +oZ oZ wi wi @@ -6851,7 +6834,7 @@ wi wi Mg oZ -cE +oZ oZ oZ oZ @@ -6946,7 +6929,7 @@ bL bL wi oZ -yK +oZ oZ wi bL @@ -7002,7 +6985,7 @@ wi wi oZ oZ -cE +oZ wi wi wi @@ -7016,7 +6999,7 @@ oZ oZ oZ oZ -cE +oZ oZ wi bL @@ -7245,7 +7228,7 @@ bL bL bL Ff -LR +Ff Ff Ff Ff @@ -7345,7 +7328,7 @@ oZ oZ oZ oZ -oZ +vG oZ oZ ah @@ -7361,7 +7344,7 @@ bL wi oZ oZ -yK +oZ wi bL bL @@ -7396,7 +7379,7 @@ bL Ff Ff Ff -LR +Ff bL bL bL @@ -7566,7 +7549,7 @@ wi bL wi oZ -cE +oZ oZ oZ oZ @@ -7663,7 +7646,7 @@ bL bL bL Ff -LR +Ff bL bL bL @@ -7742,7 +7725,7 @@ oZ oZ oZ oZ -ID +oZ oZ WK wi @@ -7792,14 +7775,14 @@ wi bL wi oZ -yK oZ oZ oZ oZ oZ oZ -yK +oZ +oZ wi bL bL @@ -7835,7 +7818,7 @@ bX wi oZ oZ -LQ +oZ wi oZ oZ @@ -7862,7 +7845,7 @@ oZ oZ oZ oZ -cE +oZ WK wi wi @@ -8270,7 +8253,7 @@ oZ oZ oZ oZ -cE +oZ oZ wi bL @@ -8338,7 +8321,7 @@ wi oZ oZ oZ -ID +oZ oZ oZ wi @@ -8405,7 +8388,7 @@ oZ oZ oZ wi -cE +oZ oZ oZ oZ @@ -8524,12 +8507,12 @@ bL Ff Ff Ff +Ff +Ff +Ff LR Ff Ff -Ff -Ff -Ff bL bL bL @@ -8576,7 +8559,7 @@ oZ oZ wi oZ -cE +oZ oZ wi oZ @@ -8596,7 +8579,7 @@ wi wi oZ oZ -ID +oZ oZ oZ wi @@ -8654,7 +8637,7 @@ bL bL bL bL -LR +Ff Ff bL bL @@ -8707,7 +8690,7 @@ wi Oe oZ oZ -cE +oZ oZ oZ wi @@ -8753,7 +8736,7 @@ oZ wi oZ oZ -ID +oZ oZ oZ Ej @@ -8827,7 +8810,7 @@ bX (60,1,1) = {" bX wi -LQ +oZ oZ oZ wi @@ -8868,7 +8851,7 @@ oZ oZ oZ oZ -cE +oZ wi oZ oZ @@ -9091,13 +9074,13 @@ bL bL bL Ff -LR +Ff Ff bL bL bL bL -wg +Ff Ff Ff Ff @@ -9143,7 +9126,7 @@ wi wi wi wi -cE +oZ oZ oZ wi @@ -9397,7 +9380,7 @@ bX wi wi oZ -oZ +LQ oZ wi bL @@ -9430,11 +9413,11 @@ oZ oZ oZ oZ -cE +oZ oZ oZ wi -cE +oZ oZ oZ wi @@ -9449,7 +9432,7 @@ oZ oZ oZ KZ -ID +oZ wi bL wi @@ -9484,7 +9467,7 @@ oZ oZ oZ oZ -yK +oZ oZ wi bL @@ -9492,7 +9475,6 @@ wi oZ cH oZ -yK oZ oZ oZ @@ -9502,7 +9484,8 @@ oZ oZ oZ oZ -yK +oZ +oZ oZ wi bL @@ -9607,7 +9590,7 @@ wi oZ oZ oZ -ID +oZ oZ oZ wi @@ -9626,7 +9609,7 @@ oZ Vj oZ oZ -oZ +vG oZ wi bL @@ -9730,7 +9713,7 @@ oZ wi oZ oZ -ID +oZ oZ oZ oZ @@ -9845,7 +9828,7 @@ oZ oZ oZ oZ -oZ +sg oZ oZ oZ @@ -9896,7 +9879,7 @@ wi wi wi wi -yK +oZ oZ oZ oZ @@ -9936,7 +9919,7 @@ Ff bL bL bL -LR +Ff bL bL bL @@ -9966,13 +9949,13 @@ bL wi Mg oZ -LQ +oZ oZ oZ ah oZ oZ -cE +oZ oZ oZ oZ @@ -10020,7 +10003,7 @@ cH oZ oZ oZ -ID +oZ oZ oZ oZ @@ -10058,7 +10041,7 @@ wi bL wi Mg -yK +oZ oZ oZ oZ @@ -10120,7 +10103,7 @@ oZ oZ oZ oZ -cE +oZ wi bL bL @@ -10300,7 +10283,7 @@ oZ oZ oZ oZ -oZ +vG oZ wi wi @@ -10456,7 +10439,7 @@ bL bL bL wi -ID +oZ oZ oZ oZ @@ -10469,7 +10452,7 @@ bL bL wi oZ -yK +oZ oZ oZ oZ @@ -10496,32 +10479,32 @@ oZ oZ wi oZ -oZ -Ff -Ff -Ff -Ff -bL -bL -bL -Ff -Ff -Ff -Ff -bL -bL -Ff -Ff -Ff -bL -bL -bL -Ff -Ff -Ff wg Ff Ff +Ff +Ff +bL +bL +bL +Ff +Ff +Ff +Ff +bL +bL +Ff +Ff +Ff +bL +bL +bL +Ff +Ff +Ff +Ff +Ff +Ff bL bL bL @@ -10659,7 +10642,7 @@ bL bL bL Ff -wg +Ff QA Ff Ff @@ -10690,7 +10673,7 @@ oZ oZ oZ oZ -LQ +oZ oZ cH oZ @@ -10821,7 +10804,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -10946,7 +10929,7 @@ Ff Ff Ff Ff -wg +Ff bL bL bL @@ -10997,7 +10980,7 @@ bL bL wi oZ -oZ +LQ oZ oZ oZ @@ -11091,7 +11074,7 @@ Ff bL bL bL -wg +Ff bL bL bX @@ -11110,7 +11093,7 @@ oZ oZ oZ Vj -LQ +oZ wi oZ oZ @@ -11191,9 +11174,9 @@ wi Oe oZ cH -yK oZ oZ +wg oZ WK wi @@ -11215,7 +11198,7 @@ Ff Ff Ff Ff -Ff +yK Ff Ff Ff @@ -11416,7 +11399,7 @@ wi oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -11714,7 +11697,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ KZ @@ -11890,7 +11873,7 @@ oZ oZ oZ oZ -ID +oZ wi bL wi @@ -11975,7 +11958,7 @@ wi wi Mg oZ -LQ +oZ cH oZ Oe @@ -12072,12 +12055,12 @@ bL bL bL Ff -LR +Ff Ff bL bL bL -LR +Ff Ff bL bL @@ -12100,7 +12083,7 @@ oZ wi oZ oZ -LQ +oZ oZ oZ oZ @@ -12236,7 +12219,7 @@ bX bX bL wi -LQ +oZ oZ oZ wi @@ -12251,7 +12234,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -12366,7 +12349,7 @@ Ff bL bL Ff -wg +Ff Ff bL bL @@ -12457,6 +12440,7 @@ bL bL wi oZ +vG oZ oZ oZ @@ -12467,7 +12451,6 @@ oZ oZ oZ oZ -ID wi bL wi @@ -12581,7 +12564,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -12620,7 +12603,7 @@ oZ oZ oZ oZ -ID +oZ oZ wi bL @@ -12756,7 +12739,7 @@ wi bL wi Mg -ID +oZ oZ oZ oZ @@ -12780,7 +12763,7 @@ bL bL bL bL -LR +Ff Ff Ff bL @@ -12845,7 +12828,7 @@ oZ oZ oZ oZ -LQ +oZ oZ Vj oZ @@ -12913,7 +12896,7 @@ bL Ff Ff Ff -LR +Ff bL bL bL @@ -13067,7 +13050,7 @@ Ff Ff bL bL -LR +Ff Ff bL bL @@ -13172,7 +13155,7 @@ oZ wi wi oZ -iR +oZ oZ wi oZ @@ -13337,8 +13320,8 @@ bL bL Ff Ff -LR Ff +yK Ff Ff Ff @@ -13376,7 +13359,7 @@ bL bL bL wi -sg +Mg oZ oZ wi @@ -13397,7 +13380,7 @@ oZ oZ Vj oZ -LQ +oZ oZ oZ oZ @@ -13406,7 +13389,7 @@ wi oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -13417,7 +13400,7 @@ Oe oZ cH oZ -LQ +oZ wi wi oZ @@ -13569,7 +13552,7 @@ wi bL wi oZ -LQ +oZ oZ oZ cH @@ -13577,7 +13560,7 @@ yv wi oZ oZ -LQ +oZ wi oZ oZ @@ -13609,7 +13592,7 @@ oZ oZ oZ oZ -ID +oZ wi bL bL @@ -13635,7 +13618,7 @@ bL Ff QA Ff -LR +Ff bL bL bL @@ -13731,7 +13714,7 @@ wi oZ oZ oZ -LQ +oZ oZ oZ wi @@ -13782,7 +13765,7 @@ bL bL Ff Ff -wg +Ff bL bL bL @@ -13823,7 +13806,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -13842,7 +13825,7 @@ wi wi wi oZ -oZ +LQ oZ wi wi @@ -13915,7 +13898,7 @@ bL bL bL Ff -LR +Ff Ff Ff Ff @@ -13951,7 +13934,7 @@ wi bL wi oZ -LQ +oZ oZ oZ oZ @@ -14266,7 +14249,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -14290,7 +14273,7 @@ oZ oZ wi oZ -LQ +oZ oZ oZ oZ @@ -14319,7 +14302,7 @@ oZ oZ oZ oZ -ID +oZ wi bL bL @@ -14347,7 +14330,7 @@ bL bL bL bL -wg +Ff Ff Ff Ff @@ -14422,7 +14405,7 @@ bL wi oZ oZ -LQ +oZ oZ cH yv @@ -14493,7 +14476,7 @@ bL Ff Ff Ff -wg +Ff Ff Ff bL @@ -14569,7 +14552,7 @@ oZ oZ oZ wi -LQ +oZ oZ oZ wi @@ -14668,7 +14651,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -14700,7 +14683,7 @@ oZ oZ oZ oZ -LQ +oZ wi bL wi @@ -14758,7 +14741,7 @@ bL bL Ff Ff -Ff +yK Ff Ff Ff @@ -15041,7 +15024,7 @@ bL Ff Ff Ff -wg +Ff Ff Ff bL @@ -15102,7 +15085,7 @@ oZ oZ oZ oZ -LQ +oZ oZ wi bL @@ -15159,7 +15142,7 @@ oZ oZ oZ wi -ID +oZ oZ oZ wi @@ -15194,7 +15177,7 @@ bL bL bL Ff -wg +Ff Ff bL bL @@ -15205,7 +15188,7 @@ bL Ff Ff Ff -wg +Ff Ff Ff bL @@ -15227,7 +15210,7 @@ oZ oZ oZ oZ -LQ +oZ wi bL wi @@ -15240,11 +15223,11 @@ oZ cH oZ oZ -LQ oZ oZ oZ oZ +cE WK wi bL @@ -15299,7 +15282,7 @@ bL wi oZ oZ -ID +oZ wi oZ oZ @@ -15308,7 +15291,7 @@ wi Ej oZ oZ -ID +oZ oZ oZ oZ @@ -15322,8 +15305,8 @@ bL bL Ff Ff -wg Ff +yK Ff Ff Ff @@ -15368,7 +15351,7 @@ oZ oZ oZ oZ -oZ +LQ WK wi bL @@ -15454,7 +15437,7 @@ oZ oZ oZ oZ -ID +oZ WK wi bL @@ -15508,7 +15491,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -15751,7 +15734,7 @@ bL Ff Ff Ff -wg +Ff Ff bL bL @@ -15791,7 +15774,7 @@ oZ oZ oZ wi -LQ +oZ KZ oZ oZ @@ -15939,7 +15922,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -15990,7 +15973,7 @@ oZ wi oZ oZ -LQ +oZ wi wi oZ @@ -16138,7 +16121,7 @@ wi Mg oZ oZ -LQ +oZ oZ oZ oZ @@ -16259,7 +16242,7 @@ wi wi wi wi -LQ +oZ oZ oZ oZ @@ -16331,7 +16314,7 @@ Ff Ff Ff Ff -wg +Ff Ff Ff bL @@ -16481,7 +16464,7 @@ Ff Ff Ff Ff -wg +Ff Ff Ff Ff @@ -16515,7 +16498,7 @@ wi oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -16623,7 +16606,7 @@ Ff Ff bL Ff -Ff +yK Ff Ff bL @@ -16730,7 +16713,7 @@ wi bL wi oZ -ID +oZ oZ oZ oZ @@ -16745,7 +16728,7 @@ Ff bL bL Ff -wg +Ff Ff Ff Ff @@ -16765,7 +16748,7 @@ bL bL bL Ff -wg +Ff Ff bL bL @@ -16852,7 +16835,7 @@ oZ oZ oZ KZ -LQ +oZ oZ oZ oZ @@ -16947,7 +16930,7 @@ wi bL wi Mg -oZ +cE oZ cH Oe @@ -17089,7 +17072,7 @@ wi bL wi oZ -LQ +oZ oZ oZ Ej @@ -17120,7 +17103,7 @@ bL bL bL wi -LQ +oZ oZ oZ oZ @@ -17208,7 +17191,7 @@ bL bL wi oZ -oZ +cE oZ oZ oZ @@ -17461,7 +17444,7 @@ Ff Ff Ff Ff -wg +Ff Ff bL bL @@ -17555,7 +17538,7 @@ wi wi wi wi -LQ +oZ oZ oZ wi @@ -17567,7 +17550,7 @@ oZ oZ oZ oZ -LQ +oZ wi hB oZ @@ -17586,7 +17569,7 @@ oZ oZ oZ oZ -ID +oZ wi bL bL @@ -17600,7 +17583,7 @@ bL bL Ff Ff -Ff +yK Ff Ff Ff @@ -17760,7 +17743,7 @@ bL bL Ff Ff -wg +Ff Ff bL Ff @@ -17839,12 +17822,12 @@ oZ oZ oZ oZ -oZ +wg oZ WK wi oZ -LQ +oZ oZ wi wi @@ -17929,7 +17912,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -18124,7 +18107,7 @@ wi wi wi oZ -LQ +oZ oZ wi oZ @@ -18150,7 +18133,7 @@ oZ oZ oZ wi -LQ +oZ oZ oZ oZ @@ -18255,11 +18238,11 @@ oZ oZ oZ oZ -LQ +cE oZ wi wi -LQ +oZ oZ oZ wi @@ -18306,7 +18289,7 @@ bL bL bL Ff -wg +Ff Ff Ff bL @@ -18379,7 +18362,7 @@ wi bL wi oZ -iR +oZ oZ wi bL @@ -18566,7 +18549,7 @@ wi bL wi Mg -LQ +oZ oZ cH oZ @@ -18578,7 +18561,7 @@ oZ wi oZ oZ -LQ +oZ wi oZ oZ @@ -18629,7 +18612,7 @@ bL bL bL wi -LQ +oZ oZ oZ oZ @@ -18754,7 +18737,7 @@ bL bL bL bL -wg +Ff Ff QA Ff @@ -18787,7 +18770,7 @@ wi Cs oZ oZ -oZ +cE oZ oZ Cs @@ -18850,13 +18833,13 @@ oZ oZ oZ oZ -oZ +wg oZ wi wi wi wi -ID +oZ oZ oZ wi @@ -18914,7 +18897,7 @@ bL bL wi oZ -LQ +oZ oZ wi bL @@ -18987,7 +18970,7 @@ oZ wi oZ oZ -LQ +oZ oZ oZ oZ @@ -19007,7 +18990,7 @@ Oe Ej wi oZ -LQ +oZ oZ wi bL @@ -19182,7 +19165,7 @@ bL bL bL Ff -wg +Ff bL bL bL @@ -19211,7 +19194,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -19230,7 +19213,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -19448,7 +19431,7 @@ Ff bL bL Ff -wg +Ff Ff Ff bL @@ -19500,7 +19483,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ Vj @@ -19682,7 +19665,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -19730,7 +19713,7 @@ bL bL Ff Ff -wg +Ff Ff Ff Ff @@ -19845,7 +19828,7 @@ bL wi oZ oZ -LQ +oZ oZ oZ oZ @@ -20018,7 +20001,7 @@ Ff Ff Ff Ff -wg +Ff Ff Ff bL diff --git a/maps/gateway_vr/variable/honlethhighlands_a.dmm b/maps/gateway_vr/variable/honlethhighlands_a.dmm index 639b845486..f7acdc2a00 100644 --- a/maps/gateway_vr/variable/honlethhighlands_a.dmm +++ b/maps/gateway_vr/variable/honlethhighlands_a.dmm @@ -688,12 +688,6 @@ temperature = 253.15 }, /area/gateway/honlethhighlands) -"jn" = ( -/obj/effect/overmap/visitable/sector/common_gateway/honlethhighlands, -/turf/simulated/floor/water/deep{ - temperature = 253.15 - }, -/area/gateway/honlethhighlands/beach) "jp" = ( /obj/item/modular_computer/console/preset/civilian, /turf/simulated/floor/tiled, @@ -3413,7 +3407,7 @@ bm bm bm bm -jn +bm aa "} (4,1,1) = {" diff --git a/maps/gateway_vr/variable/honlethhighlands_b.dmm b/maps/gateway_vr/variable/honlethhighlands_b.dmm index ccd8e99e90..a85f7cf013 100644 --- a/maps/gateway_vr/variable/honlethhighlands_b.dmm +++ b/maps/gateway_vr/variable/honlethhighlands_b.dmm @@ -736,12 +736,6 @@ /obj/random/multiple/gun/projectile, /turf/simulated/floor/plating, /area/gateway/honlethhighlands/town/supply) -"kk" = ( -/obj/effect/overmap/visitable/sector/common_gateway/honlethhighlands, -/turf/simulated/floor/water/deep{ - temperature = 253.15 - }, -/area/gateway/honlethhighlands/beach) "kx" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -3454,7 +3448,7 @@ bm bm bm bm -kk +bm aa "} (4,1,1) = {" diff --git a/maps/gateway_vr/wildwest.dm b/maps/gateway_vr/wildwest.dm index 2260db08ed..69c3a26f21 100644 --- a/maps/gateway_vr/wildwest.dm +++ b/maps/gateway_vr/wildwest.dm @@ -191,4 +191,46 @@ skybox_icon = 'icons/skybox/anomaly.dmi' skybox_icon_state = "shimmer_r" skybox_pixel_x = 0 - skybox_pixel_y = 0 \ No newline at end of file + skybox_pixel_y = 0 + +/obj/random/mob/semirandom_mob_spawner/wildwest + name = "Wild west mob spawner" + desc = "Spawns groups of mobs that are all of the same theme type/theme." + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "monster" + mob_faction = "wildwest" + mob_returns_home = 0 + overwrite_hostility = 1 + mob_hostile = 1 + + possible_mob_types = list( + list( + /mob/living/simple_mob/humanoid/merc/melee = 100, + /mob/living/simple_mob/humanoid/merc/ranged = 50, + /mob/living/simple_mob/humanoid/merc/ranged/space = 5, + /mob/living/simple_mob/otie/feral = 10, + /mob/living/simple_mob/otie/feral/chubby = 5 + ), + + list( + /mob/living/simple_mob/animal/space/alien = 1000, + /mob/living/simple_mob/animal/space/alien/drone = 500, + /mob/living/simple_mob/animal/space/alien/sentinel = 100, + /mob/living/simple_mob/animal/space/alien/sentinel/praetorian = 50, + /mob/living/simple_mob/animal/space/alien/queen = 50, + /mob/living/simple_mob/animal/space/alien/queen/empress = 1, + /mob/living/simple_mob/animal/space/alien/queen/empress/mother = 1 + ), + list( + /mob/living/simple_mob/humanoid/pirate = 100, + /mob/living/simple_mob/humanoid/pirate/ranged = 50, + /mob/living/simple_mob/animal/wolf = 10, + /mob/living/simple_mob/animal/wolf/direwolf = 5 + ) + + ) + +/obj/random/mob/semirandom_mob_spawner/wildwest/spawn_item() + if(prob(25)) + return + . = ..() diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm index 12a79c33ec..d80e24e75a 100644 --- a/maps/gateway_vr/wildwest.dmm +++ b/maps/gateway_vr/wildwest.dmm @@ -46,7 +46,7 @@ /area/space) "aj" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, -/mob/living/simple_mob/humanoid/merc/ranged, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) "ak" = ( @@ -210,15 +210,6 @@ }, /turf/space, /area/space) -"aJ" = ( -/obj/item/weapon/paper{ - info = "meat grinder requires sacri" - }, -/turf/simulated/floor/cult{ - nitrogen = 0; - oxygen = 0 - }, -/area/awaymission/wwvault) "aK" = ( /obj/machinery/gateway{ dir = 8 @@ -269,15 +260,6 @@ "bk" = ( /turf/simulated/floor/carpet, /area/awaymission/wwmines) -"bn" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/paper{ - info = " The miners in the town have become sick and almost all production has stopped. They, in a fit of delusion, tossed all of their mining equipment into the furnaces. They all claimed the same thing. A voice beckoning them to lay down their arms. Stupid miners."; - name = "Planer Saul's Journal: Page 4" - }, -/obj/effect/floor_decal/corner/lightgrey/diagonal, -/turf/simulated/floor/tiled/white, -/area/awaymission/wwmines) "bo" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/corner/lightgrey/diagonal, @@ -315,13 +297,6 @@ /obj/machinery/gateway, /turf/simulated/floor/redgrid/off, /area/awaymission/wwvault) -"bR" = ( -/obj/item/weapon/paper{ - info = "We've discovered something floating in space. We can't really tell how old it is, but it is scraped and bent to hell. There object is the size of about a room with double doors that we have yet to break into. It is a lot sturdier than we could have imagined. We have decided to call it 'The Vault' "; - name = "Planer Saul's Journal: Page 1" - }, -/turf/simulated/floor/carpet, -/area/awaymission/wwgov) "bS" = ( /obj/machinery/gateway{ dir = 6 @@ -514,19 +489,8 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"dM" = ( -/obj/item/weapon/stool{ - dir = 1 - }, -/mob/living/simple_mob/humanoid/merc/ranged, -/turf/simulated/floor/wood, -/area/awaymission/wwmines) -"dN" = ( -/mob/living/simple_mob/humanoid/merc/ranged, -/turf/simulated/floor/outdoors/ironsand, -/area/awaymission/wwmines) "dO" = ( -/mob/living/simple_mob/humanoid/merc/melee, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/outdoors/ironsand, /area/awaymission/wwmines) "dQ" = ( @@ -567,7 +531,7 @@ /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwmines) "eh" = ( -/mob/living/simple_mob/humanoid/merc/ranged, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/plating, /area/awaymission/wwrefine) "ei" = ( @@ -654,10 +618,6 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"eX" = ( -/mob/living/simple_mob/humanoid/merc/ranged, -/turf/simulated/floor/tiled/asteroid_steel, -/area/awaymission/wwmines) "eY" = ( /obj/structure/table/woodentable, /obj/item/weapon/book/manual/barman_recipes, @@ -744,10 +704,6 @@ /obj/effect/floor_decal/corner/lightgrey/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"fu" = ( -/mob/living/simple_mob/humanoid/merc/melee, -/turf/simulated/floor/wood, -/area/awaymission/wwmines) "fy" = ( /obj/machinery/door/window{ dir = 1 @@ -967,7 +923,7 @@ /area/awaymission/wwgov) "gH" = ( /obj/effect/decal/remains/human, -/mob/living/simple_mob/humanoid/merc/ranged/space, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/plating, /area/awaymission/wwrefine) "gM" = ( @@ -978,7 +934,7 @@ /turf/simulated/floor/outdoors/ironsand, /area/awaymission/wwmines) "gP" = ( -/mob/living/simple_mob/humanoid/merc/ranged, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gQ" = ( @@ -1223,13 +1179,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"pW" = ( -/obj/item/weapon/paper{ - info = "The syndicate have invaded. Their ships appeared out of nowhere and now they likely intend to kill us all and take everything. On the off-chance that the Vault may grant us sanctuary, many of us have decided to force our way inside and bolt the door, taking as many provisions with us as we can carry. In case you find this, send for help immediately and open the Vault. Find us inside."; - name = "Planer Saul's Journal: Page 8" - }, -/turf/simulated/floor/outdoors/ironsand, -/area/awaymission/wwmines) "qQ" = ( /obj/effect/decal/mecha_wreckage/ripley/deathripley{ anchored = 1 @@ -1319,7 +1268,7 @@ /turf/simulated/floor/grass, /area/awaymission/wwgov) "tA" = ( -/mob/living/simple_mob/humanoid/merc/melee, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwmines) "tO" = ( @@ -1386,7 +1335,7 @@ /obj/item/weapon/stool{ dir = 1 }, -/mob/living/simple_mob/humanoid/merc/melee, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/wood, /area/awaymission/wwmines) "wj" = ( @@ -1559,16 +1508,9 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "CN" = ( -/mob/living/simple_mob/humanoid/merc/ranged, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/carpet, /area/awaymission/wwmines) -"CO" = ( -/obj/item/weapon/paper{ - info = "The Vault...it just keeps growing and growing. I went on my daily walk through the garden and now its just right outside the mansion... a few days ago it was only barely visible. But whatever is inside...its calling to me."; - name = "Planer Sauls' Journal: Page 7" - }, -/turf/simulated/floor/tiled/asteroid_steel, -/area/awaymission/wwmines) "CU" = ( /obj/structure/largecrate, /obj/machinery/light/small{ @@ -1790,7 +1732,7 @@ /turf/simulated/floor/outdoors/ironsand, /area/awaymission/wwmines) "Kj" = ( -/mob/living/simple_mob/humanoid/merc/melee, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwrefine) "KI" = ( @@ -2032,7 +1974,7 @@ /obj/machinery/light/small{ dir = 4 }, -/mob/living/simple_mob/humanoid/merc/melee, +/obj/random/mob/semirandom_mob_spawner/wildwest, /turf/simulated/floor/wood, /area/awaymission/wwmines) "Tk" = ( @@ -4692,7 +4634,7 @@ bY bY bY bY -bR +bY bY jq cn @@ -8502,7 +8444,7 @@ aF aF aF dl -aJ +pv dn pv pv @@ -11102,7 +11044,7 @@ gN gN gN gN -dN +dO gN gN gN @@ -11501,7 +11443,7 @@ gN gN gN gN -dN +dO gN gN gN @@ -11550,7 +11492,7 @@ aL gN gN gN -pW +gN aL aL aN @@ -12780,7 +12722,7 @@ fS Ft bo bo -bn +bo Ft fS bj @@ -13620,7 +13562,7 @@ gN gN gN gN -dN +dO gN gN cA @@ -14090,7 +14032,7 @@ gN fS bj bj -fu +gP bj bj bj @@ -14907,7 +14849,7 @@ cA cA cA cA -eX +tA cA cA cA @@ -16334,7 +16276,7 @@ bk bk bk eM -dM +we bj bV kZ @@ -17029,7 +16971,7 @@ gN lE gN gN -dN +dO gN cA cA @@ -17353,7 +17295,7 @@ cA cA cA cA -CO +cA cA tA cA @@ -20438,7 +20380,7 @@ gN gN gN gN -dN +dO gN gN gN @@ -20483,7 +20425,7 @@ fS fS fS Ht -fu +gP fS aL aN @@ -20734,7 +20676,7 @@ gN gN gN gN -dN +dO gN gN cJ diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm index ce9b700077..1e390bb6d7 100644 --- a/maps/groundbase/gb-misc.dmm +++ b/maps/groundbase/gb-misc.dmm @@ -2571,6 +2571,9 @@ /obj/effect/floor_decal/sign/small_8, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"pK" = ( +/turf/unsimulated/map/edge, +/area/space) "pT" = ( /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) @@ -2789,6 +2792,9 @@ "CK" = ( /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"CW" = ( +/turf/unsimulated/map, +/area/space) "Dh" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -2989,6 +2995,10 @@ "RV" = ( /turf/unsimulated/ai_visible, /area/ai_multicam_room) +"Sd" = ( +/obj/effect/overmap/bluespace_rift, +/turf/unsimulated/map, +/area/space) "Sj" = ( /obj/structure/bed/chair/holochair{ dir = 8 @@ -3125,6 +3135,10 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_game_room) +"YU" = ( +/obj/effect/overmap/bluespace_rift, +/turf/unsimulated/map, +/area/overmap) "YX" = ( /obj/effect/floor_decal/sign/small_e, /turf/simulated/floor/holofloor/wood, @@ -3242,43 +3256,6 @@ jZ jZ jZ jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ ap jZ jZ @@ -3306,6 +3283,43 @@ jZ jZ jZ jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ "} (2,1,1) = {" tD @@ -3383,43 +3397,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -3447,6 +3424,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (3,1,1) = {" @@ -3525,43 +3539,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -3589,6 +3566,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (4,1,1) = {" @@ -3667,43 +3681,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -3731,6 +3708,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (5,1,1) = {" @@ -3809,43 +3823,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -3873,6 +3850,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (6,1,1) = {" @@ -3951,43 +3965,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -4015,6 +3992,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (7,1,1) = {" @@ -4093,43 +4107,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -4157,6 +4134,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (8,1,1) = {" @@ -4235,43 +4249,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -4299,6 +4276,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (9,1,1) = {" @@ -4377,43 +4391,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -4441,6 +4418,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (10,1,1) = {" @@ -4519,43 +4533,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -4583,6 +4560,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (11,1,1) = {" @@ -4661,43 +4675,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -4725,6 +4702,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (12,1,1) = {" @@ -4803,43 +4817,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -4867,6 +4844,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (13,1,1) = {" @@ -4939,44 +4953,7 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA +YU EA EA EA @@ -5009,6 +4986,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (14,1,1) = {" @@ -5087,43 +5101,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -5151,6 +5128,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (15,1,1) = {" @@ -5229,43 +5243,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -5293,6 +5270,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (16,1,1) = {" @@ -5371,43 +5385,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -5435,6 +5412,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (17,1,1) = {" @@ -5513,43 +5527,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -5577,6 +5554,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (18,1,1) = {" @@ -5655,43 +5669,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -5719,6 +5696,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (19,1,1) = {" @@ -5797,43 +5811,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -5861,6 +5838,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (20,1,1) = {" @@ -5939,43 +5953,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -6003,6 +5980,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (21,1,1) = {" @@ -6081,43 +6095,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -6145,6 +6122,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (22,1,1) = {" @@ -6223,43 +6237,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -6287,6 +6264,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (23,1,1) = {" @@ -6365,43 +6379,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -6429,6 +6406,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (24,1,1) = {" @@ -6507,43 +6521,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -6571,6 +6548,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (25,1,1) = {" @@ -6636,6 +6650,7 @@ aa ap ap ap +<<<<<<< HEAD jZ EA EA @@ -6686,7 +6701,7 @@ EA EA EA EA -jZ +======= ap jZ jZ @@ -6701,17 +6716,70 @@ jZ jZ jZ jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ +ap jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ jZ "} @@ -6778,6 +6846,25 @@ aa ap ap ap +<<<<<<< HEAD +======= +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ EA EA @@ -6828,6 +6915,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -6856,6 +6944,20 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (27,1,1) = {" ul @@ -6920,6 +7022,7 @@ aa ap ap ap +<<<<<<< HEAD jZ EA EA @@ -6970,7 +7073,7 @@ EA EA EA EA -jZ +======= ap jZ jZ @@ -6985,17 +7088,70 @@ jZ jZ jZ jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ +ap jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ jZ "} @@ -7075,43 +7231,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -7139,6 +7258,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (29,1,1) = {" @@ -7217,43 +7373,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -7281,6 +7400,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (30,1,1) = {" @@ -7359,43 +7515,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -7423,6 +7542,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (31,1,1) = {" @@ -7501,43 +7657,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -7565,6 +7684,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (32,1,1) = {" @@ -7643,43 +7799,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -7707,6 +7826,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (33,1,1) = {" @@ -7785,43 +7941,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -7849,6 +7968,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (34,1,1) = {" @@ -7927,43 +8083,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -7991,6 +8110,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (35,1,1) = {" @@ -8069,43 +8225,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -8133,6 +8252,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (36,1,1) = {" @@ -8211,43 +8367,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -8275,6 +8394,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (37,1,1) = {" @@ -8353,43 +8509,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -8417,6 +8536,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (38,1,1) = {" @@ -8489,44 +8645,7 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA +YU EA EA EA @@ -8559,6 +8678,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (39,1,1) = {" @@ -8637,43 +8793,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -8701,6 +8820,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (40,1,1) = {" @@ -8779,43 +8935,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -8843,6 +8962,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (41,1,1) = {" @@ -8921,43 +9077,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -8985,6 +9104,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (42,1,1) = {" @@ -9063,43 +9219,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -9127,6 +9246,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (43,1,1) = {" @@ -9205,43 +9361,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -9269,6 +9388,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (44,1,1) = {" @@ -9347,43 +9503,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -9411,6 +9530,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (45,1,1) = {" @@ -9489,43 +9645,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -9553,6 +9672,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (46,1,1) = {" @@ -9631,43 +9787,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -9695,6 +9814,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (47,1,1) = {" @@ -9773,43 +9929,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -9837,6 +9956,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (48,1,1) = {" @@ -9915,43 +10071,6 @@ EA EA EA EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ ap jZ @@ -9979,6 +10098,43 @@ EA EA EA EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (49,1,1) = {" @@ -10058,43 +10214,6 @@ jZ jZ jZ jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ ap jZ EA @@ -10121,6 +10240,45 @@ EA EA EA EA +<<<<<<< HEAD +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ "} (50,1,1) = {" @@ -10202,6 +10360,7 @@ ap ap ap ap +<<<<<<< HEAD ap ap ap @@ -10238,6 +10397,8 @@ ap ap ap ap +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ EA EA @@ -10263,6 +10424,45 @@ EA EA EA EA +<<<<<<< HEAD +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ "} (51,1,1) = {" @@ -10275,6 +10475,14 @@ ap ap ap ap +<<<<<<< HEAD +ap +ap +ap +ap +ap +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo ap ap ap @@ -10328,11 +10536,7 @@ ap ap ap ap -ap -ap -ap -ap -ap +<<<<<<< HEAD jZ jZ jZ @@ -10405,6 +10609,85 @@ jZ jZ jZ jZ +======= +ap +ap +ap +ap +ap +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ "} (52,1,1) = {" @@ -10475,6 +10758,17 @@ ap ap ap ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -10520,6 +10814,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -10548,6 +10843,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (53,1,1) = {" as @@ -10617,6 +10931,17 @@ ap ap ap ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -10662,6 +10987,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -10690,6 +11016,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (54,1,1) = {" as @@ -10759,6 +11104,17 @@ ap ap ap ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -10804,6 +11160,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -10832,6 +11189,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (55,1,1) = {" as @@ -10901,6 +11277,17 @@ ap ap ap ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -10946,6 +11333,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -10974,6 +11362,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (56,1,1) = {" as @@ -11043,6 +11450,17 @@ ap ap ap ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -11088,6 +11506,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -11116,6 +11535,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (57,1,1) = {" as @@ -11185,6 +11623,17 @@ ap ap ap ap +pK +CW +CW +CW +CW +Sd +CW +CW +CW +pK +ap jZ EA EA @@ -11230,6 +11679,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -11258,6 +11708,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (58,1,1) = {" as @@ -11327,6 +11796,17 @@ ap ap ap ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -11372,6 +11852,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -11400,6 +11881,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (59,1,1) = {" as @@ -11469,6 +11969,17 @@ El El El ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -11514,6 +12025,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -11542,6 +12054,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (60,1,1) = {" as @@ -11611,6 +12142,17 @@ El El El ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -11656,6 +12198,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -11684,6 +12227,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (61,1,1) = {" as @@ -11753,6 +12315,17 @@ iO El El ap +pK +CW +CW +CW +CW +CW +CW +CW +CW +pK +ap jZ EA EA @@ -11798,6 +12371,7 @@ EA EA EA EA +<<<<<<< HEAD jZ ap ap @@ -11826,6 +12400,25 @@ ap ap ap ap +======= +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "} (62,1,1) = {" as @@ -11895,6 +12488,7 @@ iO El El ap +<<<<<<< HEAD jZ EA EA @@ -11940,6 +12534,80 @@ EA EA EA EA +======= +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo jZ ap ap @@ -12037,6 +12705,7 @@ iO El El ap +<<<<<<< HEAD jZ EA EA @@ -12146,39 +12815,14 @@ fZ fZ fZ xp +======= +ap +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap +<<<<<<< HEAD jZ EA EA @@ -12288,39 +12932,14 @@ fZ fZ fZ xp +======= +ap +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap +<<<<<<< HEAD jZ EA EA @@ -12367,6 +12986,371 @@ EA EA EA jZ +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +<<<<<<< HEAD +======= +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo +"} +(64,1,1) = {" +as +aJ +aJ +aJ +aJ +aJ +aJ +aJ +aJ +aJ +aK +dA +dF +dF +dF +dF +dF +dF +dF +dF +dF +dF +dB +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp +ap +ap +ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El +ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +<<<<<<< HEAD +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +ap +======= +ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +"} +(65,1,1) = {" +as +aJ +aJ +bd +aJ +aJ +aJ +aJ +aJ +aJ +aJ +dA +dF +dF +dF +ec +dF +dF +dF +dF +ec +dF +dB +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp +ap +ap +ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El +ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ +ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -12464,51 +13448,51 @@ El El ap jZ +EA +EA +EA +EA +EA +EA +EA +EA jZ +ap jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -12605,42 +13589,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -12747,42 +13731,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -12889,42 +13873,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -13031,42 +14015,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -13173,42 +14157,42 @@ iO El El ap +jZ +EA +EA +EA +EA +YU +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +YU +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -13315,42 +14299,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -13457,42 +14441,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -13599,42 +14583,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -13741,42 +14725,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -13883,42 +14867,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -14025,42 +15009,42 @@ iO El El ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap eI eI @@ -14167,42 +15151,42 @@ iO El El ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ ap eI eI diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 5ecfeebc18..a6107ae00a 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -441,7 +441,11 @@ lel /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/simulated/wall/r_wall, +/obj/machinery/computer/guestpass{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "bi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple, @@ -5657,7 +5661,7 @@ lel /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "nO" = ( -/obj/machinery/suit_cycler, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "nP" = ( @@ -8141,8 +8145,9 @@ lel phorontanks = 0 }, /obj/machinery/light_switch{ - dir = 1; - pixel_y = -30 + dir = 8; + pixel_x = 25; + pixel_y = -2 }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) @@ -8480,6 +8485,24 @@ lel /obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/westspur) +"uz" = ( +/obj/machinery/suit_cycler/exploration, +/obj/effect/floor_decal/industrial/outline{ + color = "#5c00ad" + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/gateway) +"uA" = ( +/obj/item/weapon/paper_bin{ + pixel_y = 7 + }, +/obj/structure/table/steel, +/obj/item/weapon/pen, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "uB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -9366,11 +9389,39 @@ lel /turf/simulated/wall, /area/groundbase/civilian/arrivals) "wI" = ( -/obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, /obj/machinery/status_display{ pixel_y = 32 }, @@ -9901,7 +9952,10 @@ lel /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/chamber) "xJ" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "xK" = ( @@ -11047,6 +11101,14 @@ lel /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) +"An" = ( +/obj/structure/table/rack/shelf, +/obj/item/device/cataloguer, +/obj/item/device/cataloguer, +/obj/item/device/cataloguer/compact, +/obj/item/device/cataloguer/compact, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "Ao" = ( /obj/structure/table/rack/shelf/steel, /obj/item/gunbox{ @@ -12055,11 +12117,20 @@ lel }, /area/groundbase/level1/northspur) "CN" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/tcomms) +======= +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/mineral/equipment_vendor/survey, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "CO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 9 @@ -12156,9 +12227,18 @@ lel /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) "CZ" = ( +<<<<<<< HEAD /obj/machinery/holoplant, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/tcomms) +======= +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Db" = ( /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level1/southeastspur) @@ -12258,12 +12338,16 @@ lel layer = 2.9 }, /obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical, -/obj/item/clothing/head/helmet/space/void/medical, /obj/machinery/door/window/brigdoor{ req_access = list(5) }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/medical, +/obj/item/clothing/suit/space/void/medical, +/obj/item/clothing/head/helmet/space/void/medical, +/obj/item/clothing/head/helmet/space/void/medical, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/gateway) "Dq" = ( @@ -12757,6 +12841,7 @@ lel /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "Ez" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; @@ -12765,6 +12850,12 @@ lel temperature = 80 }, /area/groundbase/command/tcomms) +======= +/obj/machinery/suit_cycler/engineering, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/gateway) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "EA" = ( /obj/machinery/computer/secure_data, /obj/machinery/light{ @@ -12838,6 +12929,14 @@ lel }, /turf/simulated/floor, /area/groundbase/civilian/cafe) +"EN" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/obj/machinery/suit_cycler/medical, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/gateway) "EO" = ( /obj/machinery/light/bigfloorlamp, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -15381,6 +15480,11 @@ lel }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) +"KQ" = ( +/obj/machinery/suit_cycler/security, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/gateway) "KR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -15546,8 +15650,23 @@ lel /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/hos) "Li" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 +======= +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) +"Lj" = ( +/obj/structure/bed/chair/backed_red{ + dir = 4 +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo }, /obj/machinery/alarm{ dir = 8 @@ -16296,6 +16415,10 @@ lel /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) +"MV" = ( +/obj/machinery/chemical_analyzer, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "MW" = ( /obj/item/weapon/stool/baystool/padded{ dir = 8 @@ -16829,6 +16952,26 @@ lel outdoors = 0 }, /area/maintenance/groundbase/level1/nwtunnel) +"Oi" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/item/device/bluespaceradio/groundbase_prelinked, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(43) + }, +/obj/item/device/mapping_unit, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/gateway) "Oj" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -17200,6 +17343,34 @@ lel "Pp" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level1/southeastspur) +"Pq" = ( +/obj/structure/table/rack/shelf, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = -4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "Pr" = ( /obj/structure/bed/chair/sofa/bench{ dir = 1 @@ -17373,13 +17544,7 @@ lel /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "PP" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "PQ" = ( @@ -17700,6 +17865,7 @@ lel /obj/structure/sign/painting/public{ pixel_x = -30 }, +<<<<<<< HEAD /turf/simulated/floor/wood, /area/groundbase/civilian/gameroom) "QG" = ( @@ -17713,6 +17879,13 @@ lel temperature = 80 }, /area/groundbase/command/tcomms) +======= +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/groundbase/civilian/arrivals) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "QH" = ( /obj/structure/table/reinforced, /obj/item/device/sleevemate, @@ -19123,6 +19296,13 @@ lel dir = 1 }, /obj/effect/floor_decal/corner/pink/full, +<<<<<<< HEAD +======= +/obj/machinery/vending/wallmed1/public{ + dir = 1; + pixel_y = -28 + }, +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) "TW" = ( @@ -19544,6 +19724,11 @@ lel }, /turf/simulated/wall/r_wall, /area/groundbase/command/ai/chamber) +"Vf" = ( +/obj/machinery/suit_cycler, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/gateway) "Vg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -20100,12 +20285,8 @@ lel }, /area/maintenance/groundbase/level1/nwtunnel) "WC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/computer/guestpass{ - dir = 1; - pixel_y = -22 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) @@ -20216,6 +20397,11 @@ lel /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) "WN" = ( +/obj/structure/table/rack, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, /obj/machinery/firealarm{ dir = 4 }, @@ -20294,10 +20480,14 @@ lel dir = 8; layer = 2.9 }, -/obj/item/clothing/mask/breath, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical, -/obj/item/clothing/head/helmet/space/void/medical, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, /obj/machinery/door/window/brigdoor/eastright{ req_access = list(5) }, @@ -29346,8 +29536,8 @@ lE sw pD XV -AZ -AZ +lE +lE Dt aC SQ @@ -29486,10 +29676,10 @@ lE Dp WY jW -XS +Oi hB -AZ -AZ +gO +MV Dt CK SQ @@ -29628,10 +29818,10 @@ fC pB pB aG -WC +pB bh -AZ -AZ +XS +Vf Dt cq KE @@ -29770,10 +29960,10 @@ kg KG XS GO -nO -lE -AZ -AZ +XS +XS +XS +Ez Dt Dt Dt @@ -29913,10 +30103,10 @@ MC KM FH PP +PP +xJ +EN lE -AZ -AZ -Eb Eb Eb Eb @@ -30054,11 +30244,11 @@ Ek WZ XS kK -nO +XS +XS +WC +KQ lE -AZ -AZ -AZ Eb Eb Eb @@ -30196,11 +30386,11 @@ XS FN XS kK -xJ +XS +XS +WC +uz lE -AZ -Eb -Eb Eb Eb Nv @@ -30330,19 +30520,19 @@ MO MO lE wI -nR -XS -XS -XS +CN +An +Pq +uA WN FN nR av tH +nO +Li +CZ lE -AZ -Eb -Eb Eb Eb Nv @@ -30482,9 +30672,9 @@ lE rl lE lE -Eb -Eb -Eb +lE +lE +lE Eb Eb Eb diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index a5a10c1c5d..9015f4d743 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -1922,21 +1922,6 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/room6) -"fI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level2/nw) "fJ" = ( /obj/machinery/light/small{ dir = 4 @@ -4174,10 +4159,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -7970,9 +7951,6 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/structure/disposalpipe/up{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 4 }, @@ -10148,11 +10126,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 1; - name = "Exploration"; - sortType = "Exploration" - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/nw) "Eh" = ( @@ -13310,10 +13284,6 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -23356,7 +23326,7 @@ TD Oc rP bY -fI +sN bY rl Rm @@ -23498,7 +23468,7 @@ IQ gR rP GY -fI +sN bY FF iB @@ -23640,7 +23610,7 @@ rP rP rP bY -fI +sN bY FF FF @@ -23782,7 +23752,7 @@ LT bY bY bY -fI +sN Vv bY bY @@ -23924,7 +23894,7 @@ pw bY bY pw -fI +sN pw bY bY diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 88cbfaf5bb..b7974b6692 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -3,12 +3,33 @@ lol ======= //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/turf/simulated/wall, -/area/groundbase/exploration/equipment) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/exploration/shuttlepad) "ab" = ( +<<<<<<< HEAD /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +======= +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) +"ac" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/exploration/shuttlepad) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ak" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin, @@ -42,32 +63,15 @@ lol /obj/item/device/radio, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) -"bh" = ( -/obj/machinery/atmospheric_field_generator/perma/underdoors, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/science{ - name = "Shuttle"; - req_one_access = null - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/groundbase/exploration) -"bi" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/exploration/equipment) "bk" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/closet/crate, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/cargo/office) "bm" = ( -/obj/structure/closet/secure_closet/pilot, -/turf/simulated/floor/tiled, +/obj/structure/table/steel, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/tiled/milspec, /area/groundbase/civilian/pilot) "bM" = ( /obj/structure/cable/yellow{ @@ -81,19 +85,6 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) -"bS" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "cb" = ( /obj/structure/bed/psych{ name = "couch" @@ -104,9 +95,6 @@ lol /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -128,19 +116,25 @@ lol }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) +<<<<<<< HEAD "cE" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) +======= +"cD" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "cY" = ( /obj/structure/cable/yellow{ icon_state = "32-8" }, -/obj/structure/disposalpipe/down{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/zpipe/down/supply{ dir = 8 }, @@ -167,25 +161,31 @@ lol }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/patient4) -"dE" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/science{ - name = "Exploration"; - req_one_access = list(19,43,67) +"dx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/bmarble, -/area/groundbase/exploration/equipment) -"dI" = ( -/obj/machinery/firealarm, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/monotile, /area/groundbase/civilian/pilot) +"dE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/exploration/shuttlepad) +"dI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/exploration/shuttlepad) "dN" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ @@ -204,20 +204,18 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient2) "dQ" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 +/obj/structure/hull_corner, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = -9 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/shuttle/groundbase/exploration) "dR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/pilot) +/obj/machinery/door/firedoor, +/obj/machinery/door/blast/multi_tile/three_tile_hor{ + id = "rp_ship_a_front_bd" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/groundbase/exploration) "dU" = ( /obj/structure/table/bench/marble, /obj/structure/cable/yellow{ @@ -231,15 +229,17 @@ lol /obj/effect/landmark/start/chemist, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) -"dW" = ( -/turf/simulated/floor/tiled, -/area/shuttle/groundbase/exploration) "dX" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/computer/ship/engines, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor, /area/shuttle/groundbase/exploration) "ed" = ( /turf/simulated/floor/virgo3c{ @@ -247,18 +247,8 @@ lol }, /area/groundbase/level3/nw) "ei" = ( -/obj/structure/panic_button{ - pixel_x = 32; - pixel_y = 32 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 8; - frequency = 1380; - id_tag = "ex_docker"; - pixel_x = 27; - pixel_y = 4 - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/steel_ridged, /area/shuttle/groundbase/exploration) "eo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -298,6 +288,21 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +<<<<<<< HEAD +======= +"fc" = ( +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = 1 + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/shuttle/groundbase/exploration) +"fn" = ( +/obj/structure/table/steel, +/obj/random/paicard, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "fu" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/chemist, @@ -354,6 +359,20 @@ lol /obj/machinery/light/floortube, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/cargo/office) +"gi" = ( +/obj/effect/landmark/start/pilot, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "pilotA"; + pixel_x = 27; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/milspec, +/area/groundbase/civilian/pilot) "gl" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -362,26 +381,33 @@ lol /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) -"gt" = ( -/turf/simulated/wall, -/area/groundbase/level3/nw) -"gu" = ( -/obj/structure/bed/chair/shuttle{ +"gs" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/power/apc/hyper, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) +"gu" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 }, -/turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "gx" = ( -/obj/machinery/firealarm{ - dir = 4 +/obj/machinery/door/airlock/science{ + name = "Shuttle"; + req_one_access = null }, -/obj/structure/closet/secure_closet/guncabinet/excursion, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/groundbase/exploration) "gR" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -400,6 +426,22 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +<<<<<<< HEAD +======= +"gT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/exploration/shuttlepad) +"gV" = ( +/obj/structure/railing, +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "gZ" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -410,12 +452,6 @@ lol }, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) -"hb" = ( -/obj/effect/mouse_hole_spawner{ - dir = 4 - }, -/turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/level3/nw) "hl" = ( /turf/simulated/wall, /area/groundbase/level3/escapepad) @@ -425,12 +461,22 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +<<<<<<< HEAD "hC" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) +======= +"hM" = ( +/obj/structure/railing, +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "hN" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/medical, @@ -441,19 +487,18 @@ lol /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) "hQ" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/obj/machinery/button/remote/blast_door{ + id = "rp_ship_a_front_bd"; + name = "Forward Blastdoors"; + pixel_y = 25; + req_one_access = list(67) + }, +/turf/simulated/floor/tiled/monotile, +/area/shuttle/groundbase/exploration) "ik" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -474,11 +519,12 @@ lol /turf/simulated/floor, /area/groundbase/level3/escapepad) "iN" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/civilian/pilot) +/turf/simulated/floor/tiled/monotile, +/area/shuttle/groundbase/exploration) "iQ" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -505,39 +551,17 @@ lol /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "jc" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -27 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/shuttle/groundbase/exploration) -"jo" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, +/turf/simulated/wall, /area/groundbase/exploration/shuttlepad) -"jp" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 +"jo" = ( +/obj/machinery/computer/ship/engines{ + dir = 1 }, -/obj/machinery/disposal, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/shuttle/groundbase/exploration) +"jp" = ( +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/groundbase/exploration/shuttlepad) "jv" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level3/nw) @@ -561,23 +585,11 @@ lol /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/cmo) "jX" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) -"jY" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/exploration/shuttlepad) "km" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -645,13 +657,23 @@ lol /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) -"ma" = ( -/obj/structure/closet/secure_closet/sar, +"lT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/light, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/groundbase/civilian/pilot) +"ma" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -27 + }, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) "me" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/medical, @@ -687,18 +709,15 @@ lol /turf/simulated/wall/r_wall, /area/groundbase/level3/escapepad) "mU" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) "nb" = ( @@ -757,11 +776,23 @@ lol /obj/machinery/light, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) +<<<<<<< HEAD "nN" = ( /obj/machinery/light, /obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +======= +"nD" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "nR" = ( /obj/effect/mouse_hole_spawner, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -786,6 +817,17 @@ lol /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"oi" = ( +/obj/machinery/atmospheric_field_generator/perma/underdoors, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/science{ + frequency = null; + name = "Shuttle"; + req_one_access = null + }, +/obj/effect/map_helper/airlock/door/simple, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/groundbase/exploration) "ok" = ( /obj/random/mob/bird, /turf/simulated/floor/outdoors/grass/forest/virgo3c, @@ -840,13 +882,6 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) -"oQ" = ( -/obj/structure/fuel_port, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/shuttle/groundbase/exploration) "oR" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/machinery/firealarm{ @@ -871,12 +906,11 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) "pd" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/alarm{ +/obj/structure/bed/chair/shuttle{ dir = 4 }, /turf/simulated/floor/tiled, -/area/groundbase/civilian/pilot) +/area/shuttle/groundbase/exploration) "pe" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/light/floortube{ @@ -887,10 +921,6 @@ lol "pf" = ( /turf/simulated/open/virgo3c, /area/groundbase/level3/sw/open) -"pm" = ( -/obj/machinery/computer/shuttle_control/explore/gbexplo, -/turf/simulated/floor/tiled, -/area/shuttle/groundbase/exploration) "pq" = ( /obj/machinery/button/remote/airlock{ dir = 4; @@ -911,12 +941,6 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) -"pv" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/exploration/shuttlepad) "pC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -927,6 +951,7 @@ lol }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) +<<<<<<< HEAD "pL" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -938,6 +963,22 @@ lol edge_blending_priority = -1 }, /area/groundbase/exploration/shuttlepad) +======= +"pP" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/kitchen) +"pR" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/pilot) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "pY" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall, @@ -996,12 +1037,19 @@ lol }, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) -"rb" = ( -/obj/machinery/ion_engine{ - dir = 1 +"qW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/simulated/shuttle/plating/airless, -/area/shuttle/groundbase/exploration) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/pilot) +"rb" = ( +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/exploration/shuttlepad) "re" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -1011,11 +1059,15 @@ lol }, /area/groundbase/level3/escapepad) "rh" = ( -/obj/effect/mouse_hole_spawner{ - dir = 1 +/obj/structure/bed/chair/shuttle{ + dir = 8 }, -/turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/level3/nw) +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 27 + }, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) "ro" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -1039,17 +1091,34 @@ lol /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) "rV" = ( -/obj/item/weapon/paper_bin{ - pixel_y = 7 +/obj/machinery/power/apc{ + dir = 8 }, -/obj/structure/table/steel, -/obj/item/weapon/pen, -/obj/machinery/light, -/obj/machinery/recharger{ - pixel_y = 4 +/obj/structure/cable/yellow{ + icon_state = "0-2" }, +<<<<<<< HEAD /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) +======= +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "expshuttle_dock"; + pixel_y = 19; + req_one_access = list(19,43,67) + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 + }, +/area/groundbase/exploration/shuttlepad) +"sa" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "sb" = ( /obj/machinery/power/apc{ dir = 8 @@ -1068,6 +1137,14 @@ lol /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"sL" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/shuttle/groundbase/exploration) "sP" = ( /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 @@ -1095,48 +1172,45 @@ lol /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"ta" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) "to" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "tu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) "tM" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level3/escapepad) "tU" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) -"tY" = ( -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/exploration/shuttlepad) +"tY" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/shuttle/groundbase/exploration) "tZ" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level3/se) @@ -1145,49 +1219,36 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "um" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 +/obj/machinery/shipsensors{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/simulated/floor/tiled, +/turf/simulated/shuttle/plating/airless, /area/shuttle/groundbase/exploration) "uF" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/handrail{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level3/nw) +/turf/simulated/shuttle/plating/airless, +/area/shuttle/groundbase/exploration) "uG" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/exploration/shuttlepad) -"uH" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/yellow, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/monotile, /area/shuttle/groundbase/exploration) "uP" = ( -/obj/machinery/suit_cycler/pilot, +/obj/structure/table/steel, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "uU" = ( -/obj/effect/landmark/start/pf, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/groundbase/civilian/pilot) "vp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/light{ + dir = 1 }, -/obj/effect/landmark/start/explorer, +/obj/machinery/suit_cycler/pilot, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/groundbase/civilian/pilot) "vs" = ( /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 @@ -1209,22 +1270,17 @@ lol /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) "vA" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, /turf/simulated/floor/reinforced/virgo3c{ edge_blending_priority = -1 }, /area/groundbase/exploration/shuttlepad) "vV" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +/obj/structure/handrail{ + dir = 1 }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 27 - }, -/obj/machinery/light, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "vZ" = ( @@ -1244,21 +1300,13 @@ lol /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "wm" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/level3/nw) "wn" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, +/obj/machinery/firealarm, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/shuttle/groundbase/exploration) +/area/groundbase/civilian/pilot) "ws" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1270,11 +1318,14 @@ lol /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) "wu" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/simulated/wall/rshull, -/area/shuttle/groundbase/exploration) +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/pilot) "wB" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -1310,6 +1361,14 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +"xa" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/outdoors/sidewalk/virgo3c, +/area/groundbase/level3/nw) "xp" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1330,6 +1389,16 @@ lol }, /turf/simulated/open, /area/groundbase/cargo/office) +"xw" = ( +/obj/structure/table/steel, +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/pilot) "xD" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1342,12 +1411,15 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) "xH" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/machinery/camera/network/exploration{ - dir = 1 +/obj/machinery/power/apc/hyper{ + dir = 8; + req_access = list(11,67) }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/shuttle/groundbase/exploration) "xI" = ( /obj/structure/table/glass, /turf/simulated/floor/carpet, @@ -1356,17 +1428,11 @@ lol /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) "xO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/effect/mouse_hole_spawner{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/pilot) +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/groundbase/level3/nw) "xX" = ( /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) @@ -1426,25 +1492,22 @@ lol /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) "zF" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) -"zG" = ( -/obj/machinery/suit_cycler/exploration, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/computer/ship/sensors{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/shuttle/groundbase/exploration) +"zG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/exploration/shuttlepad) "zJ" = ( /obj/structure/table/reinforced, /obj/structure/cable/yellow{ @@ -1455,15 +1518,14 @@ lol /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) "zK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/closet/walllocker_double{ + dir = 8; + name = "misc equipment cabinet"; + pixel_x = -32 }, +/obj/item/weapon/storage/box/nifsofts_pilot, +/obj/item/device/multitool/groundbase_buffered, +/obj/structure/table/steel, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "zL" = ( @@ -1477,6 +1539,21 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +<<<<<<< HEAD +======= +"zW" = ( +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/obj/machinery/vending/wallmed1/public{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 + }, +/area/groundbase/level3/escapepad) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Aa" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -1486,15 +1563,10 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient3) "Ak" = ( -/obj/machinery/recharge_station, -/obj/machinery/alarm{ - pixel_y = 28 +/obj/structure/panic_button{ + pixel_x = 32 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/eris/dark/panels, /area/shuttle/groundbase/exploration) "As" = ( /obj/structure/grille, @@ -1504,6 +1576,7 @@ lol }, /turf/simulated/floor, /area/groundbase/medical/patient2) +<<<<<<< HEAD "Bd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -1512,11 +1585,23 @@ lol edge_blending_priority = -1 }, /area/groundbase/exploration/shuttlepad) +======= +"AY" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/cosmosdouble{ + icon_state = "dobulesheetcosmos" + }, +/turf/simulated/floor/wood, +/area/groundbase/dorms/bathroom) +"AZ" = ( +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Bg" = ( /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) "Bo" = ( -/obj/machinery/computer/ship/sensors, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "Bw" = ( @@ -1566,6 +1651,37 @@ lol "BH" = ( /turf/simulated/wall, /area/groundbase/medical/patient3) +<<<<<<< HEAD +======= +"BM" = ( +/obj/structure/catwalk, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) +"Cc" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) +"Ck" = ( +/obj/structure/table/woodentable, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/turf/simulated/floor/carpet/retro, +/area/groundbase/dorms/bathroom) +"Ct" = ( +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Cv" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -1574,6 +1690,21 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) +"CJ" = ( +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/groundbase/civilian/pilot) +"CP" = ( +/obj/structure/handrail, +/obj/machinery/portable_atmospherics/canister, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) "CS" = ( /obj/item/device/radio/intercom{ pixel_y = -24 @@ -1583,41 +1714,75 @@ lol }, /area/groundbase/level3/escapepad) "CU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/handrail{ + dir = 8 }, /turf/simulated/floor/tiled, +<<<<<<< HEAD /area/groundbase/exploration/equipment) "Dm" = ( /obj/structure/bed/chair/shuttle{ dir = 1 - }, -/turf/simulated/floor/tiled, +======= /area/shuttle/groundbase/exploration) -"Dy" = ( -/obj/effect/floor_decal/industrial/warning{ +"De" = ( +/obj/structure/curtain/open/shower, +/obj/machinery/shower{ + pixel_y = 16 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/groundbase/dorms/bathroom) +"Dj" = ( +/obj/effect/landmark/start/pilot, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "pilotB"; + pixel_x = -27; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo + }, +/turf/simulated/floor/tiled/milspec, +/area/groundbase/civilian/pilot) +"Dm" = ( +/turf/simulated/floor/tiled, +<<<<<<< HEAD +/area/shuttle/groundbase/exploration) +======= +/area/groundbase/civilian/pilot) +"Dq" = ( +/obj/machinery/door/airlock{ + id_tag = "pilotA"; + name = "A" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/pilot) +"Dw" = ( +/obj/machinery/firealarm{ dir = 4 }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 4; - frequency = 1380; - id_tag = "expshuttle_dock"; - pixel_x = -19; - req_one_access = list(19,43,67) - }, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/exploration/shuttlepad) +/turf/simulated/floor/wood, +/area/groundbase/dorms/bathroom) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo +"Dy" = ( +/obj/machinery/computer/ship/helm, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/shuttle/groundbase/exploration) "DB" = ( /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) "DE" = ( -/obj/machinery/shipsensors{ - dir = 1 - }, -/obj/machinery/light, -/turf/simulated/shuttle/plating/airless, +/turf/simulated/floor/tiled/monotile, /area/shuttle/groundbase/exploration) "DI" = ( /obj/structure/cable/yellow{ @@ -1658,31 +1823,37 @@ lol /turf/simulated/open, /area/groundbase/medical/uhallway) "Ea" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/groundbase/exploration/shuttlepad; - base_turf = /turf/simulated/floor/reinforced/virgo3c; - docking_controller = "expshuttle_dock"; - landmark_tag = "gb_excursion_pad"; - name = "Excursion Shuttlepad" +/obj/structure/handrail, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "ex_docker"; + pixel_x = 27; + pixel_y = 4 }, -/obj/effect/overmap/visitable/ship/landable/gbexplo, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "Ef" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, +/obj/structure/handrail, /turf/simulated/floor/tiled, +<<<<<<< HEAD /area/groundbase/exploration/equipment) +======= +/area/shuttle/groundbase/exploration) +"Em" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Es" = ( -/obj/structure/closet/secure_closet/pathfinder{ - req_access = list(62,43,67) - }, -/obj/item/device/bluespaceradio/groundbase_prelinked, -/obj/machinery/camera/network/exploration, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/groundbase/civilian/pilot) "Ev" = ( /obj/machinery/camera/network/cargo, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, @@ -1740,10 +1911,6 @@ lol /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -1784,9 +1951,6 @@ lol /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1795,63 +1959,31 @@ lol }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level3/nw) +"FD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) "FO" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock{ - name = "Pilots Office"; - req_access = list(67) - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/bmarble, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "FV" = ( -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = -6 - }, /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = -6 - }, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, /obj/machinery/light_switch{ - dir = 1; - pixel_y = -30 + dir = 8; + pixel_x = 30 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/groundbase/civilian/pilot) "Gb" = ( /obj/structure/railing/grey{ dir = 8 @@ -1878,25 +2010,17 @@ lol /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "GU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/civilian/pilot) "GW" = ( /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level3/escapepad) "Hm" = ( -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/exploration/shuttlepad) +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/shuttle/groundbase/exploration) "Hn" = ( /obj/machinery/light{ dir = 8 @@ -1911,14 +2035,13 @@ lol /area/groundbase/medical/patio) "HE" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" + }, +/obj/machinery/alarm{ + pixel_y = 28 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start/fieldmedic, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/shuttle/groundbase/exploration) "HI" = ( /obj/machinery/light{ dir = 4 @@ -1970,43 +2093,12 @@ lol /turf/simulated/wall, /area/groundbase/medical/uhallway) "IC" = ( -/obj/structure/table/rack/shelf, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + icon_state = "0-8" }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/shuttle/groundbase/exploration) "ID" = ( /obj/structure/table/glass, /obj/item/weapon/clipboard, @@ -2023,12 +2115,6 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) -"IG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "IH" = ( /obj/effect/shuttle_landmark/premade/groundbase, /turf/simulated/floor/virgo3c{ @@ -2043,30 +2129,29 @@ lol /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) "Jh" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/eris/dark/panels, /area/shuttle/groundbase/exploration) "Jk" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 30 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/pilot) +/turf/simulated/floor/tiled/eris/dark/panels, +/area/shuttle/groundbase/exploration) "Jl" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) +"Jw" = ( +/obj/machinery/door/airlock{ + id_tag = "pilotB"; + name = "B" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/pilot) "Jy" = ( /obj/structure/bed/chair{ dir = 4 @@ -2083,6 +2168,12 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"JI" = ( +/obj/machinery/ion_engine{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless, +/area/shuttle/groundbase/exploration) "JL" = ( /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/se) @@ -2095,9 +2186,13 @@ lol /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) "Ka" = ( -/obj/structure/closet/secure_closet/sar, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/obj/machinery/door/airlock/science{ + name = "Shuttle"; + req_one_access = null + }, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/tiled/steel_ridged, +/area/shuttle/groundbase/exploration) "Kh" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -2107,12 +2202,11 @@ lol /turf/simulated/floor, /area/groundbase/medical/patient1) "Kj" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/area/groundbase/level3/nw) "Kl" = ( /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) @@ -2120,8 +2214,19 @@ lol /turf/simulated/open/virgo3c, /area/groundbase/level3/nw/open) "KG" = ( +/obj/structure/fuel_port{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, +<<<<<<< HEAD /area/groundbase/exploration/equipment) +======= +/area/shuttle/groundbase/exploration) +"KN" = ( +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "KZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2160,6 +2265,16 @@ lol /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"Ma" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/closet/walllocker_double/east, +/obj/item/weapon/tank/phoron, +/obj/item/weapon/tank/phoron, +/obj/item/weapon/tool/crowbar/red, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) "Mc" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -2169,6 +2284,21 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient3) +<<<<<<< HEAD +======= +"Ml" = ( +/obj/machinery/light/floortube{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/shuttle/groundbase/exploration) +"Ms" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Mz" = ( /obj/structure/railing{ dir = 4 @@ -2201,31 +2331,47 @@ lol /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +"MP" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/shuttle/groundbase/exploration) "MU" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) "MV" = ( -/obj/structure/closet/secure_closet/pilot, -/obj/machinery/light, +/obj/structure/table/steel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "Nb" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 27 +/obj/effect/shuttle_landmark{ + base_area = /area/groundbase/exploration/shuttlepad; + base_turf = /turf/simulated/floor/reinforced/virgo3c; + docking_controller = "expshuttle_dock"; + landmark_tag = "gb_excursion_pad"; + name = "Excursion Shuttlepad" }, +/obj/effect/overmap/visitable/ship/landable/gbexplo, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "Nf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, /area/groundbase/civilian/pilot) "No" = ( /obj/structure/closet/secure_closet/paramedic, @@ -2238,45 +2384,46 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "NX" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) -"Oc" = ( -/obj/machinery/light, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/area/groundbase/exploration/shuttlepad) -"Og" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/groundbase/civilian/pilot) +"Oc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/landmark{ - name = "lightsout" - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) -"Oh" = ( -/obj/effect/floor_decal/industrial/warning{ dir = 4 }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 +/turf/simulated/floor/tiled, +/area/groundbase/civilian/pilot) +"Og" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/area/groundbase/exploration/shuttlepad) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) +"Oh" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor, +/area/shuttle/groundbase/exploration) "Ok" = ( /obj/structure/table/rack, /obj/item/weapon/storage/toolbox/mechanical, @@ -2286,6 +2433,16 @@ lol /obj/machinery/alarm, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"Os" = ( +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/groundbase/civilian/pilot) "OD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2296,21 +2453,7 @@ lol /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/virgo3c, -/area/groundbase/medical/patio) -"OI" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +<<<<<<< HEAD /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) <<<<<<< HEAD @@ -2325,6 +2468,10 @@ lol /obj/item/weapon/storage/box/nifsofts_pilot, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) +======= +/turf/simulated/floor/tiled/virgo3c, +/area/groundbase/medical/patio) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "OT" = ( /obj/structure/lattice, /turf/simulated/open/virgo3c, @@ -2337,9 +2484,15 @@ lol /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) "Pf" = ( -/obj/machinery/mineral/equipment_vendor/survey, +/obj/machinery/power/smes/buildable{ + charge = 500000 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/light, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/shuttle/groundbase/exploration) "Ph" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2348,6 +2501,22 @@ lol /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +<<<<<<< HEAD +======= +"Pn" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/groundbase/exploration) +"Pq" = ( +/obj/structure/table/steel, +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Pr" = ( /obj/machinery/button/remote/airlock{ dir = 8; @@ -2429,6 +2598,14 @@ lol /obj/machinery/status_display, /turf/simulated/wall, /area/groundbase/level3/escapepad) +"Qo" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) "Qq" = ( /obj/structure/railing{ dir = 8 @@ -2498,12 +2675,22 @@ lol }, /area/groundbase/level3/escapepad) "RM" = ( -/obj/machinery/photocopier/faxmachine{ - department = "Exploration" +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/structure/table/steel, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock{ + name = "Pilots Office"; + req_access = list(67) + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/pilot) "RY" = ( /obj/structure/railing/grey, /turf/simulated/open, @@ -2606,18 +2793,17 @@ lol /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) "Tk" = ( -/obj/effect/landmark/start/pilot, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/pilot) -"Ts" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/exploration/equipment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/area/groundbase/civilian/pilot) "Tv" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin, @@ -2630,22 +2816,33 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient3) "TH" = ( -/obj/machinery/power/apc, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/cable/yellow, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/pilot) +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level3/nw) "TT" = ( /obj/machinery/atmospheric_field_generator/perma/underdoors, /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/science{ - frequency = null; name = "Shuttle"; req_one_access = null }, -/obj/effect/map_helper/airlock/door/simple, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/groundbase/exploration) "TV" = ( @@ -2672,10 +2869,6 @@ lol /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -2695,17 +2888,14 @@ lol /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "Un" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 +/obj/structure/bed/chair/shuttle{ + dir = 1 }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/hand_labeler, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/alarm{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/turf/simulated/floor/tiled/eris/dark/panels, +/area/shuttle/groundbase/exploration) "Vh" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm, @@ -2728,13 +2918,9 @@ lol /area/groundbase/medical/paramedic) "Vz" = ( /obj/structure/bed/chair/shuttle{ - dir = 4 + dir = 1 }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -27 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/eris/dark/panels, /area/shuttle/groundbase/exploration) "VB" = ( /obj/structure/table/bench/marble, @@ -2748,14 +2934,6 @@ lol /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) -"VH" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/exploration/shuttlepad) "VJ" = ( /obj/structure/railing/grey{ dir = 4 @@ -2786,6 +2964,7 @@ lol }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +<<<<<<< HEAD "Wm" = ( /obj/structure/closet/secure_closet/pilot, /obj/machinery/light{ @@ -2793,13 +2972,20 @@ lol }, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) +======= +"Wh" = ( +/obj/structure/railing, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/kitchen) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Wr" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/effect/landmark/start/explorer, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/exploration/shuttlepad) "WF" = ( /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, @@ -2831,18 +3017,18 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient2) "XC" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/virgo3c{ edge_blending_priority = -1 }, /area/groundbase/exploration/shuttlepad) +"XL" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/nw/open) "XT" = ( -/obj/machinery/computer/ship/helm, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "Yy" = ( @@ -2854,18 +3040,13 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "YJ" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start/fieldmedic, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable/yellow, +/turf/simulated/floor/virgo3c, +/area/shuttle/groundbase/exploration) "YK" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, /turf/simulated/floor/reinforced/virgo3c{ edge_blending_priority = -1 @@ -2914,13 +3095,12 @@ lol /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/unexplored/outdoors) "Zp" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/turf/simulated/floor/tiled, +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/brown, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/milspec, /area/groundbase/civilian/pilot) "Zv" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -2933,23 +3113,15 @@ lol /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "Zx" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/computer/shuttle_control/explore/gbexplo{ + dir = 4 }, -/turf/simulated/floor/reinforced/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/exploration/shuttlepad) +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/shuttle/groundbase/exploration) "ZH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -4847,17 +5019,17 @@ Zo Zo Zo Xv -Qa -Qa -Qa -qO -qO -qO -qO -qO -Qa -Qa -Qa +Xv +Xv +Xv +Zo +Zo +Zo +Zo +Zo +Xv +Xv +Xv Xv Xv Xv @@ -4984,23 +5156,23 @@ jv jv Zo Zo +qO +qO +qO +qO +qO +qO +qO +qO +qO +qO +qO +Zo +Zo +Zo +Zo Xv Xv -Xv -Xv -Xv -Qa -qO -qO -qO -qO -qO -qO -qO -qO -qO -Qa -Xv ok Xv Xv @@ -5126,12 +5298,6 @@ jv jv Zo Zo -Xv -Xv -Xv -Xv -Xv -Qa qO fz fz @@ -5140,8 +5306,14 @@ fz fz fz fz +fz +fz qO -Qa +Zo +Zo +Zo +Zo +Xv Xv Xv Xv @@ -5268,22 +5440,29 @@ jv Zo Zo Xv -Xv -Xv -Xv -Xv -Xv -Qa qO fz +<<<<<<< HEAD bm OJ pd Tk +======= +uP +zK +MV +xw +fz +Os +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo bm fz qO -qO +Zo +Zo +Zo +Zo +Zo Xv Xv Xv @@ -5410,23 +5589,23 @@ jv Zo Zo Xv -Xv -Xv -Xv -Xv -Xv -qO qO fz -Wm -Tk -uP -Tk -MV +uU +Dm +Nf +qW +Dq +gi +Zp fz qO -qO -Qa +Zo +Zo +Zo +Zo +Zo +Xv Qa qO qO @@ -5552,21 +5731,21 @@ jv Zo Xv Xv -Xv -Xv -Xv -Xv -Xv qO -nR fz -dI -dR +vp +Es +dx +lT +fz +fz +fz +fz xO -Nf -TH -fz -rh +Zo +Zo +Zo +qO qO qO qO @@ -5694,21 +5873,21 @@ Zo Zo Xv Xv -Xv -Xv -Xv -Xv -Xv -qO qO fz -Zp -Jk -zK -Zp +wn +FO +NX +pR +Jw +Dj Zp fz qO +Zo +Zo +Zo +qO hl Qn it @@ -5836,20 +6015,20 @@ Zo Xv Xv Xv -Xv -Xv -Xv -Xv -Xv -qO qO fz +wu +FV +Oc +Dm fz +CJ +bm fz -FO -fz -fz -fz +qO +Zo +Zo +Zo qO pY Ii @@ -5977,21 +6156,21 @@ Zo Zo Zo Xv -Xv -Xv -Xv -Xv -Xv Zo qO +fz +fz +fz +RM +fz +fz +fz +fz +fz qO -qO -qO -iN -GU -iN -qO -qO +Zo +Zo +Zo qO hl fy @@ -6118,19 +6297,19 @@ Zo Zo Xv Xv -Xv -Qa -Qa -Qa qO qO qO qO qO +GU +Tk +GU +qO +qO qO qO qO -MF qO Qa Qa @@ -6260,19 +6439,19 @@ Zo Zo Xv Xv -Xv -Qa +qO +jc +jc +jp qO qO -qO -qO -hb +Fx +wm qO qO qO qO qO -MF qO qO qO @@ -6401,19 +6580,19 @@ Xv Xv Xv Xv -Xv -Xv -qO +Zo qO +jc +rV aa aa -aa -aa -aa -aa -aa -qO -qO +SG +TH +xa +xa +xa +xa +xa tu SG SG @@ -6541,21 +6720,21 @@ Xv Xv Xv Xv -Xv -Xv -Xv -Xv qO qO -aa -tU +qO +qO jp +tU +tU +tU +qO Kj wm -xH -aa qO qO +qO +wm MF Gf tM @@ -6683,20 +6862,20 @@ Xv Xv Xv Xv -Xv -Xv -Xv -Xv qO -qO -aa -bS -IG -vp +ac Wr -nN -aa -qO +Wr +Wr +Wr +Wr +Wr +Wr +zG +Wr +Wr +Wr +gT qO MF tM @@ -6825,20 +7004,20 @@ Xv Xv Xv Xv -Xv -Xv -Xv -Zo qO -qO -aa -tU -IG -zG -ma -Ka -aa -bi +dE +rb +rb +rb +rb +um +PH +PH +TT +PH +PH +MP +XC qO MF tM @@ -6967,21 +7146,21 @@ Xv Xv Xv Xv -Xv -Xv -Xv -Zo qO -qO -aa -zF -Ef +dE +rb +rb +dQ +PH +dX +PH +CP Og YJ -HE -dE -Ts -uF +PH +PH +XC +qO mU tM Sp @@ -7109,20 +7288,20 @@ Xv Xv Xv Xv -Xv -Xv -Xv -Zo qO -qO -aa -NX +dE +rb +PH +PH +PH +XT +PH KG IC Pf -FV -aa -bi +PH +JI +XC qO Fx tM @@ -7251,20 +7430,20 @@ Xv Xv Xv Xv -Xv -Xv -Xv -Zo qO -qO -aa -hQ -uU +dE +dQ +PH +ma +ma +XT +PH +HE CU -KG -rV -aa -qO +Ma +PH +PH +XC qO Fx tM @@ -7393,20 +7572,20 @@ Xv Xv Xv Xv -Xv -Xv -Zo -Zo qO -qO -aa -Es +dE +PH +PH +Pn +pd +vV +PH gx -Un -dQ -RM -aa -qO +PH +PH +PH +sL +XC qO Fx tM @@ -7535,20 +7714,20 @@ Xv Xv Xv Xv -Xv -Zo -Zo -qO -qO -qO -aa -aa -aa -aa -aa -aa -aa qO +dE +PH +hQ +uG +DE +Jh +xH +Jk +Un +PH +JI +rb +XC qO Fx tM @@ -7677,20 +7856,20 @@ Xv Xv Xv Xv -Xv -Zo -Zo qO -qO -qO -aa +dE +dR +uG +uG +DE +Ml Zx Hm tY -Hm -Oc -gt -qO +PH +PH +rb +XC qO Fx mw @@ -7819,21 +7998,21 @@ Xv Xv Xv Zo -Zo -Zo -Zo qO -pv -jY +dE +ei +uG +uG +DE Dy -jY -pL +tY +Hm jo Oh -Oh -Oh +rb +rb XC -SG +qO ZH GW Sp @@ -7961,20 +8140,20 @@ Xv Xv Xv Xv -Zo -Zo -Zo qO +dE +ei +uG uG DE +fc +zF +Hm +tY PH PH -bh -PH -PH -PH -PH -Bd +rb +XC qO cf tM @@ -8103,20 +8282,20 @@ Xv Xv Zo Zo -Zo -Zo -Zo qO +dE +PH +iN uG -PH -PH +DE +Jh Ak Jh Vz -jc PH +JI rb -Bd +XC ER Uf Gf @@ -8245,21 +8424,21 @@ Xv Xv Xv Zo -Zo -Zo -Zo qO -uG -jX -pm -Dm -Jh -wn -gu -wu +dE PH -Bd -OI +PH +Cc +jX +vV +PH +Ka +PH +PH +PH +MP +XC +ZH xM tM Sp @@ -8387,20 +8566,20 @@ Xv Xv Zo Zo -Zo -Zo -Zo qO -uG -jX -XT -Dm -hC -oQ -uH -um +dE +gu PH -Bd +rh +rh +XT +PH +XT +ta +vV +PH +PH +XC cY Kr tM @@ -8529,20 +8708,20 @@ Xv Xv Zo Zo -Zo -Zo -Zo qO -uG -jX +dE +rb +PH +PH +PH Bo -Dm -dW -cE -cE PH +Ef +XT +vV PH -Bd +JI +XC Kr Kr Kr @@ -8671,20 +8850,20 @@ Xv Zo Zo Zo -Zo -vs -vs qO -uG +dE +rb +rb +gu PH dX -ei +PH Ea Nb vV PH -rb -Bd +PH +XC Kr Kr Kr @@ -8813,20 +8992,20 @@ Zo Zo Zo Zo -Zo -vs -vs qO -uG +dE +rb +rb +rb +rb +uF PH PH -PH -TT +oi PH PH -PH -PH -Bd +sL +XC Kr Kr Kr @@ -8955,19 +9134,19 @@ Zo Zo Zo vs -vs -vs -vs ed +dI +YK +YK +YK +YK +YK +YK +YK +YK +YK +YK YK -VH -VH -VH -VH -VH -VH -VH -VH vA Kr Kr @@ -9097,18 +9276,18 @@ Zo Zo Zo vs -vs -vs -vs +ed +ed +ed ed Kr Kr Kr Kr -Kr -Kr -Kr -Kr +QO +By +By +ly Kr Kr Kr @@ -9247,10 +9426,10 @@ Kr Kr Kr Kr -Kr -Kr -Kr -Kr +QO +By +By +ly Kr Kr Kr @@ -9389,10 +9568,10 @@ Kr Kr Kr Kr -Kr -Kr -Kr -Kr +QO +By +By +ly Kr Kr Kr @@ -9531,10 +9710,10 @@ Kr Kr Kr Kr -Kr -Kr -Kr -Kr +QO +By +By +ly Kr Kr Kr @@ -9673,10 +9852,10 @@ Kr Kr Kr Kr -Kr -Kr -Kr -Kr +QO +By +By +ly Kr Kr Kr @@ -9815,10 +9994,10 @@ Kr Kr Kr Kr -Kr -Kr -Kr -Kr +QO +By +By +ly Kr Kr Kr @@ -9952,21 +10131,21 @@ Zo Zo Zo Zo -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +FD Kr Kr Kr @@ -10108,7 +10287,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -10250,7 +10429,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -10392,7 +10571,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -10534,7 +10713,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -10676,7 +10855,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -10818,7 +10997,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -10960,7 +11139,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -11102,7 +11281,7 @@ QD QD QD QD -QD +XL Kr Kr Kr @@ -11224,11 +11403,10 @@ Zo Zo Zo Zo -Zo -QD -QD -QD -QD +Kr +Kr +Kr +Kr QD QD QD @@ -11245,6 +11423,7 @@ QD QD QD QD +XL Kr Kr Kr @@ -11367,6 +11546,9 @@ vs Kr Kr Kr +Kr +Kr +Kr QD QD QD @@ -11383,10 +11565,7 @@ QD QD QD QD -QD -QD -QD -QD +XL Kr Kr Kr @@ -11509,26 +11688,26 @@ Kr Kr Kr Kr +Kr +Kr +Kr QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +Qo Kr Kr Kr @@ -16513,7 +16692,7 @@ ID lz Cv Vm -ab +og to to Qk diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index 0525941653..9b669ed723 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -40,8 +40,8 @@ use_overmap = TRUE overmap_z = Z_LEVEL_MISC - overmap_size = 25 - overmap_event_areas = 15 + overmap_size = 62 + overmap_event_areas = 100 usable_email_tlds = list("virgo.nt") zlevel_datum_type = /datum/map_z_level/groundbase @@ -340,7 +340,7 @@ skybox_pixel_x = 0 skybox_pixel_y = 0 - initial_generic_waypoints = list("groundbase", "gb_excursion_pad") + initial_generic_waypoints = list("groundbase", "gb_excursion_pad","omship_axolotl") initial_restricted_waypoints = list() extra_z_levels = list( diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index 6e509b0262..477a78a967 100644 --- a/maps/groundbase/groundbase_telecomms.dm +++ b/maps/groundbase/groundbase_telecomms.dm @@ -14,7 +14,7 @@ network = "tcommsat" autolinkers = list("hub", "groundbase_relay", "c_relay", "m_relay", "r_relay", - "science", "medical", "supply", "service", "common", "command", "engineering", "security", "explorer", "unused", + "science", "medical", "supply", "service", "common", "command", "engineering", "security", "Away Team", "unused", "hb_relay", "receiverA", "broadcasterA" ) @@ -30,7 +30,7 @@ /obj/machinery/telecomms/server/presets/service/groundbase freq_listening = list(SRV_FREQ, EXP_FREQ) - autolinkers = list("service", "explorer") + autolinkers = list("service", "Away Team") // Telecommunications Satellite /area/groundbase/command/tcomms @@ -74,11 +74,11 @@ num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology), num2text(SUP_FREQ) = list(access_cargo), num2text(SRV_FREQ) = list(access_janitor, access_hydroponics), - num2text(EXP_FREQ) = list(access_explorer) + num2text(EXP_FREQ) = list(access_awayteam) ) /obj/item/device/multitool/groundbase_buffered - name = "pre-linked multitool (groundbase hub)" + name = "pre-linked multitool (Rascal's Pass hub)" desc = "This multitool has already been linked to the groundbase telecomms hub and can be used to configure one (1) relay." /obj/item/device/multitool/groundbase_buffered/Initialize() @@ -86,7 +86,11 @@ buffer = locate(/obj/machinery/telecomms/hub/preset/groundbase) /obj/item/device/bluespaceradio/groundbase_prelinked +<<<<<<< HEAD name = "bluespace radio (Stellar Delight)" +======= + name = "bluespace radio (Rascal's Pass)" +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo handset = /obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked /obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked diff --git a/maps/groundbase/westwilds/westwilds template.dmm b/maps/groundbase/westwilds/westwilds template.dmm index 418cb43781..3153be6309 100644 --- a/maps/groundbase/westwilds/westwilds template.dmm +++ b/maps/groundbase/westwilds/westwilds template.dmm @@ -13,6 +13,37 @@ /obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"ab" = ( +/obj/machinery/pointdefense_control{ + id_tag = "axolotl_pd"; + name = "axolotl defense control"; + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"af" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"ai" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -21; + req_one_access = null + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "am" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 9 @@ -92,7 +123,27 @@ /area/groundbase/science/outpost/atmos) "aQ" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"aW" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_q1) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "bc" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -123,6 +174,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"bA" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "bE" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ @@ -186,6 +244,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"cg" = ( +/obj/structure/window/reinforced/tinted, +/obj/structure/toilet{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "ci" = ( /obj/machinery/camera/network/research_outpost{ dir = 8 @@ -245,6 +310,23 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"cU" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"cV" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "cX" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, @@ -256,6 +338,11 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"dh" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "do" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance/rnd{ @@ -268,6 +355,30 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/anomaly_storage) +"dp" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -21; + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"ds" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 21; + req_one_access = null + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "dx" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 @@ -302,6 +413,14 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/anomaly_lab) +"dH" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "dI" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -28 @@ -317,11 +436,34 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"dQ" = ( +/obj/machinery/computer/shuttle_control/explore/axolotl{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"dT" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "dX" = ( /turf/unsimulated/wall/planetary/virgo3c{ icon_state = "riveted" }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"ea" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ec" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -341,6 +483,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"eo" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "eq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -371,6 +519,38 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"eA" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_head) +"eB" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "eC" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -392,6 +572,12 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_storage) +"eV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/wall/shull, +/area/shuttle/axolotl) "fd" = ( /obj/machinery/atmospherics/unary/heat_exchanger{ dir = 4 @@ -404,6 +590,23 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxing_gasworks) +"ff" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "fh" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 @@ -411,6 +614,9 @@ /obj/effect/floor_decal/corner/purple, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"fl" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "fo" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -440,11 +646,24 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"fR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "gg" = ( /obj/machinery/artifact_scanpad, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"gh" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "gi" = ( /obj/structure/table/standard, /obj/machinery/computer/atmoscontrol/laptop{ @@ -457,6 +676,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"gn" = ( +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"gp" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"gx" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "gz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/tiled, @@ -615,6 +852,43 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_storage) +"hP" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"hR" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"hT" = ( +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "hU" = ( /obj/machinery/light, /turf/simulated/floor/tiled, @@ -631,7 +905,26 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"hY" = ( +/obj/machinery/shipsensors{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"ib" = ( +/obj/structure/closet/crate{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "if" = ( /obj/machinery/atmospherics/portables_connector, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -642,6 +935,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"ij" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"il" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_q1) "iq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -674,10 +974,19 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"iM" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "iO" = ( /obj/machinery/firealarm, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"iQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "iU" = ( /obj/machinery/atmospherics/unary/heat_exchanger, /obj/structure/window/basic, @@ -782,6 +1091,28 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"jR" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/item/weapon/tank/phoron/pressurized, +/obj/item/weapon/tank/phoron/pressurized, +/obj/structure/closet/walllocker{ + dir = 1; + name = "Spare Fuel"; + pixel_y = -32 + }, +/obj/item/weapon/tool/crowbar/red, +/obj/item/stack/material/tritium{ + amount = 25 + }, +/obj/item/weapon/tool/wrench, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "jS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -789,6 +1120,11 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_storage) +"jT" = ( +/obj/structure/handrail, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "jU" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_science{ @@ -820,6 +1156,16 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"kB" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_galley) "kE" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -853,6 +1199,27 @@ "kN" = ( /turf/simulated/wall/r_wall, /area/groundbase/science/outpost/anomaly_testing) +"kP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"kR" = ( +/obj/structure/table/steel, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = -22 + }, +/obj/random/pizzabox, +/obj/structure/closet/walllocker_double/kitchen/south, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "kT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -861,6 +1228,32 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"kU" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2; + req_one_access = null + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"kX" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "kY" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 1 @@ -945,6 +1338,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"lX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "mc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -955,6 +1354,10 @@ /obj/machinery/alarm, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_storage) +"mf" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "mg" = ( /obj/machinery/atmospherics/pipe/manifold/visible/blue, /obj/machinery/light, @@ -963,6 +1366,9 @@ "mh" = ( /turf/simulated/wall, /area/groundbase/science/outpost/anomaly_storage) +"mk" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_head) "mq" = ( /obj/structure/table/rack, /obj/item/clothing/suit/bio_suit/anomaly, @@ -976,6 +1382,20 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"mr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "ms" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1001,6 +1421,38 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"mD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey, +/obj/machinery/computer/ship/engines{ + dir = 4; + req_one_access = list(160) + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"mK" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "mL" = ( /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 4 @@ -1024,6 +1476,17 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"mS" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "mT" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -1065,6 +1528,16 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"nl" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q1) "nm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, @@ -1075,6 +1548,14 @@ "nv" = ( /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"nF" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/sleep_console{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "nM" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ @@ -1089,16 +1570,46 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"nO" = ( +/obj/structure/hull_corner, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl) "nR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_storage) +"nT" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "nU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"oa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 4; + id_tag = "axolotl_docking_star"; + name = "Starboard Airlock Control"; + pixel_x = -22 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "op" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -1167,6 +1678,41 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxins_mixing) +"oP" = ( +/obj/structure/cable, +/obj/machinery/power/smes/buildable{ + charge = 500000 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"oX" = ( +/obj/structure/hull_corner, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_engineering) +"pc" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/handrail, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24; + req_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) +"pd" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "pe" = ( /obj/machinery/portable_atmospherics/powered/pump, /obj/machinery/firealarm{ @@ -1206,6 +1752,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"pA" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl) "pB" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -1215,6 +1767,20 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"pC" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "pF" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -1241,6 +1807,15 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"pJ" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "pM" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -1281,6 +1856,31 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"qa" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/fuel_port/heavy{ + pixel_y = 28 + }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"qb" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + pixel_x = 24; + pixel_y = -11 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "qe" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1294,6 +1894,12 @@ /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor, /area/groundbase/science/outpost/toxins_storage) +"qf" = ( +/obj/machinery/computer/ship/sensors{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) "qg" = ( /obj/structure/anomaly_container, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1322,11 +1928,33 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_storage) +"qp" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "qq" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"qv" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_q2) "qw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1391,7 +2019,38 @@ dir = 4 }, /turf/simulated/floor/outdoors/grass/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"rc" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"rh" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "rr" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 @@ -1405,6 +2064,10 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"ru" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "rw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -1481,6 +2144,12 @@ /obj/item/weapon/stool/padded, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"sw" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q1) "sA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -1488,6 +2157,30 @@ /obj/machinery/atmospherics/binary/pump, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"sE" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q2) +"sF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "sI" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 5 @@ -1513,10 +2206,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"tf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "ti" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"tr" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "tt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -1547,6 +2260,12 @@ "tM" = ( /turf/simulated/wall, /area/groundbase/science/outpost/anomaly_testing) +"tN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "tO" = ( /obj/machinery/atmospherics/trinary/atmos_filter/m_filter{ dir = 8; @@ -1574,6 +2293,12 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"tT" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q2) "tZ" = ( /obj/structure/closet/excavation, /obj/machinery/light{ @@ -1600,6 +2325,33 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"uk" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/handrail, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"un" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/sleeper{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "ur" = ( /obj/structure/railing, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -1650,6 +2402,25 @@ /obj/machinery/alarm, /turf/simulated/floor/tiled/monotile, /area/groundbase/science/outpost/anomaly_lab) +"uB" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/handrail, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "uG" = ( /turf/simulated/wall, /area/groundbase/science/outpost/anomaly_lab) @@ -1658,6 +2429,16 @@ /obj/item/device/multitool, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"uT" = ( +/obj/machinery/suit_cycler, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "vd" = ( /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, @@ -1704,6 +2485,12 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"vs" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "vw" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 8 @@ -1738,6 +2525,27 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"vF" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"vH" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "vM" = ( /obj/machinery/door/blast/regular{ dir = 8; @@ -1786,6 +2594,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"vT" = ( +/obj/machinery/atmospherics/unary/engine/bigger{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "wg" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ @@ -1812,6 +2626,22 @@ /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"wo" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_galley) "wp" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -1881,6 +2711,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"xc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "xh" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1954,6 +2795,13 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"xQ" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "xT" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 4 @@ -1972,6 +2820,13 @@ /obj/machinery/portable_atmospherics/canister/empty/phoron, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"yd" = ( +/obj/machinery/computer/ship/engines{ + dir = 1; + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) "yf" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced{ @@ -1985,6 +2840,9 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"yg" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_q2) "yk" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -2010,6 +2868,19 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/substation) +"yw" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "yD" = ( /obj/structure/window/reinforced{ dir = 1 @@ -2029,6 +2900,26 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"yO" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) +"yQ" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "yV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 8 @@ -2056,6 +2947,12 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"zi" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "zk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -2080,6 +2977,24 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxins_mixing) +"zF" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"zG" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "zK" = ( /obj/structure/cable{ icon_state = "1-4" @@ -2092,6 +3007,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"zL" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "zN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/binary/pump{ @@ -2229,6 +3151,10 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"AI" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "AQ" = ( /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, @@ -2255,6 +3181,23 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Be" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Bg" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -2279,6 +3222,16 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Bt" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "Bw" = ( /obj/machinery/camera/network/research_outpost, /turf/simulated/floor/tiled, @@ -2300,6 +3253,13 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarshed) +"BB" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "BH" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ @@ -2352,6 +3312,28 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/science/outpost/toxins_mixing) +"BY" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Cc" = ( /obj/machinery/door/blast/regular{ dir = 2; @@ -2411,7 +3393,43 @@ "Cw" = ( /obj/structure/anomaly_container, /turf/simulated/floor/outdoors/grass/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"CE" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"CQ" = ( +/obj/machinery/embedded_controller/radio/docking_port_multi{ + child_names_txt = "Port Airlock Control;Starboard Airlock Control"; + child_tags_txt = "axolotl_docking_port;axolotl_docking_star"; + dir = 1; + id_tag = "axolotl_docking"; + name = "Axolotl Master Docking Controller"; + pixel_y = -22 + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable, +/obj/machinery/light, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Dn" = ( /obj/item/device/radio/intercom{ pixel_y = -24 @@ -2425,6 +3443,21 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Du" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Dz" = ( /obj/structure/cable/heavyduty{ icon_state = "0-2" @@ -2509,6 +3542,33 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"Ej" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"Em" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "Eo" = ( /obj/machinery/firealarm, /turf/simulated/floor, @@ -2602,6 +3662,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Fm" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Fp" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /obj/machinery/door/blast/regular{ @@ -2625,6 +3694,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"FH" = ( +/obj/machinery/power/port_gen/pacman/mrs{ + anchored = 1 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "FI" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2640,6 +3726,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"FN" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_cockpit) "FO" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2658,6 +3747,15 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"FT" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "FW" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -2701,6 +3799,20 @@ /obj/item/weapon/pickaxe, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Gh" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 1; + pixel_x = 24; + pixel_y = 11 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Gl" = ( /obj/machinery/atmospherics/unary/freezer{ icon_state = "freezer" @@ -2778,6 +3890,23 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Hb" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Hf" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Hp" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -2803,6 +3932,17 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Hw" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "Hz" = ( /obj/machinery/power/apc, /obj/structure/cable/green, @@ -2850,6 +3990,17 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxing_gasworks) +"HL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"HM" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "HU" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -2892,6 +4043,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"Ic" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Id" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -2974,6 +4131,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"IH" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "II" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -3024,10 +4195,74 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"IZ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Jb" = ( /obj/machinery/atmospherics/valve, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Jc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/panic_button{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"Je" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"Jh" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"Jl" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"Jm" = ( +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Jn" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/white, @@ -3051,7 +4286,18 @@ dir = 9 }, /turf/simulated/floor/outdoors/grass/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"JD" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "JE" = ( /obj/structure/dispenser, /turf/simulated/floor/tiled, @@ -3066,10 +4312,70 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_storage) +"JM" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"JU" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "JW" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Ka" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 2; + name = "Salamander Engineering Bay"; + req_one_access = null + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) +"Kb" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Kc" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Ke" = ( /obj/structure/dispenser/oxygen, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3081,6 +4387,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Kn" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Kw" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 1 @@ -3103,10 +4413,33 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"KH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "KI" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"KN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"KO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "KV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -3120,6 +4453,14 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"La" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Lb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black{ dir = 4 @@ -3147,6 +4488,16 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"Ll" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "Ls" = ( /obj/machinery/radiocarbon_spectrometer, /obj/structure/window/reinforced{ @@ -3206,6 +4557,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"LK" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_galley) "LL" = ( /obj/item/stack/cable_coil/random, /obj/structure/table/steel, @@ -3215,6 +4572,23 @@ }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"LM" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"LN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "LO" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -3226,6 +4600,9 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"LP" = ( +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "LV" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 @@ -3244,12 +4621,33 @@ /obj/structure/closet/secure_closet/xenoarchaeologist, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Mh" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"Mr" = ( +/obj/structure/closet/crate{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Mx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"Mz" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "MC" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/black, /turf/simulated/floor/tiled/white, @@ -3283,6 +4681,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Nj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Np" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "science_outpost" @@ -3305,6 +4709,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"ND" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "NG" = ( /obj/structure/table/standard, /obj/item/weapon/tank/phoron, @@ -3376,6 +4786,20 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"Ou" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "OI" = ( /obj/structure/anomaly_container, /obj/machinery/light_switch{ @@ -3390,6 +4814,25 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"OM" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) "OQ" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -3414,6 +4857,16 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"OU" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/curtain/open/shower, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "Pb" = ( /obj/structure/table/rack, /obj/item/clothing/suit/bio_suit/anomaly, @@ -3451,6 +4904,30 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"Pv" = ( +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"Px" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "Pz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3495,6 +4972,20 @@ /obj/machinery/meter, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"PL" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "PM" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -3525,12 +5016,40 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Qe" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Qf" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/science/outpost/toxins_mixing) +"Qh" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Qi" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "Qm" = ( /obj/structure/table/standard, /obj/item/weapon/tool/crowbar, @@ -3557,6 +5076,16 @@ /obj/machinery/atmospherics/binary/pump, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Qs" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Qw" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3591,6 +5120,30 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"QQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"QY" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "Rc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -3610,6 +5163,35 @@ }, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/engineering/solarfield) +"Rn" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"Ro" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Rq" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3636,6 +5218,13 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"RC" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "RH" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -3649,6 +5238,10 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/simulated/floor, /area/groundbase/science/outpost/toxins_storage) +"RJ" = ( +/obj/machinery/atmospherics/binary/pump/fuel, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "RM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -3724,6 +5317,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_storage) +"Si" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_galley) "Sk" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 @@ -3754,6 +5350,12 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/science/outpost/toxins_mixing) +"Sz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "SC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3761,10 +5363,28 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"SD" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "SF" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"ST" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/handrail, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Ti" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, @@ -3795,6 +5415,21 @@ /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"Tw" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 21; + req_one_access = null + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "TE" = ( /obj/machinery/alarm{ dir = 4 @@ -3813,6 +5448,50 @@ /obj/machinery/atmospherics/valve, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"TO" = ( +/obj/machinery/computer/ship/helm{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"Ub" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 4; + id_tag = "axolotl_docking_port"; + name = "Port Airlock Control"; + pixel_x = -22 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/shuttle_landmark/shuttle_initializer/axolotl, +/obj/effect/overmap/visitable/ship/landable/axolotl, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Ug" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emerglocker/east, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Um" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_head) "Up" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -3837,6 +5516,11 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"UA" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "UB" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxins_storage) @@ -3854,10 +5538,25 @@ dir = 8 }, /turf/simulated/floor/outdoors/newdirt/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"UM" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "UN" = ( /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"UW" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Vf" = ( /obj/structure/table/steel, /obj/item/device/measuring_tape, @@ -3878,10 +5577,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"Vm" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl) +"Vn" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Vr" = ( /obj/structure/bed/chair/office/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"Vs" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "VD" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -3900,9 +5613,38 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"VI" = ( +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "VS" = ( /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"VW" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "VZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3942,12 +5684,18 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"Wr" = ( +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Ws" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/wall, /area/groundbase/science/outpost/toxins_lab) +"Wz" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_engineering) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8 @@ -3988,6 +5736,12 @@ "WV" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxing_gasworks) +"WW" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "WZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -4008,6 +5762,25 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_storage) +"Xc" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "Xe" = ( /obj/structure/closet/secure_closet/xenoarchaeologist, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4037,6 +5810,42 @@ "Xl" = ( /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"XF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) +"XJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"XK" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "XO" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 9 @@ -4071,6 +5880,11 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Ya" = ( +/obj/structure/table/steel, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "Yb" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -4109,6 +5923,14 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Yv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Yw" = ( /obj/structure/cable/green{ d1 = 2; @@ -4136,6 +5958,12 @@ }, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/engineering/solarfield) +"YH" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_engineering) "YI" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Science Outpost Substation Bypass" @@ -4157,6 +5985,13 @@ /obj/machinery/firealarm, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"YM" = ( +/obj/structure/fitness/weightlifter, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "YT" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_science{ @@ -4184,12 +6019,26 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"YX" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) "Zi" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 1 }, /turf/simulated/floor/greengrid, /area/groundbase/science/outpost/toxins_lab) +"Zp" = ( +/obj/structure/table/steel, +/obj/machinery/microwave/advanced, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "Zw" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -4212,6 +6061,30 @@ /obj/structure/anomaly_container, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"ZI" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"ZK" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "ZL" = ( /obj/machinery/atmospherics/pipe/vent{ dir = 4 @@ -11900,22 +13773,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP nr YK YK @@ -12042,22 +13915,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +oX +Wz +gn +vT +Wz +Wz +gn +vT +Wz +YH +LP +LP +LP nr YK YK @@ -12173,17 +14046,21 @@ lB mt dz ov +<<<<<<< HEAD ez ov ez ov ez ov +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo Wc mt aC nr nr +<<<<<<< HEAD nr nr nr @@ -12200,6 +14077,24 @@ nr nr nr nr +======= +LP +LP +LP +Wz +Wz +pd +Jm +Wz +Wz +pd +Jm +Wz +Wz +LP +LP +LP +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo nr YK YK @@ -12326,22 +14221,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +Wz +Wz +XK +XK +Wz +Wz +XK +Du +Wz +Wz +LP +LP +LP nr YK YK @@ -12468,22 +14363,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +Wz +WW +iQ +Nj +Je +rc +tN +mf +UM +Wz +LP +LP +LP nr YK YK @@ -12610,22 +14505,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +CE +gh +tN +VI +dh +LN +RJ +Nj +ib +ZI +LP +LP +LP nr YK YK @@ -12752,22 +14647,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +Wz +JU +Ro +dT +KO +mD +gp +SD +kX +Wz +LP +LP +LP nr YK YK @@ -12894,22 +14789,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +eo +Wz +Fm +Jh +KN +Yv +zL +KN +Jh +mS +Wz +eo +LP +LP nr YK YK @@ -13036,22 +14931,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +nO +Vm +Wz +Wz +qa +xc +ZK +Hw +xc +jR +Wz +Wz +Vm +pA +LP nr YK YK @@ -13178,22 +15073,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Vm +Vm +Mr +Wz +FH +JM +OM +rh +Jc +oP +Wz +Mr +Vm +Vm +LP nr YK YK @@ -13320,22 +15215,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Vm +zG +Wr +Wz +Wz +Wz +XF +Ka +Wz +Wz +Wz +Wr +ij +Vm +LP nr YK YK @@ -13462,22 +15357,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Vm +jT +Kn +xQ +LM +Ic +mr +Hf +Ic +Hb +UW +Kn +BB +Vm +LP nr YK YK @@ -13604,22 +15499,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +af +Mh +vF +Vm +Pv +Vs +mr +Hf +Vs +Kc +Vm +Jl +La +JD +LP nr YK YK @@ -13746,22 +15641,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Vm +Mh +lX +Vm +HM +nF +QQ +cV +Vn +RC +Vm +Qs +La +Vm +LP nr YK YK @@ -13888,22 +15783,22 @@ mt mt nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Vm +Vm +eV +Vm +HM +un +mr +kP +Vs +RC +Vm +eV +Vm +Vm +LP nr YK YK @@ -14030,22 +15925,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Qe +Ub +ai +FT +XJ +XJ +ff +Hf +iM +iM +hP +dp +oa +UA +LP nr YK YK @@ -14172,22 +16067,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Gh +Ug +Ug +cU +Tw +ND +fR +Hf +iM +ds +hP +dH +dH +qb +LP nr YK YK @@ -14314,22 +16209,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Vm +Vm +Vm +Vm +Vm +uk +Sz +Hf +BY +Vm +Vm +Vm +Vm +Vm +LP nr YK YK @@ -14456,22 +16351,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +Um +mk +cg +Px +mk +ST +ru +vH +Ej +Si +uB +kR +Si +LK +LP nr YK YK @@ -14598,22 +16493,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +mk +Ll +pC +eA +Kb +Qh +VW +Kb +wo +tf +zi +kB +LP +LP nr YK YK @@ -14740,22 +16635,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +mk +IH +OU +mk +uT +Sz +eB +CQ +Si +yw +Zp +Si +LP +LP nr YK YK @@ -14882,22 +16777,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +mk +mk +mk +mk +Vm +hT +PL +Vm +Si +Si +Si +Si +LP +LP nr YK YK @@ -15024,22 +16919,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +sw +il +YM +Xc +il +Be +mK +yg +pc +Ya +yg +tT +LP +LP nr YK YK @@ -15166,22 +17061,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +nl +AI +yO +aW +Qh +VW +qv +Ou +qp +sE +LP +LP +LP nr YK YK @@ -15308,22 +17203,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +il +ea +gx +il +sF +IZ +yg +Qi +QY +yg +LP +LP +LP nr YK YK @@ -15450,22 +17345,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +il +il +il +il +HL +kU +yg +yg +yg +yg +LP +LP +LP nr YK YK @@ -15592,22 +17487,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +LP +yQ +FN +Rn +nT +Em +hR +FN +hY +LP +LP +LP +LP nr YK YK @@ -15734,22 +17629,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +LP +LP +pJ +YX +KH +fl +ab +bA +LP +LP +LP +LP +LP nr YK YK @@ -15876,22 +17771,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +LP +LP +pJ +qf +tr +tr +yd +bA +LP +LP +LP +LP +LP nr YK YK @@ -16018,22 +17913,22 @@ mt aC nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +LP +LP +zF +vs +dQ +TO +vs +Bt +LP +LP +LP +LP +LP nr YK YK @@ -16160,22 +18055,22 @@ Co mt nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +LP +LP +LP +zF +Mz +Mz +Bt +LP +LP +LP +LP +LP +LP nr YK YK @@ -16302,22 +18197,22 @@ nr nr nr nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP +LP nr YK YK diff --git a/maps/groundbase/westwilds/westwilds1.dmm b/maps/groundbase/westwilds/westwilds1.dmm index c594711843..bfdf34e2e6 100644 --- a/maps/groundbase/westwilds/westwilds1.dmm +++ b/maps/groundbase/westwilds/westwilds1.dmm @@ -2,6 +2,14 @@ "ab" = ( /turf/simulated/wall, /area/groundbase/science/outpost/anomaly_testing) +"ae" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "ai" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -28,7 +36,23 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"ap" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "aw" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/green{ @@ -42,6 +66,20 @@ }, /turf/simulated/floor/tiled/monotile, /area/groundbase/science/outpost/toxins_lab) +"aC" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"aH" = ( +/obj/structure/window/reinforced/tinted, +/obj/structure/toilet{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "aS" = ( /turf/simulated/wall, /area/groundbase/engineering/solarshed) @@ -90,12 +128,39 @@ /obj/item/device/analyzer, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"bs" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) "bt" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"bu" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "bC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -140,6 +205,46 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"bY" = ( +/obj/machinery/computer/ship/sensors{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"ca" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"cg" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_q2) +"ci" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"ck" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "cm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -148,6 +253,15 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"cs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "ct" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance/rnd{ @@ -185,6 +299,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_storage) +"cz" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "cG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -249,6 +369,20 @@ /obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"cY" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "da" = ( /obj/machinery/firealarm, /turf/simulated/floor, @@ -280,6 +414,22 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"df" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "dg" = ( /obj/machinery/radiocarbon_spectrometer, /obj/effect/floor_decal/steeldecal/steel_decals9, @@ -372,10 +522,22 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/groundbase/science/outpost/toxing_gasworks) +"dF" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "dS" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"dX" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "eg" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, /obj/machinery/meter, @@ -414,6 +576,10 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"ez" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "eB" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -436,6 +602,20 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"eH" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "eL" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 8 @@ -448,6 +628,21 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"eV" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 21; + req_one_access = null + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "eW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/white, @@ -512,6 +707,16 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_storage) +"fx" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/curtain/open/shower, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "fB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -565,6 +770,21 @@ /obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor, /area/groundbase/science/outpost/toxins_storage) +"gb" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/fuel_port/heavy{ + pixel_y = 28 + }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "gj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/tiled, @@ -590,6 +810,25 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"gr" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "gy" = ( /obj/machinery/door/blast/regular{ dir = 2; @@ -598,6 +837,12 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/science/outpost/anomaly_testing) +"gC" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "gF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -653,12 +898,61 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"gT" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "hd" = ( /obj/structure/railing{ dir = 1 }, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/engineering/solarfield) +"hf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"hi" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "hm" = ( /obj/structure/anomaly_container, /turf/simulated/floor/tiled/dark, @@ -680,10 +974,24 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/atmos) +"hv" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "hx" = ( /obj/machinery/light/small, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/outpost) +"hE" = ( +/obj/structure/handrail, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "hI" = ( /obj/machinery/computer/general_air_control/supermatter_core{ frequency = 1445; @@ -720,9 +1028,44 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"hQ" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"hT" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "ia" = ( /turf/simulated/floor/outdoors/grass/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west/unexplored) +======= +/area/submap/groundbase/wilderness/west/unexplored) +"ie" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"if" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ij" = ( /obj/machinery/door/blast/regular{ dir = 8; @@ -765,6 +1108,10 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"ix" = ( +/obj/structure/hull_corner, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_engineering) "iB" = ( /obj/machinery/atmospherics/pipe/vent{ dir = 4 @@ -773,6 +1120,9 @@ edge_blending_priority = -1 }, /area/groundbase/science/outpost/atmos) +"iE" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_engineering) "iH" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -788,6 +1138,26 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"iI" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "iK" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -823,12 +1193,42 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"iX" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "iZ" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"ja" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"jb" = ( +/obj/structure/closet/crate{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "jd" = ( /obj/structure/window/reinforced{ dir = 1 @@ -854,6 +1254,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"jk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "jm" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -872,6 +1278,12 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"jH" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "jI" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, /turf/simulated/floor, @@ -879,6 +1291,12 @@ "jP" = ( /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"jR" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_galley) "jT" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -938,7 +1356,15 @@ icon_state = "4-8" }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"kx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ky" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -952,6 +1378,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/anomaly_storage) +"kL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey, +/obj/machinery/computer/ship/engines{ + dir = 4; + req_one_access = null + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "kN" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible, /obj/machinery/meter, @@ -963,6 +1401,26 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_testing) +"kT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "kZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -975,6 +1433,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"lm" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "lo" = ( /obj/machinery/alarm, /turf/simulated/floor, @@ -1021,10 +1487,46 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"mc" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_head) "mi" = ( /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"mr" = ( +/obj/machinery/shipsensors{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"ms" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "mx" = ( /obj/structure/table/standard, /obj/item/weapon/tool/crowbar, @@ -1041,6 +1543,59 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"my" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"mz" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -21; + req_one_access = null + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"mB" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"mE" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl) "mI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, @@ -1052,6 +1607,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"mW" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "mX" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -1069,6 +1636,13 @@ "nl" = ( /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"nm" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "np" = ( /obj/item/stack/cable_coil/random, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -1128,6 +1702,32 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"od" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) +"or" = ( +/obj/structure/cable, +/obj/machinery/power/smes/buildable{ + charge = 500000 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "os" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -1153,6 +1753,9 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"ox" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_galley) "oy" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -1164,6 +1767,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"oz" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q2) "oD" = ( /obj/structure/dispenser/oxygen, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -1216,6 +1825,25 @@ /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"ph" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"pi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "pj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 4 @@ -1283,6 +1911,11 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"pK" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "pU" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /obj/machinery/meter, @@ -1298,6 +1931,27 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"qq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 4; + id_tag = "axolotl_docking_port"; + name = "Port Airlock Control"; + pixel_x = -22 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/shuttle_landmark/shuttle_initializer/axolotl, +/obj/effect/overmap/visitable/ship/landable/axolotl, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "qr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ @@ -1324,6 +1978,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"qF" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "qN" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 @@ -1341,6 +1999,26 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"qV" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +"qY" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "rc" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -1411,6 +2089,23 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"sf" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) +"si" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "sj" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -1522,6 +2217,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"sN" = ( +/obj/structure/closet/crate{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "sS" = ( /obj/structure/table/standard, /obj/item/weapon/tool/screwdriver, @@ -1543,6 +2244,16 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"sT" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "sY" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 @@ -1567,6 +2278,16 @@ /obj/machinery/meter, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"tn" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "tp" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/visible/red{ @@ -1574,12 +2295,41 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"tr" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"tx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) "tz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, /turf/simulated/wall, /area/groundbase/science/outpost/atmos) +"tA" = ( +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "tC" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1616,6 +2366,15 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"tW" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "uh" = ( /obj/machinery/atmospherics/trinary/mixer/m_mixer{ dir = 8; @@ -1624,6 +2383,44 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"un" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"up" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) +"ur" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) "uv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1656,6 +2453,10 @@ /obj/machinery/artifact_harvester, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"uF" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "uI" = ( /obj/machinery/atmospherics/binary/pump, /obj/effect/floor_decal/industrial/danger{ @@ -1666,6 +2467,10 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"uM" = ( +/obj/machinery/atmospherics/binary/pump/fuel, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "uP" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ @@ -1679,12 +2484,31 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost) +"uR" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "uU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_storage) +"uV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 4; + id_tag = "axolotl_docking_star"; + name = "Starboard Airlock Control"; + pixel_x = -22 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "uW" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxins_hallway) @@ -1767,6 +2591,17 @@ }, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/engineering/solarfield) +"vL" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emerglocker/east, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "vP" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -1787,7 +2622,24 @@ dir = 9 }, /turf/simulated/floor/outdoors/newdirt/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"we" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "wg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -1811,6 +2663,31 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"wo" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/item/weapon/tank/phoron/pressurized, +/obj/item/weapon/tank/phoron/pressurized, +/obj/structure/closet/walllocker{ + dir = 1; + name = "Spare Fuel"; + pixel_y = -32 + }, +/obj/item/weapon/tool/crowbar/red, +/obj/item/stack/material/tritium{ + amount = 25 + }, +/obj/item/weapon/tool/wrench, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"wr" = ( +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) "ws" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 10 @@ -1835,6 +2712,24 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"wC" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_galley) +"wI" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/sleep_console{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "wL" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -1870,6 +2765,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"wT" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "wU" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1894,6 +2796,9 @@ icon_state = "1-4" }, /obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) "xe" = ( @@ -1906,6 +2811,57 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"xf" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"xg" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/panic_button{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"xj" = ( +/obj/structure/fitness/weightlifter, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) +"xo" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"xs" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"xz" = ( +/obj/machinery/suit_cycler, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "xA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -1955,6 +2911,16 @@ "yq" = ( /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"yt" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + pixel_x = 24; + pixel_y = -11 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "yu" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2002,12 +2968,73 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"yR" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"yV" = ( +/obj/machinery/computer/shuttle_control/explore/axolotl{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"yY" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "yZ" = ( /obj/structure/table/standard, /obj/item/device/multitool, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"za" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"zb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"zc" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) +"zf" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"zj" = ( +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "zl" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 9 @@ -2084,6 +3111,9 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"zJ" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_q1) "zM" = ( <<<<<<< HEAD /turf/simulated/mineral/ignore_cavegen, @@ -2104,6 +3134,16 @@ /obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"Ah" = ( +/obj/structure/table/steel, +/obj/machinery/microwave/advanced, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "An" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -2139,11 +3179,31 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Az" = ( +/obj/structure/hull_corner, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl) "AD" = ( /obj/machinery/artifact_scanpad, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"AF" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_galley) "AH" = ( /obj/item/stack/cable_coil/random, /obj/structure/table/steel, @@ -2184,6 +3244,15 @@ /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"AW" = ( +/obj/machinery/computer/ship/helm{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"AY" = ( +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "AZ" = ( /obj/machinery/light{ dir = 4 @@ -2226,6 +3295,26 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Bs" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 1; + pixel_x = 24; + pixel_y = 11 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Bw" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "Bx" = ( /obj/machinery/atmospherics/unary/heat_exchanger, /obj/structure/window/basic, @@ -2276,6 +3365,10 @@ }, /turf/simulated/wall, /area/groundbase/science/outpost/atmos) +"BK" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "BM" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_science{ @@ -2285,6 +3378,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost) +"BP" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "BQ" = ( /obj/structure/table/steel, /obj/item/device/measuring_tape, @@ -2310,6 +3426,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Cl" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Cq" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -2358,6 +3481,32 @@ "CX" = ( /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/engineering/solarfield) +"CY" = ( +/obj/machinery/power/port_gen/pacman/mrs{ + anchored = 1 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"CZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Db" = ( /obj/machinery/light, /turf/simulated/floor/tiled, @@ -2366,6 +3515,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Dg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Dj" = ( /obj/structure/table/steel, /obj/item/device/measuring_tape, @@ -2400,6 +3553,23 @@ }, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/engineering/solarfield) +"Ds" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"Dt" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "Du" = ( /obj/structure/closet/secure_closet/xenoarchaeologist, /obj/machinery/light, @@ -2437,6 +3607,11 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/science/outpost/toxins_mixing) +"Ed" = ( +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Ee" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2449,6 +3624,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"Eg" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Eh" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -2471,9 +3653,24 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Ek" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "Ep" = ( /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Er" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Ev" = ( /obj/machinery/atmospherics/unary/heat_exchanger{ dir = 8 @@ -2530,6 +3727,15 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"EG" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "EK" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, /obj/machinery/meter, @@ -2628,6 +3834,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"FB" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "FE" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/simulated/floor/reinforced/airless, @@ -2643,7 +3856,26 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"FN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "FS" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -2667,6 +3899,18 @@ }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"Ga" = ( +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"Ge" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Gf" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 @@ -2681,6 +3925,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"Gh" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_head) "Gn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -2691,6 +3941,15 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Gu" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_head) +"Gw" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Gy" = ( /obj/structure/closet/secure_closet/xenoarchaeologist, /turf/simulated/floor/tiled, @@ -2712,6 +3971,26 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +<<<<<<< HEAD +======= +"GM" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel/outdoors/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/engineering/solarfield) +"GT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "GX" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -2753,12 +4032,35 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxins_lab) +"Hg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Hh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Hj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Hq" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "Ht" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -2783,6 +4085,23 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"Hz" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/sleeper{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"HD" = ( +/obj/structure/table/steel, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = -22 + }, +/obj/random/pizzabox, +/obj/structure/closet/walllocker_double/kitchen/south, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "HK" = ( /obj/machinery/atmospherics/binary/pump, /turf/simulated/floor/tiled/white, @@ -2826,6 +4145,20 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/science/outpost/toxins_mixing) +"HS" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "HT" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -2833,6 +4166,9 @@ /obj/machinery/portable_atmospherics/powered/pump/huge/stationary/purge, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"HV" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_cockpit) "Ic" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/power/apc{ @@ -2858,6 +4194,9 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/substation) +"Ih" = ( +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "Ii" = ( /obj/machinery/atmospherics/trinary/atmos_filter/m_filter{ dir = 8; @@ -2892,12 +4231,55 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/substation) +"Ix" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q1) +"Iy" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/groundbase/engineering/solarshed) "IB" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"IF" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/pointdefense_control{ + id_tag = "axolotl_pd"; + name = "axolotl defense control"; + req_one_access = null + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"IG" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"II" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +"IK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "IO" = ( /obj/machinery/atmospherics/trinary/atmos_filter/m_filter{ dir = 8; @@ -2906,6 +4288,12 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"IR" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "IS" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -2919,6 +4307,19 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_storage) +"IV" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "IX" = ( /obj/machinery/button/remote/blast_door{ id = "burn_chamber_v"; @@ -2942,6 +4343,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"Jc" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/handrail, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Jj" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2992,6 +4405,42 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"JN" = ( +/obj/machinery/atmospherics/unary/engine/bigger{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"JO" = ( +/obj/machinery/embedded_controller/radio/docking_port_multi{ + child_names_txt = "Port Airlock Control;Starboard Airlock Control"; + child_tags_txt = "axolotl_docking_port;axolotl_docking_star"; + dir = 1; + id_tag = "axolotl_docking"; + name = "Axolotl Master Docking Controller"; + pixel_y = -22 + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable, +/obj/machinery/light, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"JQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "JR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 @@ -2999,6 +4448,15 @@ /obj/machinery/meter, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"JT" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "JW" = ( /obj/structure/cable{ icon_state = "2-4" @@ -3171,7 +4629,24 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"KK" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "KL" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -3189,6 +4664,16 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarshed) +"KT" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q2) "KU" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 8 @@ -3224,6 +4709,16 @@ /obj/machinery/firealarm, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Lj" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Ll" = ( /turf/simulated/wall, /area/groundbase/science/outpost/substation) @@ -3241,6 +4736,20 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Ls" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "Lx" = ( /obj/structure/railing{ dir = 8 @@ -3265,6 +4774,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/wall, /area/groundbase/science/outpost/atmos) +"LJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "LK" = ( /obj/effect/map_effect/portal/master/side_b/gb_wilds/west{ dir = 8 @@ -3287,6 +4802,12 @@ /obj/structure/cable/green, /turf/simulated/floor, /area/groundbase/science/outpost/substation) +"LU" = ( +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Mc" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -3294,12 +4815,57 @@ }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"Me" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"Mj" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Ms" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "MF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"MG" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "MP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3347,6 +4913,26 @@ /obj/machinery/atmospherics/binary/pump, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +<<<<<<< HEAD +======= +"Na" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/asteroid_steel/outdoors/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/engineering/solarfield) +"Nc" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Nd" = ( /obj/machinery/atmospherics/trinary/atmos_filter{ dir = 4; @@ -3364,6 +4950,23 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Nx" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +"NG" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "NJ" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 4 @@ -3402,6 +5005,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"NZ" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "Ob" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_science{ @@ -3429,6 +5046,28 @@ /obj/machinery/portable_atmospherics/canister/empty/nitrogen, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Om" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"On" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"Op" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Or" = ( /obj/machinery/light{ dir = 4 @@ -3457,9 +5096,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxins_storage) +"OG" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "OK" = ( /turf/simulated/wall, /area/groundbase/science/outpost/anomaly_lab) +"OT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "Pi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -3514,6 +5168,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"PC" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2; + req_one_access = null + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "PF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -3537,6 +5209,11 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"PQ" = ( +/obj/structure/table/steel, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "PS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -3594,6 +5271,41 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"QP" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_q1) +"QV" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/handrail, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "QY" = ( /obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8 @@ -3645,6 +5357,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Ro" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/wall/shull, +/area/shuttle/axolotl) "Rp" = ( /obj/machinery/atmospherics/unary/heater{ icon_state = "heater_1"; @@ -3684,6 +5402,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"Rz" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 21; + req_one_access = null + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "RE" = ( /obj/machinery/air_sensor{ frequency = 1445; @@ -3745,6 +5475,40 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"RS" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q1) +"RT" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"RW" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "RX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3783,6 +5547,12 @@ /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Sy" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Sz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 1 @@ -3795,6 +5565,11 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/groundbase/science/outpost/toxing_gasworks) +"SH" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "SJ" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -3837,6 +5612,25 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"Ta" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Td" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 8 @@ -3956,6 +5750,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Uf" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl) "Us" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -3970,6 +5767,55 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"Uy" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 2; + name = "Salamander Engineering Bay"; + req_one_access = null + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) +"UA" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"UE" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) +"UG" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "UH" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 8; @@ -4087,6 +5933,29 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"VR" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/handrail, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"VX" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "Wb" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, @@ -4109,6 +5978,21 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"Wr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Ww" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4120,6 +6004,23 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/science/outpost) +"Wx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Wy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -4161,7 +6062,23 @@ /turf/simulated/floor/tiled/asteroid_steel/outdoors/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"WV" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "WW" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -4179,6 +6096,17 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"WZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Xa" = ( /obj/structure/table/standard, /obj/machinery/light{ @@ -4259,6 +6187,22 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/groundbase/science/outpost/toxing_gasworks) +"XL" = ( +/obj/machinery/computer/ship/engines{ + dir = 1; + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"XM" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "XN" = ( /obj/machinery/camera/network/research_outpost, /turf/simulated/floor/tiled, @@ -4266,6 +6210,31 @@ "XR" = ( /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"XZ" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/handrail, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) +"Yc" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "Ye" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4319,13 +6288,42 @@ "Yv" = ( /obj/structure/anomaly_container, /turf/simulated/floor/outdoors/grass/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"Yw" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "YD" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"YP" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -21; + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "YS" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxing_gasworks) @@ -4335,6 +6333,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"YV" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "YW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -4349,6 +6354,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"Za" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"Ze" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Zk" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxins_lab) @@ -4395,6 +6418,20 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"ZB" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "ZD" = ( /turf/simulated/wall, /area/groundbase/science/outpost) @@ -4414,6 +6451,9 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"ZK" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_q2) "ZN" = ( /obj/machinery/atmospherics/binary/pump/high_power/on, /obj/machinery/light/small{ @@ -15293,7 +17333,7 @@ st hd ia ia -kc +ia kc kc kc @@ -15435,8 +17475,8 @@ st hd ia ia -kc -kc +ia +ia kc kc kc @@ -15576,16 +17616,16 @@ st st hd ia +kc +ia +ia +ia ia kc kc kc kc -kc -kc -kc -kc -kc +ia kc kc kc @@ -15717,23 +17757,23 @@ kZ st st hd -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia +iL +yy +yy +iL +iL +iL +iL +yy +yy +iL +iL +iL +yy +yy +iL +iL +iL Xk Xk Xk @@ -15859,22 +17899,22 @@ zH Hu st hd -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia +iL +iL +iL +iL +iL +iL +iL +iL +iL +iL +iL +iL +iL +iL +iL +iL Xk Xk Xk @@ -16001,23 +18041,23 @@ zH Hu st hd -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -Xk -Xk +iL +Yc +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +Nx +II Xk Xk Xk @@ -16143,23 +18183,23 @@ zH Hu st hd -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -Xk -Xk -Xk -Xk -Xk +iL +LJ +Ih +Ih +ix +iE +AY +JN +iE +iE +AY +JN +iE +Nc +Ih +Ih +qV Xk Xk Xk @@ -16285,23 +18325,23 @@ zH Hu st hd -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -Xk -Xk -Xk -Xk -Xk +iL +LJ +Ih +Ih +iE +iE +Za +zj +iE +iE +Za +zj +iE +iE +Ih +Ih +qV Xk Xk Xk @@ -16427,23 +18467,23 @@ qQ Hu st hd -ia -ia -ia -kc -kc -kc -kc -kc -kc -ia -ia -ia -Xk -Xk -Xk -Xk -Xk +iL +LJ +Ih +Ih +iE +iE +RT +RT +iE +iE +RT +FN +iE +iE +Ih +Ih +qV Xk Xk Xk @@ -16569,23 +18609,23 @@ st st st hd -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -ia -ia -Xk -Xk -Xk -Xk -Xk +iL +LJ +Ih +Ih +iE +IF +zb +IK +Yw +Ds +Op +Dg +uR +iE +Ih +Ih +qV Xk Xk Xk @@ -16711,23 +18751,23 @@ st CX st st -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -Xk -Xk -Xk -Xk +iL +LJ +Ih +Ih +JT +qF +Op +LU +pK +UG +uM +IK +jb +YV +Ih +Ih +qV Xk Xk Xk @@ -16853,25 +18893,25 @@ st np st hd -ia -ia -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -Xk -Xk -Xk -ia -ia -ia +iL +LJ +Ih +Ih +iE +Gw +jH +ez +On +kL +Sy +yR +yY +iE +Ih +Ih +qV +iL +iL ia Xk Xk @@ -16995,25 +19035,25 @@ WX Hu st hd -ia -ia -ia -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia -Xk -Xk -ia -ia -ia -ia +iL +LJ +Ih +xo +iE +tW +cz +kx +Hh +nm +kx +cz +NG +iE +xo +Ih +qV +iL +iL ia ia ia @@ -17137,25 +19177,25 @@ QG Hu st hd -ia -ia -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -kc -kc +iL +LJ +Az +Uf +iE +iE +gb +ms +hf +MG +ms +wo +iE +iE +Uf +mE +qV +iL +iL ia ia ia @@ -17279,25 +19319,25 @@ QG Hu st hd -ia -ia -kc -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -kc -kc -kc -kc +iL +LJ +Uf +Uf +sN +iE +CY +ja +ur +bs +xg +or +iE +Ga +Uf +Uf +qV +iL +yy ia ia ia @@ -17421,28 +19461,28 @@ QG Hu st hd -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia -ia +iL +LJ +Uf +dF +Ga +iE +iE +iE +tx +Uy +iE +iE +iE +Ga +tr +Uf +qV +iL +yy ia kc kc -kc -kc -kc -ia -ia -ia ia ia ia @@ -17553,16 +19593,26 @@ st kZ st Hy +<<<<<<< HEAD QG dx QG dx QG dx +======= +GM +Hy +GM +Hy +GM +Hy +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo QG Hu st hd +<<<<<<< HEAD ia ia ia @@ -17579,6 +19629,27 @@ ia ia kc kc +======= +iL +LJ +Uf +hE +hQ +aC +Lj +dX +Ze +bu +dX +OG +iX +hQ +un +Uf +qV +iL +yy +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo kc kc kc @@ -17596,9 +19667,6 @@ ia ia ia ia -ia -ia -ia kc kc kc @@ -17705,20 +19773,25 @@ kZ st st hd -ia -ia -ia -ia -ia -ia -kc -kc -kc -ia -ia -ia -ia -ia +iL +LJ +ie +Er +JQ +Uf +Ed +uF +Ze +bu +uF +Cl +Uf +wT +ae +hT +qV +iL +yy kc kc kc @@ -17736,11 +19809,6 @@ ia ia ia ia -ia -ia -ia -ia -ia kc kc kc @@ -17847,20 +19915,25 @@ gq st st hd -ia -ia -ia -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia +iL +LJ +Uf +Er +IG +Uf +SH +wI +we +xs +FB +Eg +Uf +sT +ae +Uf +qV +iL +yy kc kc kc @@ -17868,11 +19941,6 @@ kc kc kc kc -kc -ia -ia -ia -ia ia ia ia @@ -17989,9 +20057,25 @@ kZ st st hd -ia -ia -ia +iL +LJ +Uf +Uf +Ro +Uf +SH +Hz +Ze +WZ +uF +Eg +Uf +Ro +Uf +Uf +qV +iL +iL kc kc kc @@ -18002,22 +20086,6 @@ kc ia ia ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia -ia -ia ia ia ia @@ -18131,7 +20199,25 @@ zH Hu st hd -ia +iL +LJ +XM +qq +mz +Ge +Ms +Ms +Wr +bu +Om +Om +ca +YP +uV +Mj +qV +iL +iL ia kc kc @@ -18139,24 +20225,6 @@ kc kc kc kc -kc -kc -ia -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia ia ia ia @@ -18273,8 +20341,25 @@ zH Hu st hd -ia -ia +iL +LJ +Bs +vL +vL +si +eV +Hg +pi +bu +Om +Rz +ca +lm +lm +yt +qV +iL +iL ia kc kc @@ -18282,23 +20367,6 @@ kc kc kc kc -kc -ia -ia -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia ia ia ia @@ -18415,7 +20483,25 @@ zH Hu st hd -ia +iL +LJ +Uf +Uf +Uf +Uf +Uf +VR +CZ +bu +Me +Uf +Uf +Uf +Uf +Uf +qV +iL +iL ia kc kc @@ -18423,24 +20509,6 @@ kc kc kc kc -kc -kc -kc -ia -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia ia ia ia @@ -18557,31 +20625,31 @@ zH Hu st hd -ia -ia +iL +LJ +Gh +Gu +aH +gr +Gu +Jc +ph +eH +df +ox +XZ +HD +ox +jR +qV +iL +iL ia kc kc kc kc kc -kc -kc -kc -ia -ia -ia -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -ia ia ia ia @@ -18699,25 +20767,25 @@ qQ Hu st hd -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia -ia -kc +iL +LJ +Ih +Gu +gT +ZB +mc +WV +IV +BP +WV +AF +HS +IR +wC +Ih +qV +iL +iL kc kc kc @@ -18841,25 +20909,25 @@ st st st hd -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia -kc +iL +LJ +Ih +Gu +up +fx +Gu +xz +CZ +qY +JO +ox +KK +Ah +ox +Ih +qV +iL +iL kc kc kc @@ -18983,25 +21051,25 @@ Lx Lx Lx st -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia -ia +iL +LJ +Ih +Gu +Gu +Gu +Gu +Uf +tA +cY +Uf +ox +ox +ox +ox +Ih +qV +iL +iL kc kc kc @@ -19124,26 +21192,26 @@ ia ia ia ia -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia -ia +iL +iL +LJ +Ih +Ix +zJ +xj +od +zJ +kT +iI +ZK +QV +PQ +ZK +oz +Ih +qV +iL +iL ia kc kc @@ -19266,26 +21334,26 @@ kc kc kc ia -ia -ia -ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia -ia +iL +iL +LJ +Ih +Ih +RS +BK +NZ +QP +IV +BP +cg +UE +Bw +KT +Ih +Ih +qV +iL +iL ia kc kc @@ -19408,26 +21476,26 @@ kc kc kc ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia +yy +iL +LJ +Ih +Ih +zJ +zc +RW +zJ +Wx +Ta +ZK +hv +sf +ZK +Ih +Ih +qV +iL +iL ia ia ia @@ -19550,26 +21618,26 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -ia -ia +yy +iL +LJ +Ih +Ih +zJ +zJ +zJ +zJ +my +PC +ZK +ZK +ZK +ZK +Ih +Ih +qV +iL +iL ia ia ia @@ -19692,26 +21760,26 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc +iL +iL +LJ +Ih +Ih +Ih +gC +HV +mB +Ls +if +hi +HV +mr +Ih +Ih +Ih +qV +iL +yy kc ia ia @@ -19834,26 +21902,26 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc +iL +iL +LJ +Ih +Ih +Ih +Ih +UA +xf +cs +VX +wr +ck +Ih +Ih +Ih +Ih +qV +iL +yy kc yy iL @@ -19975,30 +22043,30 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc +ia iL iL +LJ +Ih +Ih +Ih +Ih +UA +bY +zf +ci +XL +ck +Ih +Ih +Ih +Ih +qV +iL +iL +kc +yy +iL iL iL iL @@ -20117,30 +22185,30 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc ia -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc -kc iL iL +LJ +Ih +Ih +Ih +Ih +mW +za +yV +AW +za +tn +Ih +Ih +Ih +Ih +qV +iL +iL +kc +yy +iL TL TL TL @@ -20259,30 +22327,30 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -kc -kc ia -ia -ia -ia -ia -kc -kc -kc -kc -kc -kc -yy -yy iL iL +LJ +Ih +Ih +Ih +Ih +Ih +mW +ap +EG +tn +Ih +Ih +Ih +Ih +Ih +qV +iL +iL +yy +yy +iL TL uU wL @@ -20401,30 +22469,30 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -kc ia iL iL -iL -iL -iL -iL -iL +Dt +GT +GT +GT +GT +GT +GT +Hq +OT +OT +OT +OT +Ek +GT +GT +jk iL iL yy yy iL -iL -iL -iL TL lS Lm @@ -20544,14 +22612,6 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -ia iL iL iL @@ -20559,12 +22619,20 @@ iL iL iL iL +RY iL iL iL iL iL iL +Ip +iL +iL +iL +iL +iL +yy iL iL TL @@ -20686,21 +22754,21 @@ kc kc kc kc -kc -kc -kc -kc -kc -kc -kc -ia +iL +iL +iL +iL +yy +yy +yy +RY iL aS oI oI aS oI -oI +Iy aS iL iL @@ -20835,7 +22903,7 @@ kc kc kc iL -iL +RY iL aS Rq @@ -20977,7 +23045,7 @@ kc kc ia iL -iL +RY KM EC FT @@ -21119,7 +23187,7 @@ ia ia ia iL -iL +RY sE aS AH @@ -21261,7 +23329,7 @@ iL iL iL iL -iL +RY VO aS aS diff --git a/maps/groundbase/westwilds/westwilds2.dmm b/maps/groundbase/westwilds/westwilds2.dmm index 4a821d801a..c830283f59 100644 --- a/maps/groundbase/westwilds/westwilds2.dmm +++ b/maps/groundbase/westwilds/westwilds2.dmm @@ -42,6 +42,15 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/groundbase/science/outpost/toxing_gasworks) +"an" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +"ao" = ( +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "aq" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1 @@ -70,6 +79,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"av" = ( +/obj/structure/table/steel, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "aw" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -98,6 +112,19 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +<<<<<<< HEAD +======= +"aS" = ( +/obj/machinery/vending/wallmed1, +/turf/simulated/wall, +/area/groundbase/science/outpost/anomaly_lab) +"ba" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "bc" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -109,7 +136,36 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"bd" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"be" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "bf" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, @@ -128,6 +184,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"br" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q2) +"bC" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "bE" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/industrial/warning{ @@ -150,6 +225,25 @@ /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"bM" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "bQ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -207,6 +301,13 @@ /obj/machinery/pipedispenser, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"cs" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "cE" = ( /obj/machinery/light{ dir = 8 @@ -243,6 +344,15 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"cQ" = ( +/obj/structure/closet/crate{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "cS" = ( /obj/machinery/portable_atmospherics/powered/pump, /obj/machinery/alarm{ @@ -250,6 +360,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"cU" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "cX" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, @@ -261,6 +377,23 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"dl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "do" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance/rnd{ @@ -273,12 +406,47 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/anomaly_storage) +"dq" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"dw" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 2; + name = "Salamander Engineering Bay"; + req_one_access = null + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) "dx" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"dy" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "dB" = ( /turf/simulated/wall/r_wall, /area/groundbase/science/outpost/toxins_mixing) @@ -304,6 +472,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"dN" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "dO" = ( /obj/machinery/power/apc{ dir = 4 @@ -316,6 +490,14 @@ "dT" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/engineering/solarfield) +"dW" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "ec" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -335,6 +517,22 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"eh" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/curtain/open/shower, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) +"eo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "eq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -370,6 +568,28 @@ }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"ey" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "eC" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -385,6 +605,23 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"eN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "eS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -410,6 +647,19 @@ /obj/effect/floor_decal/corner/purple, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"fl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "fo" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -452,7 +702,17 @@ ======= /turf/simulated/mineral/ignore_cavegen/virgo3c, /area/submap/groundbase/wilderness/west) +<<<<<<< HEAD >>>>>>> 3e5775ea6e... Merge pull request #13634 from Heroman3003/3c-turfs +======= +"fN" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/groundbase/engineering/solarshed) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "fQ" = ( /obj/machinery/chem_master, /obj/machinery/camera/network/research_outpost{ @@ -460,6 +720,12 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_lab) +"gb" = ( +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "gi" = ( /obj/structure/table/standard, /obj/machinery/computer/atmoscontrol/laptop{ @@ -472,6 +738,39 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"gl" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_head) +"go" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"gw" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_q2) +"gy" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 4; + pixel_x = -26 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "gz" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow, /turf/simulated/floor/tiled, @@ -496,6 +795,20 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"gO" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "gS" = ( /obj/machinery/computer/area_atmos/tag{ dir = 4; @@ -512,6 +825,12 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"gV" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "gW" = ( /obj/machinery/atmospherics/unary/heat_exchanger{ dir = 8 @@ -624,10 +943,19 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/asteroid_steel/outdoors/virgo3c{ edge_blending_priority = -1 }, /area/groundbase/engineering/solarshed) +"hG" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "hH" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/simulated/floor/reinforced/airless, @@ -638,10 +966,23 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_storage) +"hK" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "hU" = ( /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"hV" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "hY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -658,12 +999,35 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"ig" = ( +/obj/structure/closet/crate, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "iq" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"it" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "iy" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -676,6 +1040,32 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"iB" = ( +/obj/machinery/embedded_controller/radio/docking_port_multi{ + child_names_txt = "Port Airlock Control;Starboard Airlock Control"; + child_tags_txt = "axolotl_docking_port;axolotl_docking_star"; + dir = 1; + id_tag = "axolotl_docking"; + name = "Axolotl Master Docking Controller"; + pixel_y = -22 + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable, +/obj/machinery/light, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"iD" = ( +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "iI" = ( /turf/simulated/floor/tiled/asteroid_steel/outdoors/virgo3c{ edge_blending_priority = -1 @@ -699,6 +1089,13 @@ /obj/machinery/firealarm, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"iT" = ( +/obj/structure/fitness/weightlifter, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "iU" = ( /obj/machinery/atmospherics/unary/heat_exchanger, /obj/structure/window/basic, @@ -734,6 +1131,13 @@ /obj/item/device/suit_cooling_unit, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"jn" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "jo" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -753,6 +1157,9 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"jx" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_galley) "jy" = ( /obj/structure/catwalk, /obj/structure/cable/heavyduty{ @@ -784,6 +1191,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"jD" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "jH" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -826,6 +1239,12 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"jR" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "jS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -842,6 +1261,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost) +"jV" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"jW" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_q2) "jY" = ( /obj/structure/cable{ icon_state = "2-8" @@ -866,7 +1307,55 @@ /area/groundbase/science/outpost/toxins_mixing) ======= /area/submap/groundbase/wilderness/west) +<<<<<<< HEAD >>>>>>> b7b3ae73e0... Merge pull request #12838 from Very-Soft/gbwilds +======= +"kc" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"kf" = ( +/obj/structure/table/steel, +/obj/machinery/microwave/advanced, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) +"kh" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/handrail, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/bed/chair/bay/comfy{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"ki" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "kn" = ( /obj/machinery/light_switch{ dir = 8; @@ -874,6 +1363,18 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"ko" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +"kr" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "kv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -924,7 +1425,19 @@ /area/groundbase/science/outpost/anomaly_testing) "kQ" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"kR" = ( +/obj/machinery/pointdefense_control{ + id_tag = "axolotl_pd"; + name = "axolotl defense control"; + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "kT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -969,6 +1482,9 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"lh" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_cockpit) "lk" = ( /obj/machinery/light{ dir = 8 @@ -983,6 +1499,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"lz" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "lE" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 8 @@ -1003,7 +1524,17 @@ /area/groundbase/science/outpost/anomaly_testing) "lO" = ( /turf/unsimulated/wall/planetary/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"lR" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -1017,6 +1548,15 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"lX" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "mc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1119,6 +1659,15 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"mU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "mV" = ( /obj/structure/anomaly_container, /obj/machinery/light{ @@ -1165,6 +1714,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"nn" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "nr" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/wilderness/west/unexplored) @@ -1178,6 +1733,16 @@ }, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/engineering/solarfield) +"nG" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"nK" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "nM" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ @@ -1202,6 +1767,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"oe" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "op" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -1256,6 +1828,52 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxins_mixing) +"oO" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) +"oW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 4; + id_tag = "axolotl_docking_star"; + name = "Starboard Airlock Control"; + pixel_x = -22 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"pa" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "pd" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -1295,6 +1913,15 @@ /obj/structure/cable/green, /turf/simulated/floor, /area/groundbase/science/outpost/substation) +"pq" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "pv" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -1344,7 +1971,21 @@ dir = 9 }, /turf/simulated/floor/outdoors/newdirt/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"pN" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "pO" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -1379,6 +2020,16 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"pZ" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "qc" = ( /obj/structure/railing, /obj/structure/railing{ @@ -1426,6 +2077,26 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"qm" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/handrail, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "qn" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -1440,6 +2111,18 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"qr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey, +/obj/machinery/computer/ship/engines{ + dir = 4; + req_one_access = list(160) + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "qw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1462,6 +2145,12 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_testing) +"qL" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_galley) "qN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1507,7 +2196,55 @@ dir = 4 }, /turf/simulated/floor/outdoors/grass/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"rb" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_head) +"rj" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) +"rn" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"ro" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"rp" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "rr" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 @@ -1538,6 +2275,24 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"rD" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_q1) +"rE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "rK" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 5 @@ -1547,6 +2302,29 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"rL" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"rS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "rY" = ( /obj/item/stack/cable_coil/random, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -1570,6 +2348,14 @@ /obj/machinery/space_heater, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"sq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "sr" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/maintenance/rnd{ @@ -1622,7 +2408,25 @@ dir = 5 }, /turf/simulated/floor/outdoors/grass/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"sJ" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"sP" = ( +/obj/structure/handrail, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "sR" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1657,6 +2461,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"tg" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "ti" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, @@ -1688,6 +2508,25 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"tJ" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/handrail, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "tL" = ( /obj/structure/cable{ icon_state = "2-4" @@ -1732,6 +2571,9 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"tX" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl) "tZ" = ( /obj/structure/closet/excavation, /obj/machinery/light{ @@ -1750,7 +2592,21 @@ dir = 8 }, /turf/simulated/floor/outdoors/grass/forest/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"ui" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_galley) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "uj" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -1758,6 +2614,30 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"uo" = ( +/obj/structure/table/steel, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = -22 + }, +/obj/random/pizzabox, +/obj/structure/closet/walllocker_double/kitchen/south, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) +"up" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "us" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1783,6 +2663,12 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"uv" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "uw" = ( /obj/structure/cable{ icon_state = "1-4" @@ -1827,6 +2713,29 @@ /obj/machinery/alarm, /turf/simulated/floor/tiled/monotile, /area/groundbase/science/outpost/anomaly_lab) +"uD" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2; + req_one_access = null + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"uE" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "uG" = ( /turf/simulated/wall, /area/groundbase/science/outpost/anomaly_lab) @@ -1835,6 +2744,37 @@ /obj/item/device/multitool, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"uL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) +"uQ" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"uU" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) +"uV" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "vd" = ( /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, @@ -1872,18 +2812,41 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"vq" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "vr" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 4 }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"vs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/wall/shull, +/area/shuttle/axolotl) "vw" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 8 }, /turf/simulated/floor/outdoors/grass/forest/virgo3c, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"vx" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q2) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "vy" = ( /obj/machinery/light{ dir = 4 @@ -1931,6 +2894,23 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"vP" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"vQ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "vS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1949,6 +2929,22 @@ }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"wd" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "wg" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ @@ -2033,6 +3029,24 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"wN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"wP" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/handrail, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/closet/walllocker_double/north{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "wQ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -2101,6 +3115,23 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"xC" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +"xE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "xI" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2115,6 +3146,16 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"xK" = ( +/obj/structure/hull_corner, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_engineering) +"xM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "xP" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 @@ -2128,6 +3169,13 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"xR" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "xT" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black{ dir = 4 @@ -2139,6 +3187,17 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"xU" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_cockpit) "yc" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -2198,6 +3257,18 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/substation) +"yu" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) +"yC" = ( +/turf/simulated/wall/shull, +/area/shuttle/axolotl_engineering) "yD" = ( /obj/structure/window/reinforced{ dir = 1 @@ -2222,12 +3293,58 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"yF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"yH" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 21; + req_one_access = null + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"yI" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "yL" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"yN" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/fuel_port/heavy{ + pixel_y = 28 + }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"yP" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "yV" = ( /obj/machinery/atmospherics/pipe/manifold/visible/blue{ dir = 8 @@ -2261,6 +3378,12 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"zm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "zx" = ( /obj/machinery/atmospherics/unary/heat_exchanger{ dir = 1 @@ -2289,6 +3412,10 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"zG" = ( +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "zK" = ( /obj/structure/cable{ icon_state = "1-4" @@ -2360,6 +3487,29 @@ /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"zY" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Ac" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -2426,6 +3576,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/wall, /area/groundbase/science/outpost/atmos) +"AB" = ( +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "AD" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -2438,6 +3593,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"AI" = ( +/obj/machinery/computer/ship/sensors{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) "AJ" = ( /obj/structure/cable{ icon_state = "2-4" @@ -2453,10 +3614,22 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"AO" = ( +/obj/machinery/atmospherics/unary/engine/bigger{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "AQ" = ( /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"AR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "AV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -2531,6 +3704,17 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Bs" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Bw" = ( /obj/machinery/camera/network/research_outpost, /turf/simulated/floor/tiled, @@ -2566,6 +3750,32 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/anomaly_storage) +"BL" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/panic_button{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"BN" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "BS" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 1; @@ -2573,6 +3783,19 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/science/outpost/toxins_mixing) +"BU" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/weapon/storage/box/donkpockets, +/obj/item/weapon/storage/box/donkpockets, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/obj/random/snack, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "Cc" = ( /obj/machinery/door/blast/regular{ dir = 2; @@ -2589,6 +3812,20 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Ch" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "Cj" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -2618,10 +3855,35 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"Cr" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 8000.25 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"Ct" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Cu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Cv" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_engineering) "Cw" = ( /obj/structure/anomaly_container, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -2630,7 +3892,39 @@ /turf/unsimulated/wall/planetary/virgo3c{ icon_state = "riveted" }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"CN" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"CO" = ( +/obj/structure/window/reinforced/tinted, +/obj/structure/toilet{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) +"CX" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) +"De" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Dk" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -2659,11 +3953,38 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) -"DA" = ( -/turf/simulated/floor/water/virgo3c{ - outdoors = 0 +"Dr" = ( +/obj/structure/handrail{ + dir = 1 }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +<<<<<<< HEAD /area/groundbase/wilderness/west/unexplored) +======= +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) +"DA" = ( +/turf/simulated/floor/water/virgo3c, +/area/submap/groundbase/wilderness/west/unexplored) +"DB" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "DF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2674,16 +3995,44 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"DH" = ( +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/groundbase/engineering/solarshed) "DI" = ( /obj/machinery/portable_atmospherics/canister/empty/oxygen, /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"DM" = ( +/obj/machinery/door/airlock/hatch{ + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "DP" = ( /obj/machinery/atmospherics/pipe/manifold/visible/supply, /obj/machinery/meter, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"DV" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_head) "DW" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/cable/green{ @@ -2712,6 +4061,22 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"DZ" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_q1) "Eh" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 9 @@ -2726,6 +4091,12 @@ /obj/machinery/firealarm, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Ep" = ( +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Ew" = ( /obj/machinery/firealarm{ dir = 1 @@ -2781,6 +4152,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"EM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "EW" = ( /obj/machinery/door/blast/regular{ dir = 8; @@ -2826,6 +4203,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Fo" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q2) "Fp" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /obj/machinery/door/blast/regular{ @@ -2865,6 +4251,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"FN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "FO" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -2883,6 +4284,18 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"FU" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 21; + req_one_access = null + }, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "FX" = ( /obj/structure/anomaly_container, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2977,6 +4390,20 @@ edge_blending_priority = -1 }, /area/groundbase/engineering/solarfield) +"GN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) "GP" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3009,6 +4436,14 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Hf" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/sleep_console{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Hp" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -3028,6 +4463,16 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_storage) +"Hu" = ( +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/light_switch{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Hv" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 @@ -3191,6 +4636,26 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Is" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl) +"It" = ( +/obj/machinery/suit_cycler, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +"Iu" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Iv" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "science_outpost" @@ -3214,12 +4679,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"IE" = ( +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "II" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"IJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "IM" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 @@ -3258,6 +4733,21 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/outpost/toxins_mixing) +<<<<<<< HEAD +======= +"IU" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"IV" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/asteroid_steel/outdoors/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/engineering/solarfield) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "IX" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -3310,7 +4800,18 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"JH" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/sleeper{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "JL" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -3336,6 +4837,22 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Kf" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"Kl" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Km" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -3356,6 +4873,17 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"Kx" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emerglocker/east, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "KA" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxins_mixing) @@ -3378,6 +4906,15 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"KP" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/alarm/alarms_hidden{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "KV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -3418,6 +4955,20 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"Ln" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 1; + pixel_x = 24; + pixel_y = 11 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Ls" = ( /obj/machinery/radiocarbon_spectrometer, /obj/structure/window/reinforced{ @@ -3454,6 +5005,27 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"LE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ + dir = 4; + id_tag = "axolotl_docking_port"; + name = "Port Airlock Control"; + pixel_x = -22 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/shuttle_landmark/shuttle_initializer/axolotl, +/obj/effect/overmap/visitable/ship/landable/axolotl, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "LF" = ( /obj/structure/table/rack, /obj/item/clothing/suit/space/anomaly, @@ -3477,6 +5049,17 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"LQ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "LV" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 @@ -3495,6 +5078,26 @@ /obj/structure/closet/secure_closet/xenoarchaeologist, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Mn" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/south{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Mr" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -3502,6 +5105,12 @@ }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"Ms" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl_head) "Mx" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -3541,6 +5150,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Nk" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Np" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ scrub_id = "science_outpost" @@ -3553,6 +5169,12 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Nz" = ( +/obj/machinery/computer/shuttle_control/explore/axolotl{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) "NC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3575,6 +5197,23 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"NH" = ( +/obj/machinery/power/port_gen/pacman/mrs{ + anchored = 1 + }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/alarm/alarms_hidden{ + pixel_y = 26 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "NI" = ( /obj/machinery/camera/network/research_outpost{ dir = 4 @@ -3594,6 +5233,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"NT" = ( +/obj/machinery/door/airlock/maintenance/common{ + name = "Solar Access" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/groundbase/engineering/solarshed) "NV" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced{ @@ -3632,12 +5280,47 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/groundbase/science/outpost/toxins_mixing) +"Oc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"On" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -21; + req_one_access = null + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Oq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"Ov" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + pixel_x = 24; + pixel_y = -11 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Oz" = ( +/obj/structure/hull_corner, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/axolotl) "OI" = ( /obj/structure/anomaly_container, /obj/machinery/light_switch{ @@ -3652,6 +5335,32 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) +"OS" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) +"OV" = ( +/obj/machinery/shipsensors{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_cockpit) "Pb" = ( /obj/structure/table/rack, /obj/item/clothing/suit/bio_suit/anomaly, @@ -3682,6 +5391,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Pw" = ( +/obj/structure/cable, +/obj/machinery/power/smes/buildable{ + charge = 500000 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "Pz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3735,6 +5451,19 @@ "PO" = ( /turf/simulated/floor/tiled/steel_grid, /area/groundbase/science/outpost/toxins_lab) +"PP" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q1) +"PR" = ( +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "PW" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging, /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -3742,6 +5471,15 @@ }, /turf/simulated/floor/reinforced/airless, /area/groundbase/science/outpost/toxins_mixing) +"PX" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "Qc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 @@ -3762,6 +5500,22 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/science/outpost/toxins_mixing) +"Qk" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/voidcraft{ + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_galley) "Qm" = ( /obj/structure/table/standard, /obj/item/weapon/tool/crowbar, @@ -3799,6 +5553,16 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_storage) +"QI" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "QM" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4 @@ -3811,6 +5575,9 @@ icon_state = "2-8" }, /obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/simulated/floor, /area/groundbase/engineering/solarshed) "Rc" = ( @@ -3852,6 +5619,25 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/simulated/floor, /area/groundbase/science/outpost/toxins_storage) +"RK" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/handrail, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24; + req_access = null; + req_one_access = list(11,67) + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_galley) "RM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -3947,6 +5733,26 @@ }, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"Sq" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"Sr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Sw" = ( /obj/effect/floor_decal/industrial/danger, /obj/machinery/atmospherics/pipe/simple/insulated{ @@ -3973,7 +5779,26 @@ /turf/simulated/floor/tiled/asteroid_steel/outdoors/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"Te" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"Tg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Ti" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, @@ -4022,6 +5847,22 @@ /obj/machinery/atmospherics/valve, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"TX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) +"Uh" = ( +/obj/structure/closet/crate{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Up" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, @@ -4041,6 +5882,12 @@ "UB" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxins_storage) +"UD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "UI" = ( /obj/structure/table/rack, /obj/item/clothing/suit/space/anomaly, @@ -4059,6 +5906,15 @@ "UN" = ( /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Vd" = ( +/obj/machinery/door/airlock/glass_external/public, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Vf" = ( /obj/structure/table/steel, /obj/item/device/measuring_tape, @@ -4077,7 +5933,18 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, +<<<<<<< HEAD /area/groundbase/wilderness/west) +======= +/area/submap/groundbase/wilderness/west) +"Vi" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "Vk" = ( /obj/machinery/power/apc{ dir = 8 @@ -4088,6 +5955,45 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_lab) +"Vl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/item/clothing/shoes/boots/workboots, +/obj/item/clothing/gloves/duty, +/obj/item/clothing/under/utility, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/head/soft/black, +/obj/structure/closet/walllocker_double/north{ + name = "Uniform Locker" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Vm" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/item/weapon/tank/phoron/pressurized, +/obj/item/weapon/tank/phoron/pressurized, +/obj/structure/closet/walllocker{ + dir = 1; + name = "Spare Fuel"; + pixel_y = -32 + }, +/obj/item/weapon/tool/crowbar/red, +/obj/item/stack/material/tritium{ + amount = 25 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/item/weapon/tool/wrench, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_engineering) "Vr" = ( /obj/structure/bed/chair/office/light, /turf/simulated/floor/tiled, @@ -4110,6 +6016,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_hallway) +"VR" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_q1) "VS" = ( /turf/simulated/floor/tiled, /area/groundbase/science/outpost/toxins_lab) @@ -4121,6 +6033,12 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/engineering/solarshed) +"VX" = ( +/obj/machinery/power/pointdefense{ + id_tag = "axolotl_pd" + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "VZ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4129,6 +6047,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/outpost) +"Wc" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl) "Wg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -4139,6 +6064,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxing_gasworks) +"Wk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "Wl" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/wilderness/west) @@ -4148,18 +6082,44 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"Wn" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -21; + req_one_access = null + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"Wq" = ( +/obj/machinery/atmospherics/binary/pump/fuel, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "Ws" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/wall, /area/groundbase/science/outpost/toxins_lab) +"Wz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8 }, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"WD" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/submap/groundbase/wilderness/west) "WE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ @@ -4188,6 +6148,15 @@ "WV" = ( /turf/simulated/wall, /area/groundbase/science/outpost/toxing_gasworks) +"WX" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) "WZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -4296,6 +6265,25 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"Ye" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl_engineering) "Yk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 10 @@ -4309,6 +6297,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/science/outpost/toxins_mixing) +"Ys" = ( +/obj/machinery/computer/ship/engines{ + dir = 1; + req_one_access = null + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) "Yu" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -4382,6 +6377,34 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/outpost/anomaly_testing) +"YX" = ( +/obj/machinery/computer/ship/helm{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_cockpit) +"Zb" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/air, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/south{ + name = "Voidsuit Locker" + }, +/obj/item/clothing/suit/space, +/obj/item/clothing/head/helmet/space, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl) "Zi" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 1 @@ -4413,6 +6436,23 @@ /obj/structure/anomaly_container, /turf/simulated/floor/tiled/dark, /area/groundbase/science/outpost/anomaly_testing) +"ZC" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) +"ZE" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/shuttle/axolotl_engineering) +"ZG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/shuttle/axolotl) "ZL" = ( /obj/machinery/atmospherics/pipe/vent{ dir = 4 @@ -4438,6 +6478,20 @@ /obj/machinery/alarm, /turf/simulated/floor, /area/groundbase/science/outpost/atmos) +"ZQ" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/axolotl_q1) "ZX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18001,9 +20055,9 @@ nr nr nr nr -YK -YK -YK +nr +nr +nr YK YK YK @@ -18136,22 +20190,22 @@ YK YK YK YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr -nr +kQ +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl iI us zz @@ -18278,22 +20332,22 @@ YK YK YK YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr -nr +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl iI sz jQ @@ -18419,31 +20473,31 @@ YK YK YK YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr nr +Wl +Wl +xC +an +an +an +an +an +an +an +an +an +an +an +an +AR iI nr zz ev JU Mr -JU -JU +DH +fN zz wh nr @@ -18561,30 +20615,30 @@ nr YK YK YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr nr +Wl +Wl +zm +IE +IE +xK +yC +ao +AO +yC +yC +ao +AO +yC +Cv +WD iI nr zz zz vY zz -vY +NT zz zz wh @@ -18702,31 +20756,31 @@ nr nr YK YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK nr nr -iI -iI -iI -iI -iI +Wl +Wl +zm +IE +IE +yC +yC +jV +zG +yC +yC +jV +zG +yC +yC +WD +NF +mI +mI +mI +mI hD -iI +zS nr nr wh @@ -18845,27 +20899,27 @@ nr YK YK YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -YK -YK -YK -YK -YK -nr -nr -nr -nr -nr nr +Wl +Wl +zm +IE +IE +yC +yC +pa +pa +yC +yC +pa +FN +yC +yC +ko +hV +AR +Wl +Wl XS XS nr @@ -18988,26 +21042,26 @@ YK YK YK YK -YK -YK -YK -YK -YK -YK -nr -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -nr -nr -nr +Wl +Wl +zm +IE +IE +yC +kr +wN +rS +bC +Cr +Tg +IU +Iu +yC +IE +xM +WD +Wl +Wl XS XS nr @@ -19130,26 +21184,26 @@ YK YK YK YK -YK -YK -YK -YK -YK -nr -nr -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr +kQ +Wl +zm +IE +IE +WX +ig +Tg +Ep +ZE +ki +Wq +mU +cQ +dy +dN +mv +WD +Wl +Wl XS XS nr @@ -19272,26 +21326,26 @@ YK YK YK YK -YK -YK -YK -YK -nr -nr -nr -nr -Zm -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -nr +kQ +Wl +zm +IE +IE +yC +lR +hG +nG +fl +qr +dq +pq +De +yC +IE +IE +WD +Wl +Wl XS XS nr @@ -19414,27 +21468,27 @@ nr nr YK YK -YK -YK -YK -YK -nr -nr -Zm -Zm -Zm -Zm -nr -nr -nr -nr -nr -nr -nr -YK -YK -nr -nr +Wl +Wl +zm +IE +VX +yC +CN +ba +yF +sq +Vi +yF +uV +Bs +yC +VX +IE +WD +Wl +Wl +Wl XS nr nr @@ -19556,27 +21610,27 @@ nr nr nr YK -YK -YK -YK -YK -nr -nr -Zm -Zm -Zm -Zm -Zm -nr -nr -nr -nr -nr -nr -YK -YK -nr -nr +Wl +Wl +zm +Oz +tX +yC +yC +yN +LQ +OS +BN +LQ +Vm +yC +yC +tX +Is +WD +Wl +Wl +Wl XS XS nr @@ -19697,28 +21751,28 @@ nr nr nr nr -YK -YK -YK -YK -YK -YK -nr -Zm -Zm -Zm -Zm -Zm -Zm -nr -Zm -Zm -Zm -nr -YK -YK -YK nr +Wl +Wl +zm +tX +tX +Uh +yC +NH +rL +Ye +oO +BL +Pw +yC +Uh +tX +tX +WD +Wl +Wl +Wl XS XS nr @@ -19839,28 +21893,28 @@ Zm nr nr nr -YK -nr -YK -YK -YK -YK -nr -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK nr +Wl +Wl +zm +tX +uv +iD +yC +yC +yC +GN +dw +yC +yC +yC +iD +hK +tX +WD +Wl +Wl +Wl XS XS nr @@ -19982,27 +22036,27 @@ Zm nr nr nr -nr -nr -YK -YK -YK -nr -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -YK -YK -nr +Wl +Wl +zm +tX +sP +kc +jn +gy +ZC +Sr +rp +ZC +nK +DM +kc +oe +tX +WD +Wl +Wl +Wl XS XS nr @@ -20121,30 +22175,30 @@ Zm Zm Zm Zm -Zm nr nr nr -nr -YK -YK -YK -YK -nr -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -YK -YK -nr +Wl +Wl +zm +Te +Sq +IJ +tX +AB +uQ +Sr +rp +uQ +yP +tX +Wc +Ct +cs +WD +Wl +Wl +Wl XS XS nr @@ -20264,29 +22318,29 @@ Zm Zm Zm Zm -Zm -Zm nr nr -YK -YK -YK -YK -nr -nr -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -YK -YK -nr +Wl +Wl +zm +tX +Sq +gV +tX +uE +Hf +rE +vQ +xR +Nk +tX +TX +Ct +tX +WD +Wl +Wl +Wl XS XS nr @@ -20407,28 +22461,28 @@ Zm Zm Zm Zm -Zm -Zm -nr -nr -nr -nr -YK -YK -nr -nr -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK nr +Wl +Wl +zm +tX +tX +vs +tX +uE +JH +Sr +xE +uQ +Nk +tX +vs +tX +tX +WD +XS +Wl +Wl XS XS nr @@ -20549,28 +22603,28 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -nr -YK -YK -YK -nr -nr -nr -nr -Zm -Zm -Zm -nr -nr -nr -YK -nr nr +Wl +Wl +zm +lX +LE +On +Vd +Oc +Oc +eN +rp +PR +PR +lz +Wn +oW +yI +WD +XS +XS +Wl XS XS nr @@ -20692,27 +22746,27 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -nr -nr -Zm -Zm -Zm -nr -nr -YK -YK -YK -nr +Wl +Wl +zm +Ln +Kx +Kx +vP +yH +ZG +Wk +rp +PR +FU +lz +dW +dW +Ov +WD +XS +XS +Wl XS XS nr @@ -20834,27 +22888,27 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -nr -Zm -Zm -Zm -YK -YK -YK -YK -YK -nr +Wl +Wl +zm +tX +tX +tX +tX +tX +qm +UD +rp +Zb +tX +tX +tX +tX +tX +WD +Wl +XS +XS XS XS XS @@ -20976,27 +23030,27 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -YK -YK -YK -nr -Zm -Zm -nr -YK -YK -YK -YK -nr -nr +Wl +Wl +zm +Ms +rb +CO +bM +rb +wP +go +up +tg +jx +RK +uo +jx +qL +WD +Wl +XS +XS XS XS XS @@ -21118,27 +23172,27 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -YK -YK -YK -nr -nr -nr -YK -YK -YK -YK -nr -nr +Wl +Wl +zm +IE +rb +pN +DV +gl +Kl +QI +zY +Kl +Qk +be +nn +ui +IE +WD +Wl +Wl +XS XS XS XS @@ -21260,27 +23314,27 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr +Wl +Wl +zm +IE +rb +Ch +eh +rb +It +UD +wd +iB +jx +BU +kf +jx +IE +WD +Wl +Wl +Wl XS XS XS @@ -21401,28 +23455,28 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -nr -nr nr +Wl +Wl +zm +IE +rb +rb +rb +rb +tX +Hu +gO +tX +jx +jx +jx +jx +IE +WD +Wl +Wl +Wl XS XS nr @@ -21543,28 +23597,28 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -nr -nr nr +Wl +Wl +zm +IE +VR +rD +iT +Dr +rD +dl +Mn +gw +tJ +av +gw +br +IE +WD +Wl +Wl +Wl XS XS nr @@ -21685,28 +23739,28 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -nr -nr nr +Wl +Wl +zm +IE +IE +PP +CX +ZQ +DZ +QI +zY +jW +rj +jD +vx +IE +IE +WD +Wl +Wl +Wl XS XS nr @@ -21827,28 +23881,28 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -nr -nr nr +Wl +Wl +zm +IE +IE +rD +PX +KP +rD +Vl +it +gw +Fo +yu +gw +IE +IE +WD +Wl +Wl +Wl XS XS nr @@ -21969,28 +24023,28 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -nr -nr -nr nr +Wl +Wl +zm +IE +IE +rD +rD +rD +rD +eo +uD +gw +gw +gw +gw +IE +IE +WD +Wl +Wl +Wl XS XS nr @@ -22112,27 +24166,27 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr -nr +Wl +Wl +zm +IE +IE +IE +cU +lh +kh +xU +bd +ey +lh +OV +IE +IE +IE +WD +Wl +Wl +Wl XS XS XS @@ -22255,25 +24309,25 @@ Zm Zm Zm Zm -Zm -Zm -Zm -Zm -Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr +Wl +zm +IE +IE +IE +IE +rn +Kf +uL +vq +kR +ro +IE +IE +IE +IE +WD +Wl +Wl XS XS XS @@ -22398,24 +24452,24 @@ Zm Zm Zm Zm -Zm -Zm -nr -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr -nr +zm +IE +IE +IE +IE +rn +AI +gb +gb +Ys +ro +IE +IE +IE +IE +WD +Wl +Wl XS XS XS @@ -22540,25 +24594,25 @@ Zm Zm Zm Zm -Zm -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr +zm +IE +IE +IE +IE +uU +jR +Nz +YX +jR +pZ +IE +IE +IE +IE +WD +Wl +Wl +Wl XS XS nr @@ -22681,26 +24735,26 @@ Zm Zm Zm Zm -nr -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr -nr +Wl +zm +IE +IE +IE +IE +IE +uU +sJ +sJ +pZ +IE +IE +IE +IE +IE +WD +Wl +Wl +Wl XS XS nr @@ -22824,25 +24878,25 @@ Zm Zm Zm Zm -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr +Wz +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +EM +DB +Wl +Wl +Wl XS XS nr @@ -22966,25 +25020,25 @@ Zm Zm Zm Zm -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr -nr +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl XS XS nr @@ -23110,23 +25164,23 @@ Zm Zm Zm Zm -nr -nr -nr -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -YK -nr +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +Wl +kQ +kQ +kQ +kQ +Wl +Wl +Wl XS XS nr @@ -23267,7 +25321,7 @@ YK YK YK YK -YK +nr nr XS XS diff --git a/maps/offmap_vr/om_ships/vespa.dmm b/maps/offmap_vr/om_ships/vespa.dmm index d6a8f83197..6fe6a9831a 100644 --- a/maps/offmap_vr/om_ships/vespa.dmm +++ b/maps/offmap_vr/om_ships/vespa.dmm @@ -5237,7 +5237,6 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangar) "jV" = ( -/obj/machinery/suit_cycler/exploration, /turf/simulated/floor/tiled/techfloor, /area/ship/expe/hangarcontrol) "jW" = ( diff --git a/maps/southern_cross/datums/supplypacks/munitions.dm b/maps/southern_cross/datums/supplypacks/munitions.dm index 143810ff57..fa11e87431 100644 --- a/maps/southern_cross/datums/supplypacks/munitions.dm +++ b/maps/southern_cross/datums/supplypacks/munitions.dm @@ -12,7 +12,7 @@ cost = 50 containertype = /obj/structure/closet/crate/secure/hedberg containername = "Hunting Rifle crate" - access = access_explorer + access = access_brig /datum/supply_pack/munitions/phase_carbines_explorer name = "Weapons - Surplus Phase Carbines" @@ -22,7 +22,7 @@ cost = 25 containertype = /obj/structure/closet/crate/secure/ward containername = "Phase Carbine crate" - access = access_explorer + access = access_brig /datum/supply_pack/munitions/phase_rifles_explorer name = "Weapons - Phase Rifles" @@ -32,4 +32,4 @@ cost = 50 containertype = /obj/structure/closet/crate/secure/ward containername = "Phase Rifle crate" - access = access_explorer \ No newline at end of file + access = access_brig diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm index 54048e59db..00fa17d1b9 100644 --- a/maps/stellar_delight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -8406,6 +8406,7 @@ pixel_x = -24; pixel_y = 25 }, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug, /turf/simulated/floor/tiled, /area/centcom/holding) "HK" = ( diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index b7bc90fe65..6f145a101a 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -191,8 +191,29 @@ /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "ay" = ( +<<<<<<< HEAD /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/pathfinder) +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/device/multitool/sd_buffered{ + pixel_y = 2 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) +"az" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/eris, +/area/rnd/xenobiology/xenoflora) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "aA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -299,12 +320,16 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "aJ" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/command{ dir = 4 }, -/obj/effect/landmark/start/fieldmedic, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/exploequipment) "aK" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -2050,12 +2075,26 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "em" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = -4 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/exploequipment) "en" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -2181,7 +2220,7 @@ icon_state = "1-2" }, /turf/simulated/wall/bay/purple, -/area/stellardelight/deck1/pathfinder) +/area/stellardelight/deck1/exploration) "ez" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/sterile/latex, @@ -2275,9 +2314,41 @@ /turf/simulated/floor/carpet, /area/library) "eJ" = ( -/obj/machinery/mineral/equipment_vendor/survey, +/obj/structure/table/rack/shelf, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = 5 + }, /turf/simulated/floor/tiled/milspec, +<<<<<<< HEAD /area/stellardelight/deck1/explobriefing) +======= +/area/stellardelight/deck1/exploequipment) +"eL" = ( +/obj/structure/mirror{ + pixel_y = 38 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "eM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2628,10 +2699,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardfore) "fD" = ( -/obj/structure/closet/secure_closet/pathfinder, -/obj/item/device/bluespaceradio/sd_prelinked, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -64 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "fE" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -4790,15 +4863,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) -"jS" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "jT" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -4906,7 +4970,6 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "kh" = ( @@ -5413,8 +5476,8 @@ pixel_x = -32 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = -32; pixel_y = -6 }, @@ -5656,9 +5719,14 @@ /obj/machinery/door/airlock/angled_bay/standard/glass{ dir = 4; door_color = "#333333"; +<<<<<<< HEAD name = "Exploration Equipment Room"; req_access = null; req_one_access = list(19,43,67); +======= + name = "Auxiliary EVA Equipment Room"; + req_one_access = list(18,19,43); +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -5804,14 +5872,14 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "md" = ( -/obj/structure/bed/chair/office/dark{ +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/chair/backed_red{ dir = 8 }, -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "me" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6121,20 +6189,15 @@ /turf/simulated/floor/reinforced, /area/stellardelight/deck1/shuttlebay) "mH" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/weapon/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/machinery/firealarm/angled, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "mI" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -6275,8 +6338,13 @@ /obj/machinery/door/airlock/angled_bay/double/glass{ dir = 8; door_color = "#333333"; +<<<<<<< HEAD name = "Exploration"; req_one_access = list(19,43,67); +======= + name = "Away Mission Meeting Room"; + req_one_access = null; +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -6315,16 +6383,6 @@ /obj/effect/floor_decal/milspec/color/black, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"na" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "nb" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -6342,7 +6400,16 @@ /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) "nd" = ( -/obj/structure/closet/secure_closet/sar, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(5) + }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "ne" = ( @@ -7253,15 +7320,11 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "pd" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = -64 }, -/obj/effect/landmark/start/pf, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "pe" = ( /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/stellardelight/deck1/miningshuttle) @@ -7525,10 +7588,6 @@ "pF" = ( /turf/simulated/wall/bay/purple, /area/stellardelight/deck1/researchequip) -"pG" = ( -/obj/machinery/suit_cycler/exploration, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "pH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/yellow{ @@ -7806,9 +7865,6 @@ /area/stellardelight/deck1/explobriefing) "ql" = ( /obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Exploration Briefing" - }, /obj/machinery/light{ dir = 1 }, @@ -8338,26 +8394,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/assembly/robotics) -"rv" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/start/fieldmedic, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) "rw" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -8509,22 +8545,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/medical/morgue) "rM" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "rN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8938,8 +8964,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/double/glass{ door_color = "#333333"; - name = "Exploration"; - req_one_access = null; + name = "Shuttle Bay"; stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -8950,12 +8975,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardfore) -"sE" = ( -/obj/structure/bed/chair/backed_red{ - dir = 4 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploration) "sF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9057,10 +9076,9 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "sO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/effect/landmark/start/fieldmedic, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "sP" = ( @@ -9197,8 +9215,8 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck1/portcent) "te" = ( -/obj/machinery/suit_cycler/exploration, /obj/machinery/firealarm/angled, +/obj/machinery/chemical_analyzer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "tf" = ( @@ -9258,8 +9276,8 @@ "tm" = ( /obj/structure/dogbed, /mob/living/simple_mob/animal/passive/tindalos/twigs, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "tn" = ( /obj/machinery/light{ dir = 4 @@ -9606,10 +9624,17 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "uc" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(43) }, +/obj/item/device/bluespaceradio/sd_prelinked, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "ue" = ( @@ -9628,14 +9653,11 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "uf" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "ug" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -9763,22 +9785,10 @@ /turf/space/internal_edge/left, /area/stellardelight/deck1/starboard) "ux" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/angled_bay/standard/color{ - door_color = "#333333"; - fill_color = "#757575"; - name = "Pathfinder"; - req_access = list(44); - stripe_color = "#5a19a8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "uy" = ( /obj/structure/table/rack/shelf/steel, /obj/item/weapon/gun/energy/ionrifle/pistol, @@ -10098,8 +10108,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "vf" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/yellow{ @@ -10578,11 +10588,6 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "wk" = ( -/obj/machinery/requests_console{ - department = "Exploration"; - name = "Exploration Requests Console"; - pixel_x = -30 - }, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-2" @@ -11565,14 +11570,6 @@ /obj/random/maintenance, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardcent) -"ys" = ( -/obj/machinery/requests_console{ - department = "Exploration"; - name = "Exploration Requests Console"; - pixel_x = 30 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploration) "yt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11703,16 +11700,6 @@ }, /turf/simulated/floor/tiled/dark, /area/assembly/robotics) -"yJ" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "yK" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11945,12 +11932,19 @@ }, /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm8) +<<<<<<< HEAD "zh" = ( /obj/structure/bed/chair/backed_red{ dir = 8 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) +======= +"zi" = ( +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/portcent) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "zj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -11983,10 +11977,8 @@ "zm" = ( /obj/structure/closet/walllocker_double/east, /obj/item/device/camera, -/obj/item/device/universal_translator, /obj/item/weapon/folder/yellow, /obj/item/weapon/pen, -/obj/item/weapon/storage/box/lights/mixed, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-2" @@ -12186,13 +12178,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) "zK" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, /obj/machinery/light, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) @@ -12248,7 +12233,7 @@ color = "#42038a"; icon_state = "4-8" }, -/obj/machinery/camera/network/exploration, +/obj/machinery/camera/network/command, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "zP" = ( @@ -12502,7 +12487,6 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start/fieldmedic, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Ao" = ( @@ -12636,10 +12620,6 @@ }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) -"AE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "AF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13436,39 +13416,14 @@ /turf/simulated/floor/wood, /area/library) "Cl" = ( -/obj/structure/table/rack/shelf, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, /obj/machinery/light{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/camera/network/exploration{ +/obj/machinery/camera/network/command{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Cm" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -13637,10 +13592,6 @@ "CG" = ( /turf/simulated/wall/bay/white, /area/stellardelight/deck1/resleeving) -"CH" = ( -/obj/structure/closet/secure_closet/explorer, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "CI" = ( /obj/machinery/computer/secure_data, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -13687,11 +13638,6 @@ /obj/structure/low_wall/bay/reinforced/red, /turf/simulated/floor, /area/prison/cell_block/C) -"CN" = ( -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start/fieldmedic, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) "CO" = ( /obj/structure/table/woodentable, /obj/machinery/librarycomp, @@ -13734,7 +13680,11 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/table/standard, +/obj/item/device/cataloguer, +/obj/item/device/cataloguer, +/obj/item/device/cataloguer/compact, +/obj/item/device/cataloguer/compact, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "CU" = ( @@ -14506,38 +14456,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) -"EF" = ( -/obj/structure/table/rack/shelf, -/obj/item/device/radio{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/device/radio{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/device/radio{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/device/radio{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 20 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 28 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 36 - }, -/turf/simulated/floor/tiled, -/area/stellardelight/deck1/explobriefing) "EG" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -14949,8 +14867,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/camera/network/exploration{ - dir = 8 +/obj/machinery/camera/network/command{ + dir = 9 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) @@ -15106,18 +15024,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portcent) -"FS" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/obj/item/weapon/hand_labeler, -/obj/item/device/multitool/sd_buffered{ - pixel_y = 2 - }, -/obj/item/weapon/hand_labeler, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "FT" = ( /turf/simulated/wall/bay/brown, /area/library) @@ -15322,19 +15228,6 @@ "Gr" = ( /turf/simulated/wall/bay/r_wall/red, /area/security/tactical) -"Gt" = ( -/obj/machinery/power/apc/angled{ - dir = 4 - }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "0-8" - }, -/obj/machinery/light_switch{ - pixel_y = 25 - }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "Gu" = ( /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, @@ -15634,17 +15527,18 @@ /turf/simulated/floor, /area/stellardelight/deck1/explobriefing) "Hf" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/machinery/requests_console{ - department = "Exploration"; - name = "Exploration Requests Console"; - pixel_x = -30 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "Hg" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15882,15 +15776,11 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "HG" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Pathfinder's Office" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "HH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -16295,8 +16185,13 @@ /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; door_color = "#525252"; +<<<<<<< HEAD name = "Exploration Shuttle"; +======= + name = "EVA Shuttle"; + req_one_access = list(18,19,43); +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo stripe_color = "#408f3b" }, /obj/structure/cable/green{ @@ -16890,9 +16785,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/research) -"JL" = ( -/turf/simulated/wall/bay/r_wall/steel, -/area/stellardelight/deck1/pathfinder) "JM" = ( /obj/structure/cable/pink{ icon_state = "4-8" @@ -17048,10 +16940,17 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Ke" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/machinery/camera/network/exploration{ - dir = 4 +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/door/window/brigdoor/eastleft{ + req_access = list(43) }, +/obj/item/device/mapping_unit, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Kf" = ( @@ -17373,8 +17272,8 @@ /turf/simulated/floor/reinforced, /area/stellardelight/deck1/shuttlebay) "KU" = ( -/obj/machinery/camera/network/exploration{ - dir = 8 +/obj/machinery/camera/network/command{ + dir = 9 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) @@ -18382,16 +18281,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/maintenance/stellardelight/substation/exploration) -"MW" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/bay/reinforced, -/obj/machinery/door/blast/angled/open{ - dir = 2; - id = "explowindowlockdown" - }, -/obj/structure/low_wall/bay/reinforced/steel, -/turf/simulated/floor, -/area/stellardelight/deck1/pathfinder) "MX" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -18659,9 +18548,15 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "Nx" = ( -/obj/structure/closet/secure_closet/sar, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/machinery/door/window/brigdoor/eastleft{ + req_access = list(5) }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) @@ -18851,7 +18746,7 @@ icon_state = "1-2" }, /turf/simulated/wall/bay/r_wall/steel, -/area/stellardelight/deck1/pathfinder) +/area/stellardelight/deck1/exploration) "NZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -19106,7 +19001,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "OC" = ( @@ -19511,7 +19405,6 @@ /obj/structure/bed/chair/backed_red{ dir = 8 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "PD" = ( @@ -20626,7 +20519,7 @@ /area/rnd/xenobiology/xenoflora) "RS" = ( /turf/simulated/wall/bay/purple, -/area/stellardelight/deck1/pathfinder) +/area/stellardelight/deck1/explobriefing) "RT" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/white{ @@ -21019,8 +20912,8 @@ icon_state = "1-8" }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = 32 }, /obj/structure/sign/directions/science{ @@ -21064,8 +20957,8 @@ dir = 8 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_y = -32 }, /turf/simulated/floor/tiled/techmaint, @@ -21364,7 +21257,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Ts" = ( @@ -21425,7 +21317,6 @@ /area/stellardelight/deck1/mining) "TC" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "TD" = ( @@ -21433,10 +21324,6 @@ color = "#42038a"; icon_state = "4-8" }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "2-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -21550,9 +21437,9 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; + desc = "A direction sign, pointing out the way to the shuttle bay."; dir = 10; - name = "\improper Exploration Department"; + name = "\improper Shuttle Bay"; pixel_x = -32; pixel_y = -6 }, @@ -21844,7 +21731,6 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Up" = ( -/obj/machinery/chemical_analyzer, /obj/machinery/status_display{ pixel_y = 32 }, @@ -22107,6 +21993,7 @@ dir = 4; pixel_x = 24 }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "US" = ( @@ -22170,8 +22057,6 @@ /area/rnd/xenobiology) "UW" = ( /obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/secure_closet/guncabinet/excursion, -/obj/item/weapon/pickaxe/drill, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/stellardelight/deck1/exploshuttle) "UX" = ( @@ -22271,9 +22156,6 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) -"Vj" = ( -/turf/simulated/wall/bay/purple, -/area/stellardelight/deck1/exploequipment) "Vk" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -22319,10 +22201,7 @@ color = "#42038a"; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/landmark/start/explorer, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Vp" = ( @@ -23035,7 +22914,6 @@ /obj/structure/bed/chair/backed_red{ dir = 4 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "WJ" = ( @@ -23481,7 +23359,11 @@ dir = 4; door_color = "#ffffff"; name = "maintenance access"; +<<<<<<< HEAD req_one_access = list(19,43,67); +======= + req_one_access = null; +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -23786,10 +23668,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) -"Yl" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "Ym" = ( /obj/structure/cable/pink{ icon_state = "1-8" @@ -23961,15 +23839,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora_storage) -"YD" = ( -/obj/structure/bed/chair/backed_red{ - dir = 4 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploration) "YE" = ( /turf/simulated/floor, /area/maintenance/stellardelight/substation/cargo) @@ -24143,12 +24012,6 @@ "YT" = ( /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) -"YU" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/pen, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "YV" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -24538,16 +24401,10 @@ /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "ZN" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, /obj/machinery/light{ dir = 1 }, +/obj/machinery/mineral/equipment_vendor/survey, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "ZO" = ( @@ -24576,7 +24433,6 @@ /area/security/warden) "ZQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start/fieldmedic, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "ZR" = ( @@ -31308,11 +31164,11 @@ Jp um if WM -EF +Rz Rz Uo kg -aJ +kg kg ji kO @@ -31452,11 +31308,11 @@ XM WM Up Rz -CN +TC zZ yP zZ -rv +OB Rz ny bD @@ -31734,12 +31590,12 @@ Pu Ua Ec WM -eJ +Rz Rz NA -em An -em +An +An sN Rz ny @@ -32018,7 +31874,7 @@ pC pC pC pC -Vj +pC vy mW RS @@ -32026,7 +31882,7 @@ RS RS RS RS -JL +nk RF vF uq @@ -32161,20 +32017,20 @@ ma pC uc Ke -CH +pC Aa -FS +pC nd Nx -Vj +pC XH TR -RS +WH mH -Yl -fD +WH +WH Hf -JL +LZ bD hE JE @@ -32303,20 +32159,20 @@ fO pC Vo Tr -Tr +aJ tW -AE +ZQ ZQ sO -Vj +pC CK jZ -RS +DO uf -ay +DO pd ve -MW +uB uq vF bD @@ -32442,23 +32298,23 @@ Aj vj vU uu -Vj +pC ZN -yJ -yJ +tY +tY GB tY -na +tY zK -Vj +pC By TD ux rM -jS -YU +Qt +Qt HG -MW +uB uq vF uq @@ -32584,23 +32440,23 @@ Aj gn OZ Bl -Vj +pC te tY At vw tY tY -pG -Vj +eJ +pC PE jZ -RS -Gt -ay +PC +PC +PC md tm -JL +LZ bD vF uq @@ -32734,15 +32590,15 @@ Aj rk OZ Bl -Vj +pC CT -AE -AE +ay +em eu AD UR xk -Vj +pC Jz LO ey @@ -32876,21 +32732,21 @@ Aj Dm Gh Bl -Vj +pC tu tu -Vj +pC lO -Vj +pC tu tu -Vj +pC zL SE vz WH -YD -sE +WH +WH gh uB bD @@ -33031,7 +32887,7 @@ UT Md Qt Qt -Qt +fD Qt ho uB @@ -33162,7 +33018,7 @@ nY fS xb PN -ys +DO ce zs DO @@ -33171,8 +33027,8 @@ Pw DO iQ KU -zh -zh +PC +PC lw PC Ty diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index 0736eaa21e..1c7d90ba50 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -558,8 +558,8 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = 32; pixel_y = -6 }, @@ -627,8 +627,8 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = -32; pixel_y = -6 }, @@ -5293,9 +5293,9 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; + desc = "A direction sign, pointing out the way to the shuttle bay."; dir = 1; - name = "\improper Exploration Department"; + name = "\improper Shuttle Bay"; pixel_x = 32; pixel_y = -12 }, diff --git a/maps/stellar_delight/stellar_delight_jobs.dm b/maps/stellar_delight/stellar_delight_jobs.dm index 312fc0befa..696f4950f7 100644 --- a/maps/stellar_delight/stellar_delight_jobs.dm +++ b/maps/stellar_delight/stellar_delight_jobs.dm @@ -1,5 +1,6 @@ //The pathfinder doesn't have a OM shuttle that they are in charge of, and so, doesn't need pilot access. //Mostly to prevent explo from just commandeering the Starstuff as the explo shuttle without involving a pilot every round. +/* /datum/job/pathfinder access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) @@ -8,7 +9,7 @@ /datum/job/sar access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks) minimal_access = list(access_medical, access_medical_equip, access_morgue) - +*/ /datum/job/hop alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) @@ -30,4 +31,4 @@ title = "Master-at-Arms" /datum/job/pilot/get_request_reasons() - return list("Moving Stellar Delight") \ No newline at end of file + return list("Moving Stellar Delight") diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm index 7ddefa3365..618212d1ae 100644 --- a/maps/stellar_delight/stellar_delight_telecomms.dm +++ b/maps/stellar_delight/stellar_delight_telecomms.dm @@ -14,7 +14,7 @@ network = "tcommsat" autolinkers = list("hub", "sd_relay", "c_relay", "m_relay", "r_relay", - "science", "medical", "supply", "service", "common", "command", "engineering", "security", "explorer", "unused", + "science", "medical", "supply", "service", "common", "command", "engineering", "security", "Away Team", "unused", "hb_relay", "receiverA", "broadcasterA" ) @@ -30,7 +30,7 @@ /obj/machinery/telecomms/server/presets/service/sd freq_listening = list(SRV_FREQ, EXP_FREQ) - autolinkers = list("service", "explorer") + autolinkers = list("service", "Away Team") // Telecommunications Satellite /area/sd/surfacebase/tcomms @@ -79,7 +79,7 @@ num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology), num2text(SUP_FREQ) = list(access_cargo), num2text(SRV_FREQ) = list(access_janitor, access_hydroponics), - num2text(EXP_FREQ) = list(access_explorer) + num2text(EXP_FREQ) = list(access_awayteam) ) /obj/item/device/multitool/sd_buffered diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index ef54e274f3..a6d1d598c3 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -8430,6 +8430,7 @@ pixel_x = -24; pixel_y = 25 }, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug, /turf/simulated/floor/tiled, /area/centcom/holding) "HK" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index ea409adb7d..d09d479a73 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -151,16 +151,11 @@ /turf/simulated/wall/r_wall, /area/engineering/engine_room) "aao" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, /area/tether/exploration/hallway) +<<<<<<< HEAD "aap" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -180,6 +175,11 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) +======= +"aaq" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/station/exploration) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "aar" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -372,6 +372,22 @@ }, /turf/simulated/floor, /area/engineering/engine_smes) +<<<<<<< HEAD +======= +"aaM" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "aaN" = ( /turf/simulated/wall/r_wall, /area/storage/tech) @@ -510,6 +526,71 @@ "abk" = ( /turf/simulated/floor/reinforced, /area/engineering/engine_room) +<<<<<<< HEAD +======= +"abl" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"abm" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"abn" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor, +/area/teleporter/departing) +"abo" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/teleporter/departing) +"abp" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/teleporter/departing) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "abq" = ( /obj/machinery/door/airlock/maintenance_hatch{ frequency = 1379; @@ -864,9 +945,7 @@ pixel_y = -24 }, /obj/structure/table/standard, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -1486,6 +1565,7 @@ }) >>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "adc" = ( +<<<<<<< HEAD /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -1501,6 +1581,24 @@ /obj/structure/closet/secure_closet/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) +======= +/obj/structure/flora/tree/jungle, +/turf/simulated/floor/grass, +/area/hallway/station/atrium) +"add" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ade" = ( /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled, @@ -2084,6 +2182,7 @@ /turf/simulated/floor/tiled/techfloor, /area/tcommsat/chamber) <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 82938b4671b... Merge pull request #12192 from Heroman3003/accesses-and-buttons ======= "adO" = ( @@ -2109,6 +2208,28 @@ /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) >>>>>>> 2b91289349e... Merge pull request #12326 from Heroman3003/tetherfix2 +======= +"adP" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/foyer) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "adQ" = ( /obj/machinery/computer/power_monitor{ dir = 4; @@ -3884,17 +4005,24 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/storage) "ahS" = ( -/obj/machinery/sleeper{ - dir = 4 +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "eva_outer"; + locked = 1; + name = "EVA External Access"; + req_one_access = list() }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "eva_airlock"; + name = "exterior access button"; + pixel_y = 32 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/hallway) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "ahT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -3989,28 +4117,27 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "aii" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light_switch{ +/obj/structure/table/rack{ dir = 8; - pixel_x = 24 + layer = 2.9 }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/hallway) +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(5) + }, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "aij" = ( /turf/simulated/wall/r_wall, /area/engineering/break_room) @@ -4235,32 +4362,36 @@ /turf/simulated/floor, /area/storage/tech) "aiJ" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/hallway) +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "aiL" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "eva_inner"; + locked = 1; + name = "EVA Internal Access"; + req_one_access = list() }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/hallway) +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "eva_airlock"; + name = "interior access button"; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "aiM" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_airlock) @@ -4285,18 +4416,11 @@ /turf/simulated/floor, /area/engineering/storage) "aiU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/hallway) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "aiV" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/industrial/outline/yellow, @@ -4309,30 +4433,24 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "aiZ" = ( -/obj/machinery/door/airlock/glass_science{ - name = "Exploration Triage Room"; - req_one_access = list(19,43,67) +/obj/machinery/suit_cycler/mining{ + req_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/hallway) +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "ajb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/bordercorner2{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -4342,12 +4460,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "ajd" = ( @@ -4367,8 +4481,11 @@ }, /area/tcommsat/chamber) "ajj" = ( +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "ajp" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -4378,14 +4495,14 @@ /turf/simulated/wall/r_wall, /area/engineering/engine_room) "ajq" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 6 - }, +/obj/structure/table/reinforced, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/camera/network/command, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "ajr" = ( /obj/machinery/ntnet_relay, /turf/simulated/floor/tiled/dark{ @@ -4417,37 +4534,28 @@ }, /area/tcommsat/chamber) "ajv" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "eva_inner"; + locked = 1; + name = "EVA Internal Access"; + req_one_access = list() }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "ajw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "eng_starboard_pump" }, -/obj/structure/table/woodentable, -/obj/item/weapon/paper_bin, -/obj/item/device/taperecorder, -/obj/item/weapon/pen, -/obj/effect/floor_decal/corner/green/border{ - dir = 5 +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "ajx" = ( /obj/machinery/telecomms/server/presets/medical, /turf/simulated/floor/tiled/dark{ @@ -4467,6 +4575,7 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +<<<<<<< HEAD "ajz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -4481,6 +4590,8 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ajA" = ( /obj/machinery/telecomms/server/presets/common, /turf/simulated/floor/tiled/dark{ @@ -4506,20 +4617,12 @@ /turf/simulated/floor, /area/engineering/storage) "ajE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/suit_cycler/engineering{ + req_access = null }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "ajF" = ( /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -4603,9 +4706,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"ajY" = ( -/turf/simulated/wall, -/area/tether/exploration/equipment) "ajZ" = ( /obj/item/weapon/stock_parts/manipulator, /obj/item/weapon/stock_parts/matter_bin, @@ -4623,60 +4723,20 @@ /obj/structure/table/steel, /turf/simulated/floor, /area/storage/tech) -"akc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) -"akd" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = 11; - pixel_y = 24 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) "ake" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "pathfinder_office" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/tether/exploration/pathfinder_office) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_medical{ + name = "Public Emergency Triage"; + req_one_access = list() + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/tether/exploration/hallway) "akf" = ( /obj/structure/cable/green{ d2 = 4; @@ -4687,23 +4747,17 @@ name = "west bump"; pixel_x = -28 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/effect/floor_decal/corner/green/bordercorner2{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 10 +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -5071,14 +5125,12 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "alj" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/landmark/start{ - name = "Field Medic" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor/tiled/monotile, +/area/ai_monitored/storage/eva) "alk" = ( /obj/structure/table/steel, /obj/item/device/integrated_electronics/debugger{ @@ -5090,17 +5142,14 @@ /turf/simulated/floor, /area/storage/tech) "all" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/obj/effect/landmark/start{ - name = "Pilot" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor/tiled/monotile, +/area/ai_monitored/storage/eva) "alm" = ( /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) @@ -5404,13 +5453,6 @@ /obj/vehicle/train/trolley, /turf/simulated/floor/tiled/monotile, /area/engineering/hallway) -"alV" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) "alW" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/steeldecal/steel_decals_central6{ @@ -5428,33 +5470,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) -"alY" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) "alZ" = ( /obj/structure/table/rack/steel, /obj/item/weapon/circuitboard/rdserver{ @@ -5571,14 +5586,14 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "ami" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/equipment) +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "amj" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 @@ -5610,21 +5625,6 @@ /obj/item/clothing/glasses/meson, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) -"amm" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) "amn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5681,19 +5681,21 @@ /turf/simulated/floor/carpet, /area/engineering/foyer) "amy" = ( -/obj/machinery/shower{ - pixel_y = 16 +/obj/machinery/gateway{ + density = 0; + dir = 5; + layer = 4.1; + plane = -25 }, -/obj/structure/curtain/open/shower, -/obj/item/weapon/soap/nanotrasen, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/pilot_office) +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "amz" = ( /obj/machinery/telecomms/server/presets/unused, /turf/simulated/floor/tiled/dark{ @@ -5745,18 +5747,6 @@ "amK" = ( /turf/simulated/floor, /area/storage/tech) -"amM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Pathfinder's Office" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) "amO" = ( /obj/structure/dispenser, /turf/simulated/floor, @@ -5765,17 +5755,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"amT" = ( -/obj/effect/floor_decal/borderfloor, -/obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/weapon/pen, -/obj/effect/floor_decal/corner/green/border, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) "amU" = ( /obj/machinery/power/apc{ alarms_hidden = 1; @@ -5794,6 +5773,7 @@ name = "Shuttle Blast Doors" >>>>>>> de1f9190b8b... Merge pull request #12143 from Very-Soft/returntotether }, +<<<<<<< HEAD /obj/structure/cable, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) @@ -5819,6 +5799,10 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) +======= +/turf/simulated/floor/plating, +/area/shuttle/medivac/cockpit) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "amY" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/firstaid/regular, @@ -5901,30 +5885,11 @@ /turf/simulated/floor/plating, /area/storage/tech) "anc" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/area/ai_monitored/storage/eva) "and" = ( /obj/machinery/computer/atmoscontrol{ dir = 4 @@ -5974,6 +5939,12 @@ /obj/machinery/vending/assist, /turf/simulated/floor, /area/storage/tech) +"ans" = ( +/obj/item/weapon/storage/box/nifsofts_pilot, +/obj/structure/table/steel, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "ant" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6830,12 +6801,19 @@ name = "\improper Telecomms Solar Field" }) "apf" = ( +<<<<<<< HEAD /obj/machinery/gateway{ dir = 5 }, /turf/simulated/floor/tiled/dark, /area/gateway) >>>>>>> 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid +======= +/obj/machinery/camera/network/command, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "apg" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -7319,12 +7297,15 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "apY" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 1 +/obj/effect/floor_decal/industrial/outline{ + color = "#5c00ad" }, -/turf/simulated/floor, -/area/maintenance/station/exploration) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/suit_cycler/exploration, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "aqa" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled, @@ -8047,31 +8028,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/break_room) "ash" = ( -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/suit_cycler/medical{ + req_access = null }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 4 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "ask" = ( /obj/structure/cable/green{ d1 = 2; @@ -8228,28 +8193,14 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "asF" = ( -/obj/structure/table/rack/shelf, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 5 +/obj/structure/table/reinforced, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = 1; + pixel_y = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/area/ai_monitored/storage/eva) "asG" = ( /turf/simulated/floor/airless, /area/space) @@ -8307,9 +8258,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"asP" = ( -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "asS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -8506,18 +8454,13 @@ /turf/simulated/floor, /area/quartermaster/delivery) "atx" = ( -/obj/machinery/door/airlock/multi_tile/metal{ - dir = 2; - name = "Gateway Prep Room" - }, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "PubPrepFront"; - layer = 3.3; - name = "Gateway Prep Shutter" - }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2; + name = "Gateway/EVA Prep Room"; + req_access = list(18,19,43,67) + }, +/turf/simulated/floor/tiled/steel_ridged, /area/gateway/prep_room) "atA" = ( /obj/effect/floor_decal/industrial/warning{ @@ -8714,14 +8657,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "aul" = ( -/obj/structure/catwalk, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/station/exploration) +/turf/simulated/wall/r_wall, +/area/ai_monitored/storage/eva) "auo" = ( /obj/machinery/telecomms/bus/preset_three, /turf/simulated/floor/tiled/dark{ @@ -8886,11 +8826,12 @@ /turf/simulated/floor/tiled, /area/engineering/atmos/backup) "avb" = ( -/obj/effect/landmark/start{ - name = "Explorer" +/obj/machinery/suit_cycler/security{ + req_access = null }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "avc" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -10341,13 +10282,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/light/small, /turf/simulated/floor, /area/maintenance/station/eng_lower) "azK" = ( @@ -10673,12 +10612,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/steel, /area/quartermaster/warehouse) -"aAV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "aAW" = ( /turf/simulated/wall, /area/crew_quarters/sleep/engi_wash) @@ -11151,19 +11084,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"aCz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "aCA" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -11175,11 +11095,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "aCB" = ( @@ -11791,14 +11706,13 @@ name = "\improper Telecomms Solar Field" }) "aEK" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "pathfinder_office" }, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/turf/simulated/floor/plating, +/area/tether/exploration/pilot_office) "aEM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -11992,11 +11906,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "aGs" = ( @@ -12051,15 +11960,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"aHc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/meter{ - frequency = 1443; - id = "dist_aux_meter"; - name = "Distribution Loop" - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "aHe" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -12215,11 +12115,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "aIG" = ( @@ -12412,13 +12307,13 @@ /turf/simulated/floor/tiled, /area/gateway/prep_room) "aKJ" = ( -/obj/structure/table/reinforced, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/roller, /obj/machinery/light{ dir = 1 }, +<<<<<<< HEAD +======= +/obj/machinery/mineral/equipment_vendor/survey, +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "aKN" = ( @@ -12729,20 +12624,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"aLV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "aLY" = ( /obj/structure/cable/green{ d1 = 4; @@ -13653,8 +13534,9 @@ /area/crew_quarters/heads/chief) "aTV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/roller, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "aTX" = ( @@ -13888,7 +13770,9 @@ /area/tether/exploration) "aWJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/regular, +/obj/machinery/camera/network/command, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "aXm" = ( @@ -14044,13 +13928,12 @@ /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/mining_outpost/shuttle) "aZv" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/turf/simulated/floor, +/area/maintenance/station/exploration) "aZP" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -14098,6 +13981,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "bbb" = ( @@ -14155,6 +14041,9 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "bcc" = ( @@ -14307,8 +14196,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "bdy" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/chemical_analyzer, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "bdF" = ( @@ -14506,18 +14394,17 @@ /area/shuttle/medivac/general) >>>>>>> de1f9190b8b... Merge pull request #12143 from Very-Soft/returntotether "beY" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -14548,6 +14435,9 @@ "bfH" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/station/exploration) "bfJ" = ( @@ -14679,13 +14569,6 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) "bhK" = ( -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "PubPrepFront"; - name = "Gateway Shutter"; - pixel_x = -26; - req_access = list(62) - }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ @@ -14711,6 +14594,10 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, /area/maintenance/station/exploration) "bjF" = ( @@ -14726,23 +14613,17 @@ /turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) "bkI" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/borderfloor, -/obj/item/device/camera, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/structure/table/reinforced, +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/effect/floor_decal/corner/green/border, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/item/device/cataloguer, +/obj/item/device/cataloguer, +/obj/item/device/cataloguer/compact, +/obj/item/device/cataloguer/compact, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "bkU" = ( /obj/machinery/light{ dir = 8 @@ -14756,31 +14637,19 @@ /turf/simulated/shuttle/wall/hard_corner, /area/shuttle/mining_outpost/shuttle) "bmv" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/requests_console{ - department = "Exploration"; - dir = 1; - name = "Exploration Requests Console"; - pixel_y = -30 +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 3; + pixel_y = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_y = 3 }, -/obj/machinery/light, -/obj/effect/floor_decal/corner/green/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = -3 }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "bmA" = ( /obj/machinery/light{ dir = 8 @@ -14850,18 +14719,16 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"box" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +"boC" = ( +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration/pilot_office) "bpi" = ( -/obj/machinery/camera/network/command, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor, +/area/maintenance/station/exploration) "bpT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -14962,22 +14829,19 @@ /turf/simulated/floor/tiled, /area/engineering/gravity_gen) "bth" = ( -/obj/machinery/door/airlock/glass_science{ - name = "Pilots Office"; - req_one_access = list(67) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/pilot_office) <<<<<<< HEAD ======= +======= +/turf/simulated/floor/grass, +/area/hallway/station/atrium) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "btm" = ( /obj/machinery/atmospherics/unary/engine/fancy_shuttle{ dir = 1 @@ -15108,6 +14972,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "bxi" = ( +<<<<<<< HEAD /obj/structure/cable/green, /obj/machinery/power/apc{ name = "south bump"; @@ -15117,12 +14982,16 @@ /obj/effect/floor_decal/corner/green/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 +======= +/obj/effect/floor_decal/industrial/warning{ + dir = 4 +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/machinery/alarm{ + pixel_y = 22 }, /turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/area/ai_monitored/storage/eva) "bxo" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -15170,13 +15039,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_lobby) -"bzq" = ( -/obj/machinery/suit_cycler/medical{ - req_access = null - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "bzw" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -15237,26 +15099,10 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_lobby) "bDi" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 6 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 26; - pixel_y = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor, +/area/maintenance/station/exploration) "bEu" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -15266,19 +15112,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"bEW" = ( -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for exiting EVA."; - dir = 4; - id = "evadoors"; - name = "EVA Door Control"; - pixel_x = -26 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "bFI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -15376,29 +15209,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"bHG" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "eva_inner"; - locked = 1; - name = "EVA Internal Access"; - req_one_access = list() - }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) -"bHN" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "eva_pump" - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "bHV" = ( /obj/machinery/light{ dir = 4 @@ -15438,10 +15248,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/gravity_lobby) -"bJm" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "bJG" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Exploration"; @@ -15602,7 +15408,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "bPl" = ( -/obj/machinery/floodlight, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "bPp" = ( @@ -15714,8 +15519,11 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -15738,27 +15546,10 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "bQG" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/equipment) +/obj/structure/table/reinforced, +/obj/item/weapon/storage/firstaid/adv, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "bQS" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -15812,6 +15603,15 @@ /area/tcommsat/chamber) "bTZ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, +<<<<<<< HEAD +======= +/obj/machinery/newscaster{ + pixel_x = 28 + }, +/obj/structure/dispenser{ + phorontanks = 0 + }, +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "bUj" = ( @@ -15867,6 +15667,7 @@ "bWY" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/maintenance/station/exploration) "bXv" = ( @@ -15910,25 +15711,8 @@ /turf/simulated/floor/tiled, /area/engineering/foyer) "bYa" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "PubPrep"; - layer = 3.3; - name = "Gateway Access Shutters" - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/closet/excavation, +/turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "bYg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -15998,6 +15782,9 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/station/exploration) "bZi" = ( @@ -16056,6 +15843,16 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cockpit) +"bZX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) "cah" = ( /obj/machinery/computer/telecomms/server{ dir = 8; @@ -16152,11 +15949,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "cce" = ( @@ -16174,10 +15966,14 @@ /turf/simulated/floor, /area/engineering/storage) "ccz" = ( -/obj/machinery/status_display{ - pixel_y = -32 +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "GateShut"; + name = "Gateway Shutter"; + pixel_x = 26; + pixel_y = -32; + req_access = list(62) }, -/obj/structure/closet/excavation, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "ccL" = ( @@ -16223,16 +16019,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/foyer) "cfy" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "eva_outer"; - locked = 1; - name = "EVA External Access"; - req_one_access = list() - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "cfB" = ( /obj/machinery/light/small{ @@ -16274,7 +16061,10 @@ /area/gateway/prep_room) "cii" = ( /obj/structure/closet/secure_closet/xenoarchaeologist, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/gateway/prep_room) "cik" = ( /obj/structure/table/standard, @@ -16358,14 +16148,8 @@ /turf/simulated/floor/tiled, /area/storage/tools) "ckR" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "PubPrep"; - layer = 3.3; - name = "Gateway Access Shutters" - }, -/turf/simulated/floor/tiled/steel_grid, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/dark, /area/gateway/prep_room) "cme" = ( /obj/machinery/camera/network/telecom{ @@ -16395,18 +16179,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/maintenance/substation/tcomms) -"col" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/gateway/prep_room) "coR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -16435,9 +16207,6 @@ /turf/simulated/floor/tiled, /area/maintenance/station/cargo) "cqC" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/machinery/light, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -16485,32 +16254,38 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "ctz" = ( -/obj/machinery/gateway{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +"ctB" = ( +/obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/gateway) -"ctB" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/ai_monitored/storage/eva) "ctD" = ( -/obj/machinery/gateway/centerstation, -/turf/simulated/floor/tiled/dark, -/area/gateway) -"ctI" = ( -/obj/machinery/gateway{ - dir = 4 +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "eva_outer"; + locked = 1; + name = "EVA External Access"; + req_one_access = list() }, +/obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, -/area/gateway) +/area/ai_monitored/storage/eva) +"ctI" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/camera/network/tether, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "cue" = ( /obj/machinery/status_display{ layer = 4; @@ -16732,9 +16507,10 @@ /turf/simulated/floor/plating, /area/quartermaster/delivery) "cCM" = ( -/obj/effect/mouse_hole_spawner{ - dir = 8 +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, +/obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, /area/maintenance/station/exploration) "cDf" = ( @@ -16765,6 +16541,7 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +<<<<<<< HEAD "cDF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -16783,6 +16560,8 @@ /area/ai_monitored/storage/eva) <<<<<<< HEAD ======= +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "cDU" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -16814,11 +16593,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "cFG" = ( @@ -16832,12 +16606,11 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) @@ -17057,16 +16830,6 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) -"cTd" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/dispenser{ - phorontanks = 0 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "cTD" = ( /obj/random/trash_pile, /obj/structure/railing{ @@ -17120,15 +16883,15 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "cUD" = ( -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "GateShut"; - name = "Gateway Shutter"; - pixel_x = -26; - req_access = list(62) +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "cUF" = ( /obj/machinery/computer/shuttle_control/belter{ dir = 1 @@ -17175,8 +16938,7 @@ dir = 8; icon_state = "pipe-c" }, -/obj/effect/floor_decal/corner/green/border, -/obj/machinery/light, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "cXs" = ( @@ -17266,6 +17028,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "dch" = ( +<<<<<<< HEAD /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -17284,6 +17047,10 @@ /obj/structure/closet/secure_closet/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) +======= +/turf/simulated/floor/grass, +/area/hallway/station/atrium) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ddj" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled, @@ -17305,18 +17072,6 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"dge" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) "dgF" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -17508,8 +17263,31 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "djU" = ( -/turf/simulated/wall/r_wall, -/area/tether/exploration/pilot_office) +/obj/structure/table/glass, +/obj/item/weapon/backup_implanter{ + pixel_y = 9 + }, +/obj/item/weapon/backup_implanter{ + pixel_y = 2 + }, +/obj/item/weapon/backup_implanter{ + pixel_y = -5 + }, +/obj/item/weapon/backup_implanter{ + pixel_y = -12 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/machinery/newscaster{ + pixel_x = 28 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "dkG" = ( /obj/machinery/door/airlock/highsecurity{ name = "Satellite Teleporter"; @@ -17572,6 +17350,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) +"dnh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration/pilot_office) "dnU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -17790,10 +17574,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/chamber) -"duP" = ( -/obj/machinery/camera/network/tether, -/turf/space, -/area/space) "dwj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -18164,6 +17944,7 @@ /turf/simulated/floor, /area/quartermaster/storage) "dQR" = ( +<<<<<<< HEAD /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -18178,6 +17959,11 @@ /area/tether/exploration/pilot_office) <<<<<<< HEAD ======= +======= +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, +/area/hallway/station/atrium) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "dRZ" = ( /obj/machinery/power/terminal{ dir = 4 @@ -18226,12 +18012,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"dUk" = ( -/obj/effect/landmark/start{ - name = "Pilot" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) "dUA" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -18252,13 +18032,9 @@ /turf/simulated/floor, /area/storage/tech) "dVT" = ( -/obj/structure/closet, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/junk, -/obj/random/junk, -/obj/random/junk, +/obj/machinery/atmospherics/pipe/tank/air/full{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/station/exploration) "dWh" = ( @@ -18325,16 +18101,13 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "dYV" = ( -/obj/machinery/gateway{ - dir = 10 +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "dZL" = ( /obj/machinery/door/unpowered/shuttle, /turf/simulated/shuttle/floor/yellow/airless, @@ -18354,12 +18127,12 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "ebM" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock{ - name = "Pilot Showers" +/obj/machinery/gateway/centerstation{ + layer = 4.1; + plane = -25 }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/pilot_office) +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "edF" = ( /obj/machinery/camera/network/tether{ dir = 4 @@ -18375,10 +18148,10 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "egy" = ( -/obj/machinery/gateway, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "egC" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -18455,12 +18228,6 @@ }, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) -"ekj" = ( -/obj/structure/table/reinforced, -/obj/fiftyspawner/rglass, -/obj/fiftyspawner/rods, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "emi" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -18491,16 +18258,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"eom" = ( -/obj/machinery/suit_cycler/security{ - req_access = null - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "epv" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -18606,7 +18363,17 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +"euy" = ( +/obj/structure/closet/secure_closet/pilot, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/tether/exploration/pilot_office) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ewT" = ( /turf/simulated/wall/fancy_shuttle/low{ fancy_shuttle_tag = "medbus"; @@ -18936,11 +18703,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "eLn" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/gateway{ + density = 0; + dir = 4; + layer = 4.1; + plane = -25 }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/pilot_office) +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "eLX" = ( /obj/structure/shuttle/engine/heater{ dir = 1 @@ -19120,15 +18890,9 @@ /turf/simulated/floor/airless, /area/shuttle/medivac/cockpit) "eVP" = ( -/obj/structure/closet/secure_closet/pilot, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) +/obj/machinery/light, +/turf/simulated/floor/grass, +/area/hallway/station/atrium) "eWv" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19154,18 +18918,6 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/cargo) -"eZg" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/clothing/mask/breath, -/obj/item/weapon/rig/eva/equipped, -/obj/machinery/door/window/brigdoor{ - req_access = list(11,24) - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "eZN" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -19251,6 +19003,9 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"fgh" = ( +/turf/simulated/wall, +/area/gateway/prep_room) "fgA" = ( /obj/structure/cable{ d1 = 4; @@ -19354,6 +19109,14 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"fkr" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "fkL" = ( /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -19443,7 +19206,23 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +<<<<<<< HEAD "fmg" = ( +======= +"fnM" = ( +/obj/machinery/suit_cycler/pilot, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) +"fpk" = ( +/turf/simulated/floor/airless, +/area/tether/outpost/solars_outside{ + name = "\improper Telecomms Solar Field" + }) +"fpK" = ( +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -19460,6 +19239,7 @@ dir = 4 }, /turf/simulated/floor/tiled, +<<<<<<< HEAD /area/maintenance/cargo) "fpk" = ( /turf/simulated/floor/airless, @@ -19489,6 +19269,9 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +======= +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "fqP" = ( /obj/machinery/power/apc{ dir = 8; @@ -19562,6 +19345,16 @@ }, /turf/space, /area/space) +"fvo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/maintenance/cargo) "fvt" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -19631,6 +19424,20 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"fxc" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor, +/area/maintenance/cargo) "fxO" = ( /obj/structure/cable/green{ d1 = 1; @@ -19755,13 +19562,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, -/obj/effect/floor_decal/corner/green/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 9 - }, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "fFq" = ( @@ -19843,9 +19644,11 @@ /area/shuttle/excursion/cargo) >>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2 "fIw" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ +/obj/machinery/gateway{ + density = 0; dir = 6 }, +<<<<<<< HEAD /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 }, @@ -19870,6 +19673,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +======= +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "fKr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -20017,6 +19827,7 @@ /obj/effect/overmap/visitable/ship/landable/excursion, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +<<<<<<< HEAD "fQr" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -20043,6 +19854,8 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "fRm" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -20149,6 +19962,7 @@ /obj/machinery/light, /turf/simulated/floor, /area/quartermaster/storage) +<<<<<<< HEAD "fWt" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -20168,23 +19982,12 @@ /obj/machinery/camera/network/tether, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "fYY" = ( -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "PubPrep"; - name = "Public Access Shutter"; - pixel_x = 25; - pixel_y = -6; - req_access = list(62) - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/gateway/prep_room) "gaW" = ( @@ -20325,7 +20128,7 @@ "geM" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/gateway/prep_room) "gfX" = ( /turf/simulated/wall/r_wall, @@ -20440,6 +20243,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"gjU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "gjW" = ( /obj/structure/cable/green{ d1 = 1; @@ -20582,37 +20391,6 @@ fancy_shuttle_tag = "explo" }, /area/shuttle/excursion/cargo) -"gnV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) -"goL" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/hallway) "goO" = ( /obj/structure/cable{ icon_state = "1-4" @@ -20752,12 +20530,20 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "gCX" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 }, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "gCZ" = ( /obj/effect/landmark{ name = "maint_pred" @@ -20765,6 +20551,7 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "gDl" = ( +<<<<<<< HEAD /obj/machinery/light_switch{ dir = 1; pixel_x = -12; @@ -20773,10 +20560,13 @@ /obj/machinery/power/apc{ name = "south bump"; pixel_y = -32 +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo }, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "gDA" = ( /obj/machinery/blackbox_recorder, /turf/simulated/floor/tiled/dark, @@ -20852,6 +20642,9 @@ "gGC" = ( /obj/structure/catwalk, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/station/exploration) "gHF" = ( @@ -20863,13 +20656,12 @@ }, /area/shuttle/excursion/cargo) "gIp" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor, +/area/maintenance/station/exploration) "gIs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 4 @@ -20935,12 +20727,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +<<<<<<< HEAD "gLW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "gMr" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -21273,19 +21068,13 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "hcw" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/obj/machinery/mineral/equipment_vendor/survey, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor, +/area/maintenance/station/exploration) "hcW" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Exploration Substation Bypass" @@ -21513,6 +21302,18 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +"hkY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration/pilot_office) "hln" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -21540,17 +21341,11 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "hlX" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/rnd{ - req_one_access = list(19,43,67) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/tether/exploration/crew) +/obj/structure/table/reinforced, +/obj/item/clothing/head/welding, +/obj/item/weapon/storage/belt/utility, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "hmd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -21604,6 +21399,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/gateway/prep_room) "hqp" = ( @@ -21650,24 +21446,6 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor, /area/maintenance/cargo) -"hqU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "hqW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -21698,6 +21476,15 @@ }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) +"hrI" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) "hrR" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -22380,28 +22167,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/button/remote/blast_door{ - id = "PubPrepFront"; - name = "Public Access Shutter"; - pixel_y = 26; - req_access = list(62) - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -22766,12 +22542,6 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 5 - }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "icz" = ( @@ -22802,16 +22572,18 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "ieS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/photocopier, -/obj/effect/floor_decal/corner/green/border{ - dir = 9 +/obj/structure/table/rack, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/item/device/bluespaceradio/tether_prelinked, +/obj/machinery/door/window/brigdoor{ + req_access = list(43) }, +<<<<<<< HEAD /turf/simulated/floor/tiled, /area/tether/exploration/crew) "ieY" = ( @@ -22821,6 +22593,10 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/dock_two) +======= +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ifp" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 9 @@ -22835,19 +22611,13 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) "ifV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/obj/machinery/chemical_analyzer, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/machinery/meter, +/turf/simulated/floor, +/area/maintenance/station/exploration) "igN" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -22864,54 +22634,29 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) "iie" = ( -/obj/structure/table/rack/shelf, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = 5; - pixel_y = 4 +/obj/machinery/door/window/brigdoor/westright{ + req_access = list(5) }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/item/clothing/mask/breath, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/medical, +/obj/item/clothing/head/helmet/space/void/medical, +/obj/item/clothing/mask/breath, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/medical, +/obj/item/clothing/head/helmet/space/void/medical, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "iii" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +<<<<<<< HEAD "iiQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -22925,18 +22670,14 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "iiU" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/structure/flora/pottedplant/orientaltree, -/obj/effect/floor_decal/corner/green/border{ +/obj/structure/catwalk, +/obj/machinery/atmospherics/binary/passive_gate{ dir = 1 }, +<<<<<<< HEAD /turf/simulated/floor/tiled, /area/tether/exploration/crew) "ijn" = ( @@ -22953,6 +22694,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +======= +/turf/simulated/floor, +/area/maintenance/station/exploration) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ijv" = ( /obj/structure/railing{ dir = 8 @@ -23009,26 +22754,10 @@ /turf/simulated/floor/carpet, /area/engineering/foyer) "ins" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/camera/network/exploration, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/table/woodentable, -/obj/machinery/microwave{ - pixel_y = 3 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, +/obj/machinery/camera/network/command, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "iol" = ( /obj/machinery/light{ dir = 1 @@ -23097,6 +22826,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"iss" = ( +/turf/simulated/wall{ + can_open = 1 + }, +/area/maintenance/cargo) "isD" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -23109,6 +22843,10 @@ fancy_shuttle_tag = "explo" }, /area/shuttle/excursion/cockpit) +"itz" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "iuB" = ( /obj/structure/cable/green{ d1 = 4; @@ -23210,6 +22948,9 @@ /area/tcomfoyer{ name = "\improper Telecomms Storage" }) +"iyt" = ( +/turf/simulated/floor/tiled/monotile, +/area/ai_monitored/storage/eva) "izZ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -23222,28 +22963,6 @@ /area/tcomfoyer{ name = "\improper Telecomms Storage" }) -"iAk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 4 - }, -/obj/machinery/suit_cycler/pilot, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) "iAr" = ( /obj/structure/cable{ d1 = 4; @@ -23290,29 +23009,24 @@ /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/plating, /area/quartermaster/belterdock) -"iBE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/station/cargo) -"iDc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +"iBk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration/pilot_office) +"iBE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/station/cargo) "iDj" = ( /obj/machinery/light/small{ dir = 1 @@ -23386,29 +23100,24 @@ /turf/simulated/wall, /area/tether/exploration/hallway) "iHb" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/table/rack, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/item/device/mapping_unit, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(43) }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -28 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "iIf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor, +/area/maintenance/station/exploration) "iIk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -23476,15 +23185,6 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) -"iKm" = ( -/obj/structure/table/rack, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/security, -/obj/item/clothing/head/helmet/space/void/security, -/obj/machinery/door/window/brigdoor/eastright, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "iKq" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -23494,24 +23194,19 @@ name = "\improper Telecomms Solar Field" }) "iKY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor, +/area/maintenance/station/exploration) "iMe" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/meter{ + frequency = 1443; + id = "dist_aux_meter"; + name = "Distribution Loop" }, -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Exploration Briefing" - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "iMk" = ( /obj/structure/ore_box, /turf/simulated/shuttle/floor/yellow/airless, @@ -23648,6 +23343,15 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"iUE" = ( +/obj/machinery/gateway{ + density = 0; + dir = 8; + layer = 4.1; + plane = -25 + }, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "iUV" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -23801,13 +23505,27 @@ /turf/simulated/floor/tiled, /area/quartermaster/delivery) "jgd" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 }, +<<<<<<< HEAD /obj/structure/closet/emcloset, /obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/gateway) +======= +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "jgU" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 @@ -23826,10 +23544,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, @@ -23858,12 +23572,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"jkV" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "jlx" = ( /obj/machinery/teleport/hub{ dir = 2 @@ -23932,6 +23640,20 @@ "jou" = ( /turf/simulated/wall/r_wall, /area/hallway/station/docks) +"joY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "jqE" = ( /obj/machinery/computer/shuttle_control/tether_backup{ dir = 8 @@ -23999,12 +23721,11 @@ name = "\improper Telecomms Lobby" }) "jsP" = ( +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor, +/area/maintenance/station/exploration) "jsY" = ( /obj/effect/floor_decal/industrial/loading{ dir = 8 @@ -24015,12 +23736,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "jtH" = ( -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ - name = "Field Medic" +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor, +/area/maintenance/station/exploration) "jtT" = ( /obj/effect/landmark{ name = "morphspawn" @@ -24066,12 +23788,27 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "juI" = ( -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ - name = "Pilot" +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/tiled, /area/tether/exploration/crew) +======= +/turf/simulated/floor, +/area/maintenance/station/exploration) +"juV" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "dock_d2a1"; + landmark_tag = "tether_dockarm_d2a1"; + name = "Tether Dock D2A1" + }, +/turf/space, +/area/space) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "jvg" = ( /obj/random/maintenance/medical, /obj/structure/table/rack{ @@ -24136,6 +23873,9 @@ pixel_y = -25 }, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/station/exploration) "jzz" = ( @@ -24186,6 +23926,7 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +<<<<<<< HEAD "jCo" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -24199,6 +23940,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +======= +"jDI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "jDU" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/briefcase/inflatable, @@ -24232,15 +23984,10 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "jEf" = ( -/obj/machinery/gateway{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, -/area/gateway) +/area/ai_monitored/storage/eva) "jEs" = ( /obj/structure/table/rack, /obj/item/device/suit_cooling_unit, @@ -24359,6 +24106,11 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"jLF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "jOc" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -24405,27 +24157,21 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "jPM" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/obj/machinery/vending/wallmed1/public{ - pixel_y = -28 - }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/hallway) +/turf/simulated/floor, +/area/maintenance/station/exploration) "jQR" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor, +/area/maintenance/station/exploration) "jRG" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -24626,26 +24372,21 @@ /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) "jZT" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) @@ -24655,11 +24396,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -24689,39 +24425,29 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "kbz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/table/rack, +/obj/item/clothing/mask/breath, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/security, +/obj/item/clothing/head/helmet/space/void/security, +/obj/machinery/door/window/brigdoor, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"kcy" = ( +/obj/structure/catwalk, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) -"kcy" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor, +/area/maintenance/station/exploration) "kcH" = ( /obj/structure/cable/green{ d2 = 2; @@ -24799,14 +24525,12 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "kdF" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/effect/landmark/start{ - name = "Pilot" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor, +/area/maintenance/station/exploration) "kdL" = ( /obj/structure/shuttle/window, /obj/effect/shuttle_landmark{ @@ -24817,25 +24541,14 @@ }, /turf/simulated/floor/airless, /area/shuttle/mining_outpost/shuttle) -"kel" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/folder/blue, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "key" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/folder/yellow, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) -"kfa" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor, +/area/maintenance/station/exploration) "kff" = ( /turf/simulated/wall/r_wall, /area/tcommsat/entrance{ @@ -25033,16 +24746,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_grid, /area/tether/station/dock_one) -"knk" = ( -/obj/structure/closet, -/obj/random/tool, -/obj/random/tool, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "knu" = ( /obj/random/trash_pile, /obj/structure/railing{ @@ -25121,23 +24824,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"kpr" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "eva_airlock"; - name = "exterior access button"; - pixel_y = 25 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/airless, -/area/ai_monitored/storage/eva) "kpK" = ( -/obj/effect/landmark/vermin, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "kqW" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25191,22 +24881,12 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "kvF" = ( -/obj/machinery/shower{ - pixel_y = 16 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/curtain/open/shower, -/obj/item/weapon/soap/nanotrasen, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/equipment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "kvI" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -25229,22 +24909,13 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "kxm" = ( -/obj/machinery/shower{ - pixel_y = 16 +/obj/effect/floor_decal/techfloor/orange, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/structure/curtain/open/shower, -/obj/item/weapon/soap/nanotrasen, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/tether/exploration/equipment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/teleporter/departing) "kxC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -25253,11 +24924,15 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kxG" = ( -/obj/structure/table/woodentable, -/obj/item/device/universal_translator, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/teleporter/departing) "kxL" = ( /obj/machinery/computer/shuttle_control/surface_mining_outpost{ dir = 8 @@ -25368,6 +25043,18 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/cargo) +"kCj" = ( +/obj/machinery/gateway{ + density = 0; + dir = 1; + layer = 4.1; + plane = -25 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "kCl" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -25447,39 +25134,18 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "kIR" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/structure/table/rack, +/obj/item/clothing/mask/breath, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/security, +/obj/item/clothing/head/helmet/space/void/security, +/obj/machinery/door/window/brigdoor/eastright, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "kJj" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/teleporter/departing) "kJl" = ( /obj/machinery/door/airlock/hatch{ name = "Telecoms Control Room"; @@ -25506,6 +25172,7 @@ /obj/machinery/cell_charger, /turf/simulated/floor/tiled, /area/quartermaster/storage) +<<<<<<< HEAD "kJJ" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -25524,6 +25191,22 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +======= +"kKe" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "kKj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6; @@ -25826,27 +25509,14 @@ }, /area/maintenance/station/eng_lower) "kVE" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Exploration Hangar"; - sortType = "Exploration Hangar" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kVK" = ( @@ -25867,22 +25537,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "kWH" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "kWQ" = ( @@ -25902,6 +25562,7 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/cargo) +<<<<<<< HEAD "kXm" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_science{ @@ -25922,6 +25583,15 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/crew) +======= +"kXu" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "kXF" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, @@ -25933,48 +25603,31 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/storage) -"kXK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -26; - pixel_y = -24 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "kZA" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/structure/closet/walllocker_double{ + dir = 8; + pixel_x = -28 + }, +/obj/item/stack/material/plasteel{ + amount = 10 + }, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/rods, +/obj/fiftyspawner/rglass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/obj/structure/symbol/sa{ + pixel_x = -19; + pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "kZW" = ( /obj/structure/cable/green{ d1 = 4; @@ -26012,21 +25665,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"lbi" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Field Medic" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "lbI" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -26055,6 +25693,7 @@ /obj/machinery/mineral/processing_unit_console, /turf/simulated/wall, /area/quartermaster/belterdock/refinery) +<<<<<<< HEAD "lcm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -26096,6 +25735,20 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) >>>>>>> d8fddf3331... Merge pull request #13606 from Very-Soft/micro_structures +======= +"ldJ" = ( +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor, +/area/tether/exploration/pilot_office) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lfI" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -26111,15 +25764,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"lfK" = ( -/obj/machinery/sleep_console{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/light, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) "lhm" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Exploration Substation Bypass" @@ -26149,6 +25793,7 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +<<<<<<< HEAD "liG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/wall/rshull, @@ -26170,6 +25815,8 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "liV" = ( /obj/machinery/light/small{ dir = 4 @@ -26273,6 +25920,7 @@ }, /turf/simulated/mineral/floor/vacuum, /area/mine/explored/upper_level) +<<<<<<< HEAD "lnG" = ( /obj/machinery/sleeper{ dir = 4 @@ -26283,6 +25931,8 @@ /area/tether/station/dock_two) <<<<<<< HEAD ======= +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lof" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 @@ -26422,11 +26072,33 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +<<<<<<< HEAD "lvV" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +"lvZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "dock_d2l_pump" + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "dock_d2l_sensor"; + pixel_x = -30; + pixel_y = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lwa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 8 @@ -26485,30 +26157,17 @@ /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) "lxl" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 +/obj/item/clothing/mask/breath, +/obj/item/weapon/rig/eva/equipped, +/obj/machinery/door/window/brigdoor{ + req_access = list(11,24) }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "lxK" = ( /obj/structure/ore_box, /obj/effect/floor_decal/borderfloor{ @@ -26574,6 +26233,7 @@ "lzi" = ( /turf/simulated/wall, /area/engineering/engineering_airlock) +<<<<<<< HEAD "lzl" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -26603,6 +26263,8 @@ }, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lzB" = ( /obj/structure/closet/crate, /obj/random/maintenance/engineering, @@ -26627,9 +26289,16 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lAt" = ( -/obj/machinery/hologram/holopad, +/obj/structure/table/reinforced, +/obj/item/device/assembly/signaler, +/obj/item/device/assembly/signaler, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) +"lBQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) "lBS" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/table/standard, @@ -26645,6 +26314,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +<<<<<<< HEAD "lCO" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -26666,6 +26336,10 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ +======= +"lCR" = ( +/obj/machinery/power/terminal{ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo dir = 8 }, /obj/structure/cable/green{ @@ -26795,6 +26469,7 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +<<<<<<< HEAD "lHr" = ( /obj/machinery/door/airlock/maintenance/cargo{ req_access = list(50); @@ -26830,55 +26505,35 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lIB" = ( -/turf/simulated/floor/tiled/dark, -/area/gateway) -"lIF" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/obj/item/weapon/hand_labeler, -/obj/item/device/multitool/tether_buffered{ - pixel_y = 2 - }, -/obj/item/weapon/hand_labeler, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +<<<<<<< HEAD +/area/tether/exploration/equipment) +======= +/area/ai_monitored/storage/eva) +"lJl" = ( +/obj/structure/bed/chair/shuttle{ dir = 1 }, -/obj/machinery/camera/network/exploration, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/newscaster{ - pixel_y = 32 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, /turf/simulated/floor/tiled, -/area/tether/exploration/equipment) -"lIZ" = ( -/obj/structure/table/rack/shelf, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/area/shuttle/medivac/general) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lJN" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -27022,22 +26677,19 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "lML" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/atmos, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/atmos, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(11,24) }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "lMS" = ( /obj/machinery/holoposter{ pixel_y = -30 @@ -27083,6 +26735,7 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +<<<<<<< HEAD "lPD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -27123,6 +26776,9 @@ ||||||| parent of 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2 "lSs" = ( /obj/structure/disposalpipe/segment, +======= +"lRe" = ( +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -27139,6 +26795,7 @@ pixel_x = 30 }, /turf/simulated/floor/tiled, +<<<<<<< HEAD /area/hallway/station/atrium) ======= "lSs" = ( @@ -27160,6 +26817,9 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +======= +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "lSw" = ( /obj/structure/closet/emergsuit_wall{ pixel_y = 32 @@ -27177,35 +26837,10 @@ /area/shuttle/excursion/cockpit) >>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2 "lSR" = ( -/obj/effect/landmark/start{ - name = "Pilot" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) -"lTD" = ( -/obj/item/device/radio/intercom{ - pixel_y = -24 - }, -/obj/structure/table/woodentable, -/obj/effect/floor_decal/borderfloor, -/obj/item/weapon/storage/box/lights/mixed, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/border, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/structure/table/gamblingtable, +/obj/random/coin/sometimes, +/turf/simulated/floor/grass, +/area/hallway/station/atrium) "lTY" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -27305,24 +26940,9 @@ }, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) -"mau" = ( -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = -6 - }, +"mcE" = ( /obj/structure/table/rack/shelf, +<<<<<<< HEAD /obj/item/weapon/storage/backpack/parachute{ pixel_x = -4; pixel_y = 4 @@ -27360,6 +26980,18 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) +======= +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor, +/area/tether/exploration/pilot_office) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mdh" = ( /obj/structure/cable/green{ d1 = 2; @@ -27374,12 +27006,33 @@ }, /turf/simulated/floor/plating, /area/storage/tech) +"mdn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "mdz" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, /turf/simulated/floor/airless, /area/quartermaster/belterdock) +"mdM" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock{ + id_tag = "pilotB"; + name = "B" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "meW" = ( /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) @@ -27392,6 +27045,7 @@ }, /turf/simulated/floor/plating, /area/tether/station/dock_one) +<<<<<<< HEAD "mgw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/landmark/start{ @@ -27457,6 +27111,8 @@ }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mkL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -27691,51 +27347,6 @@ /obj/effect/floor_decal/sign/dock/one, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"msn" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) -"mtm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "mto" = ( /turf/simulated/mineral/vacuum, /area/maintenance/station/cargo) @@ -27769,23 +27380,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"muY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "mvn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27828,6 +27422,7 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +<<<<<<< HEAD "myi" = ( /obj/structure/cable/cyan{ d2 = 4; @@ -27873,6 +27468,8 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mzB" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -27889,8 +27486,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/exploration/equipment) +/turf/simulated/floor/tiled/steel_ridged, +/area/tether/exploration/pilot_office) "mzV" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -28052,6 +27649,7 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +<<<<<<< HEAD "mFp" = ( /obj/structure/cable/cyan{ d1 = 2; @@ -28093,6 +27691,14 @@ }, /turf/simulated/floor/plating, /area/quartermaster/delivery) +======= +"mGG" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mHR" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -28100,11 +27706,15 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "mIs" = ( -/obj/effect/landmark/start{ - name = "Field Medic" +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) +/obj/random/mainttoyloot, +/obj/random/maintenance/clean, +/obj/random/junk, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "mIv" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -28153,6 +27763,7 @@ }, /turf/simulated/floor/tiled, /area/shuttle/securiship/engines) +<<<<<<< HEAD >>>>>>> 4ccd512332... Merge pull request #12923 from KillianKirilenko/kk-shipfixes "mJd" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -28160,6 +27771,8 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mKD" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -28184,13 +27797,12 @@ "mKM" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1; - id_tag = null; - name = "Exploration Equipment Storage"; - req_one_access = list(19,43,67) + name = "Pilot Office"; + req_one_access = list(67) }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/exploration/equipment) +/turf/simulated/floor/tiled/steel_ridged, +/area/tether/exploration/pilot_office) "mKN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -28236,9 +27848,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "mLO" = ( -/obj/machinery/gateway{ - dir = 1 +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 25 }, +<<<<<<< HEAD /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -28258,6 +27872,14 @@ /obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +======= +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mOz" = ( /obj/machinery/firealarm{ dir = 4; @@ -28326,6 +27948,7 @@ dir = 6 }, /turf/simulated/floor/tiled, +<<<<<<< HEAD /area/tether/station/dock_two) "mQR" = ( /obj/machinery/door/firedoor/glass, @@ -28341,6 +27964,9 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/equipment) +======= +/area/hallway/station/docks) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mQZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -28385,6 +28011,13 @@ /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"mUb" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "mUp" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -28444,6 +28077,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +<<<<<<< HEAD "mYJ" = ( /obj/machinery/suit_cycler/exploration, /obj/effect/floor_decal/borderfloor{ @@ -28454,6 +28088,38 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +======= +"mWA" = ( +/obj/machinery/door/airlock/glass_external, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "dock_d2l"; + name = "exterior access button"; + pixel_x = -28; + pixel_y = -6; + req_one_access = list(13) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"mXh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK" + }, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "mYQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -28532,6 +28198,7 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) +<<<<<<< HEAD >>>>>>> 067510fd66... Merge pull request #11360 from VOREStation/Arokha/fancy2 "nac" = ( /obj/effect/floor_decal/borderfloor, @@ -28561,6 +28228,8 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "nbO" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -28574,18 +28243,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) -"nbQ" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/green/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "nct" = ( /obj/structure/cable{ d1 = 1; @@ -28903,15 +28560,25 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "npk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/table/glass, +/obj/item/weapon/storage/firstaid, +/obj/item/stack/medical/splint, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "nqk" = ( /turf/simulated/floor/wood/broken, /area/maintenance/station/cargo) @@ -29276,7 +28943,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ - name = "Exploration Public Entrance" + name = "Shuttle Public Entrance" }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/station/atrium) @@ -29305,6 +28972,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +"nHx" = ( +/obj/effect/landmark/start{ + name = "Pilot" + }, +/obj/machinery/button/remote/airlock{ + dir = 1; + id = "pilotA"; + name = "Room A Lock"; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/milspec, +/area/tether/exploration/pilot_office) "nHH" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29449,18 +29135,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"nRk" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/machinery/camera/network/tether{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) "nRU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -29556,6 +29230,7 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) +<<<<<<< HEAD "nWq" = ( /obj/structure/cable{ d1 = 1; @@ -29591,6 +29266,8 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "nYA" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29626,14 +29303,9 @@ /turf/simulated/floor/plating, /area/shuttle/securiship/general) "nZC" = ( -/obj/machinery/door/airlock/glass_command{ - id_tag = "evadoors"; - name = "E.V.A."; - req_one_access = list(18,19,43,67) - }, -/obj/machinery/door/firedoor/glass, +/obj/structure/firedoor_assembly, /turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) +/area/maintenance/cargo) "nZQ" = ( /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) @@ -29673,12 +29345,17 @@ /turf/simulated/floor/tiled, /area/quartermaster/delivery) "obA" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "odI" = ( /turf/simulated/floor/tiled, /area/tether/station/dock_two) +<<<<<<< HEAD "odO" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 10 @@ -29708,6 +29385,8 @@ }, /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "odW" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -29725,6 +29404,7 @@ /area/tether/station/dock_two) "oer" = ( /turf/simulated/wall, +<<<<<<< HEAD /area/tether/exploration/pathfinder_office) "ofa" = ( /obj/structure/window/reinforced{ @@ -29733,6 +29413,15 @@ /obj/structure/bed/chair/bay/chair, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) +======= +/area/tether/exploration/pilot_office) +"oeE" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration/pilot_office) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ofV" = ( /obj/structure/table/standard, /obj/item/weapon/paper/rogueminer, @@ -29754,19 +29443,14 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "ogv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/sleep_console{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "ogK" = ( /obj/structure/table/standard, /obj/item/weapon/paper_bin{ @@ -29776,6 +29460,15 @@ /obj/item/device/megaphone, /turf/simulated/floor/wood, /area/quartermaster/qm) +"ohc" = ( +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/brown, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/milspec, +/area/tether/exploration/pilot_office) "ohn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -29841,15 +29534,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +<<<<<<< HEAD "olN" = ( /obj/structure/cable/green{ dir = 1; @@ -29874,6 +29561,8 @@ /obj/machinery/door/window/brigdoor/eastleft, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ops" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -29902,6 +29591,7 @@ /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) +<<<<<<< HEAD "orh" = ( /obj/structure/cable/green{ d1 = 4; @@ -29911,6 +29601,17 @@ /obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/securiship/general) +======= +"oqF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "ort" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -30006,12 +29707,13 @@ name = "\improper Telecomms Storage" }) "otE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/sleeper{ + dir = 4 }, -/obj/structure/closet/firecloset, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "oue" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -30078,6 +29780,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/gateway/prep_room) "oyD" = ( @@ -30153,6 +29856,9 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "oEH" = ( @@ -30200,19 +29906,22 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"oGG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +"oGc" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock{ + id_tag = "pilotA"; + name = "A" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) +"oGG" = ( +/turf/simulated/floor/tiled, /area/gateway/prep_room) "oGI" = ( /obj/structure/table/standard, @@ -30230,32 +29939,24 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "oIV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 }, -/obj/machinery/button/remote/blast_door{ - id = "PubPrep"; - name = "Public Access Shutter"; - pixel_y = 26; - req_access = list(62) - }, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "oJt" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/structure/closet/crate, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "oKw" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/int_door, @@ -30265,6 +29966,11 @@ /obj/structure/frame, /turf/simulated/floor, /area/maintenance/cargo) +"oMQ" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "oPH" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/disposalpipe/segment, @@ -30297,6 +30003,7 @@ /obj/effect/floor_decal/corner/brown/bordercorner, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +<<<<<<< HEAD "oTn" = ( /obj/machinery/photocopier, /obj/effect/floor_decal/borderfloor{ @@ -30307,6 +30014,8 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "oTF" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/green{ @@ -30318,6 +30027,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +<<<<<<< HEAD "oTL" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -30339,6 +30049,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +======= +"oTR" = ( +/obj/machinery/light{ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo dir = 8 }, /obj/machinery/door/airlock/glass_mining{ @@ -30376,29 +30090,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"oWU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +"oWW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) -"oWW" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/turf/simulated/floor, -/area/maintenance/station/exploration) "oYp" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -30580,16 +30277,17 @@ /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/engines) "plm" = ( -/obj/machinery/camera/network/exploration{ - dir = 1 +/obj/structure/table/reinforced, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/item/device/multitool, +/obj/machinery/camera/network/command{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "pmC" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -30618,16 +30316,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"pmE" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "pmX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30748,6 +30436,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +<<<<<<< HEAD "pyy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30768,23 +30457,28 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +======= +"pxB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/ai_monitored/storage/eva) +"pye" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/sign/dock/two, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "pyE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /turf/simulated/floor/tiled, /area/tcommsat/computer) -"pyP" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "pyQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -30799,21 +30493,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) -"pAj" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "eva_inner"; - locked = 1; - name = "EVA Internal Access"; - req_one_access = list() - }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "pBP" = ( <<<<<<< HEAD /obj/machinery/power/sensor{ @@ -30863,13 +30542,9 @@ /obj/machinery/light, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) -"pDf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +"pDE" = ( +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -30934,26 +30609,12 @@ /turf/simulated/wall, /area/janitor) "pLb" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ +/obj/effect/mouse_hole_spawner{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - pixel_y = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass, +/area/hallway/station/atrium) "pMe" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/subspace/analyzer, @@ -31039,15 +30700,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "pPw" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/closet/crate, -/obj/machinery/camera/network/command{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "pSg" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -31090,6 +30748,7 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +<<<<<<< HEAD "pSR" = ( /obj/structure/table/reinforced, /obj/item/device/assembly/signaler, @@ -31099,6 +30758,14 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +"pSO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "pTu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31228,9 +30895,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, /obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/hallway/station/atrium) @@ -31419,6 +31083,9 @@ pixel_y = 22 }, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/station/exploration) "qnM" = ( @@ -31440,14 +31107,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"qoB" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical{ - pixel_x = 1; - pixel_y = -1 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "qoD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -31558,20 +31217,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled/steel_grid, /area/tether/station/dock_one) -"qrF" = ( -/obj/structure/table/reinforced, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/glass, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) -"qrP" = ( -/obj/machinery/suit_cycler/engineering{ - req_access = null - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "qrU" = ( /obj/structure/cable/green{ d1 = 4; @@ -31637,6 +31282,18 @@ }, /turf/simulated/floor/tiled, /area/shuttle/large_escape_pod1) +"quW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -25 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "qve" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31673,6 +31330,7 @@ /obj/item/device/radio/beacon, /turf/simulated/floor/tiled, /area/hallway/station/docks) +<<<<<<< HEAD "qvS" = ( /obj/machinery/power/terminal{ dir = 1; @@ -31724,6 +31382,8 @@ /obj/machinery/atmospherics/binary/pump/fuel, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "qBP" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -31834,6 +31494,7 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +<<<<<<< HEAD "qFq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5; @@ -31860,6 +31521,8 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "qHe" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Cargo Subgrid"; @@ -31945,11 +31608,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -32031,12 +31694,6 @@ /obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"qQx" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "qQG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -32063,6 +31720,7 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +<<<<<<< HEAD "qTm" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 @@ -32076,15 +31734,20 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "qUr" = ( +======= +"qTD" = ( +/obj/item/weapon/bedsheet/brown, +/obj/structure/bed/padded, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -22 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) +/turf/simulated/floor/tiled/milspec, +/area/tether/exploration/pilot_office) "qVz" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -32095,14 +31758,10 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qVH" = ( @@ -32126,30 +31785,6 @@ /obj/effect/floor_decal/corner/brown/bordercorner, /turf/simulated/floor/tiled, /area/quartermaster/delivery) -"qWs" = ( -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, -/obj/item/weapon/cell/high{ - charge = 100; - maxcharge = 15000 - }, -/obj/item/weapon/cell/high{ - charge = 100; - maxcharge = 15000 - }, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "qWN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -32175,13 +31810,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/maintenance/station/cargo) -"qYg" = ( -/obj/machinery/suit_cycler/mining{ - req_access = null - }, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "qYu" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -32242,26 +31870,12 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "rci" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/obj/effect/floor_decal/borderfloor{ - dir = 6 +/obj/machinery/gateway{ + density = 0; + dir = 10 }, -/obj/effect/floor_decal/corner/green/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "rdc" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -32272,6 +31886,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"rdo" = ( +/obj/structure/symbol/lo{ + pixel_y = -32 + }, +/turf/simulated/wall, +/area/maintenance/cargo) "rdE" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -32457,6 +32077,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +<<<<<<< HEAD "rqf" = ( /obj/machinery/door/airlock/glass_medical{ name = "Public Emergency Triage"; @@ -32469,6 +32090,8 @@ /area/tether/station/dock_two) <<<<<<< HEAD ======= +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "rqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -32554,6 +32177,7 @@ /obj/effect/floor_decal/borderfloorwhite{ dir = 4 }, +<<<<<<< HEAD /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, @@ -32577,6 +32201,10 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "rtQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32690,37 +32318,6 @@ }, /turf/simulated/floor, /area/maintenance/cargo) -"rCQ" = ( -/obj/machinery/vending/wallmed_airlock{ - pixel_x = -28 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) -"rEb" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) "rEj" = ( /obj/machinery/conveyor{ dir = 1; @@ -32930,24 +32527,6 @@ }, /turf/space, /area/space) -"rTO" = ( -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) -"rTY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) "rUS" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -32969,12 +32548,6 @@ /obj/item/weapon/storage/briefcase/inflatable, /turf/simulated/floor, /area/maintenance/cargo) -"rVK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) "rWj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -33078,6 +32651,9 @@ /obj/effect/floor_decal/corner/green/bordercorner2{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "rYx" = ( @@ -33104,26 +32680,17 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/station/dock_two) "saD" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/machinery/gateway{ + density = 0; + dir = 9; + layer = 4.1; + plane = -25 }, -/obj/effect/floor_decal/corner/green/border{ - dir = 5 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "saN" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled, @@ -33175,8 +32742,11 @@ /area/shuttle/medivac/engines) >>>>>>> de1f9190b8b... Merge pull request #12143 from Very-Soft/returntotether "scu" = ( -/turf/simulated/wall/r_wall, -/area/tether/exploration/crew) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "scB" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/ext_door, @@ -33329,8 +32899,9 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "smz" = ( -/turf/simulated/wall, -/area/tether/exploration/pilot_office) +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass, +/area/hallway/station/atrium) "snG" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -33352,6 +32923,13 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"snX" = ( +/obj/machinery/gateway, +/obj/machinery/camera/network/command{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "spX" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -33442,9 +33020,11 @@ /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/medivac/engines) "sxj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monotile, +/area/ai_monitored/storage/eva) "sya" = ( /obj/structure/railing{ dir = 1 @@ -33602,6 +33182,7 @@ frequency = 1380; id_tag = "medivac_docker_pump_out_internal" }, +<<<<<<< HEAD /obj/effect/map_helper/airlock/sensor/chamber_sensor, /obj/effect/map_helper/airlock/atmos/pump_out_internal, /turf/simulated/floor/tiled/eris/steel/gray_perforated, @@ -33616,6 +33197,10 @@ /obj/item/weapon/storage/belt/utility, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "sII" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "belter_access_airlock"; @@ -33747,11 +33332,8 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "sNZ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /turf/simulated/floor/airless, -/area/ai_monitored/storage/eva) +/area/maintenance/cargo) "sOc" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -33765,12 +33347,6 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 6 - }, /obj/machinery/camera/network/exploration{ dir = 9 }, @@ -33786,6 +33362,7 @@ fancy_shuttle_tag = "medbus" }, /area/shuttle/medivac/engines) +<<<<<<< HEAD >>>>>>> 4ccd512332... Merge pull request #12923 from KillianKirilenko/kk-shipfixes "sPJ" = ( /obj/structure/table/reinforced, @@ -33797,6 +33374,8 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "sQj" = ( /obj/machinery/camera/network/mining{ c_tag = "OPM - Mining Production Room"; @@ -33895,14 +33474,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_command{ - id_tag = "evadoors"; - name = "E.V.A."; - req_one_access = list(18,19,43,67) - }, -/obj/machinery/door/firedoor/glass, +/obj/structure/firedoor_assembly, /turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) +/area/maintenance/cargo) "sVZ" = ( /obj/structure/cable{ d1 = 4; @@ -33919,6 +33493,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"sWX" = ( +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "GateShut"; + layer = 3.3; + name = "Gateway Shutter" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "sYe" = ( /obj/machinery/computer/security/mining, /turf/simulated/floor/wood, @@ -34056,22 +33640,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"tfx" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/effect/floor_decal/borderfloor, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/effect/floor_decal/corner/green/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/equipment) "tgl" = ( /obj/structure/window/reinforced{ dir = 8 @@ -34373,14 +33941,20 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2{ +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2{ dir = 9 }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ +<<<<<<< HEAD +======= +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 9 }, +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo /turf/simulated/floor/tiled, /area/quartermaster/foyer) "ttL" = ( @@ -34762,37 +34336,9 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/belterdock/refinery) -"tRn" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "tUh" = ( /turf/simulated/wall, /area/maintenance/cargo) -"tUx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "tVq" = ( /obj/structure/railing{ dir = 1 @@ -34869,18 +34415,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"tZM" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/device/multitool, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "tZN" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/effect/map_helper/airlock/door/simple, @@ -34961,6 +34495,18 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"ufj" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) "ugr" = ( /obj/machinery/power/terminal{ dir = 4 @@ -35030,6 +34576,7 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +<<<<<<< HEAD "ulT" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/floor_decal/industrial/outline/grey, @@ -35057,30 +34604,12 @@ }, /turf/simulated/floor/tiled/eris/white, /area/shuttle/medivac/general) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "uno" = ( /obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/quartermaster/warehouse) -"unu" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/science{ - name = "Pathfinder"; - req_access = null; - req_one_access = list(44) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/tether/exploration/pathfinder_office) "unH" = ( /obj/machinery/door/window/brigdoor/westleft{ req_access = newlist(); @@ -35230,12 +34759,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"uyg" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "uym" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -35307,23 +34830,14 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "uDG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/machinery/camera/network/command{ dir = 9 }, /turf/simulated/floor/airless, -/area/ai_monitored/storage/eva) +/area/maintenance/cargo) "uEv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -35334,23 +34848,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/exploration) -"uFs" = ( -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 6 - }, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_y = 3 - }, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = -3 - }, -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "uGb" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -35375,6 +34872,7 @@ pixel_x = -23 }, /turf/simulated/floor/tiled, +<<<<<<< HEAD /area/tether/station/dock_two) "uGl" = ( /obj/structure/table/rack{ @@ -35390,6 +34888,9 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +======= +/area/hallway/station/docks) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "uHl" = ( /obj/structure/railing{ dir = 8 @@ -35404,12 +34905,6 @@ /obj/random/maintenance/research, /turf/simulated/floor, /area/maintenance/station/exploration) -"uHv" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/structure/window/reinforced, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "uId" = ( /obj/structure/closet/crate, /obj/random/junk, @@ -35629,13 +35124,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/engineering/foyer) -"uTu" = ( -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "uTC" = ( <<<<<<< HEAD /obj/machinery/power/breakerbox/activated{ @@ -35783,24 +35271,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/maintenance/station/cargo) -"uYV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/button/windowtint{ - dir = 4; - id = "pathfinder_office"; - pixel_x = -24 - }, -/obj/structure/closet/secure_closet/pathfinder{ - req_access = list(62,43,67) - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 - }, -/obj/item/device/bluespaceradio/tether_prelinked, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) "uZb" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -35824,11 +35294,28 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) +<<<<<<< HEAD "vbm" = ( /obj/structure/table/woodentable, /obj/item/weapon/pen, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +======= +"vaR" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "vbA" = ( /obj/structure/table/standard, /obj/random/medical, @@ -35928,6 +35415,14 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/tether/station/dock_two) +"vjj" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "vkg" = ( /obj/machinery/bodyscanner{ dir = 4 @@ -35971,26 +35466,42 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"vms" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) "vmt" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 }, -/obj/effect/floor_decal/corner/green/bordercorner, /turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/area/ai_monitored/storage/eva) "vns" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/wall/rshull, @@ -36010,6 +35521,13 @@ "voE" = ( /turf/simulated/wall/r_wall, /area/tether/station/dock_two) +"voI" = ( +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/dark, +/area/gateway/prep_room) "voN" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -36031,12 +35549,11 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "vrr" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "vrE" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -36093,6 +35610,7 @@ }, /turf/simulated/floor/tiled, /area/shuttle/medivac/engines) +<<<<<<< HEAD >>>>>>> 4ccd512332... Merge pull request #12923 from KillianKirilenko/kk-shipfixes "vtx" = ( /obj/machinery/sleep_console{ @@ -36107,6 +35625,8 @@ /obj/machinery/camera/network/exploration, /turf/simulated/floor/tiled/white, /area/tether/exploration/hallway) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "vuu" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -36248,23 +35768,12 @@ /turf/simulated/wall, /area/hallway/station/docks) "vCA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/green/bordercorner2{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monotile, +/area/ai_monitored/storage/eva) "vDW" = ( /obj/structure/cable/green{ d1 = 1; @@ -36320,14 +35829,33 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "vHM" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/weapon/cell/high{ + charge = 100; + maxcharge = 15000 }, -/turf/simulated/floor, -/area/maintenance/station/exploration) +/obj/item/weapon/cell/high{ + charge = 100; + maxcharge = 15000 + }, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "vIg" = ( /obj/structure/cable{ d1 = 1; @@ -36388,6 +35916,7 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) +<<<<<<< HEAD "vMe" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -36435,6 +35964,8 @@ /obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "vNl" = ( /obj/structure/cable/green{ d1 = 4; @@ -36535,6 +36066,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +<<<<<<< HEAD "vXw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -36563,6 +36095,8 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "vYm" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36701,7 +36235,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass/hidden/steel, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "wdk" = ( @@ -36964,14 +36500,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"wDI" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/green/border, -/obj/machinery/light, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/item/weapon/storage/box/nifsofts_pilot, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) "wEF" = ( /obj/machinery/conveyor{ dir = 1; @@ -36982,6 +36510,28 @@ }, /turf/simulated/floor/plating, /area/quartermaster/delivery) +"wFN" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) +"wHt" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/cargo) "wHC" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -36995,6 +36545,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "wHG" = ( @@ -37153,15 +36707,18 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "wNa" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +/obj/machinery/vending/wallmed_airlock{ + pixel_x = -28 }, -/obj/effect/landmark/start{ - name = "Pathfinder" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/exploration/pathfinder_office) +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/tether/exploration/hallway) "wPp" = ( /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "lifeboat2" @@ -37229,9 +36786,6 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, @@ -37241,8 +36795,14 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "wSt" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, /turf/simulated/floor/tiled, -/area/gateway/prep_room) +/area/ai_monitored/storage/eva) "wSv" = ( /obj/machinery/alarm{ dir = 4; @@ -37254,15 +36814,14 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "wUa" = ( -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "GateShut"; - layer = 3.3; - name = "Gateway Shutter" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "wWh" = ( /obj/structure/table/rack{ dir = 8; @@ -37289,6 +36848,15 @@ /obj/item/device/radio/beacon, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"wXJ" = ( +/obj/structure/table/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) +"wYx" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "wYD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -37324,14 +36892,9 @@ }, /area/shuttle/excursion/general) "xat" = ( -/obj/effect/landmark/start{ - name = "Pilot" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) +/obj/structure/table/bench/wooden, +/turf/simulated/floor/grass, +/area/hallway/station/atrium) "xbm" = ( /obj/structure/table/standard, /obj/random/tech_supply, @@ -37411,8 +36974,14 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) "xdE" = ( -/turf/simulated/wall/r_wall, -/area/gateway) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/ai_monitored/storage/eva) "xdJ" = ( /obj/structure/cable/green{ d2 = 8; @@ -37584,11 +37153,14 @@ name = "\improper Telecomms Lobby" }) "xmh" = ( -/obj/machinery/gateway{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/dark, -/area/gateway) +/turf/simulated/floor/tiled/monotile, +/area/ai_monitored/storage/eva) "xnM" = ( /obj/machinery/firealarm{ dir = 1; @@ -37601,9 +37173,33 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/janitor) +<<<<<<< HEAD "xpA" = ( /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +"xoV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) +"xpa" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "xqM" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -37684,12 +37280,13 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled, /area/gateway/prep_room) <<<<<<< HEAD +<<<<<<< HEAD "xwd" = ( /obj/structure/sign/redcross, /turf/simulated/wall/rshull, @@ -37702,7 +37299,27 @@ id = "PubPrepFront"; layer = 3.3; name = "Gateway Prep Shutter" +======= +"xuP" = ( +/obj/effect/landmark/start{ + name = "Pilot" }, +/obj/machinery/button/remote/airlock{ + id = "pilotB"; + name = "Room B Lock"; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo + }, +/turf/simulated/floor/tiled/milspec, +/area/tether/exploration/pilot_office) +"xwg" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -37716,7 +37333,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, +/turf/simulated/floor/tiled/steel_ridged, /area/gateway/prep_room) "xwI" = ( /obj/structure/extinguisher_cabinet{ @@ -37741,6 +37358,15 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/station/cargo) +"xxH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/gateway/prep_room) "xyw" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, @@ -37778,16 +37404,6 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"xAo" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "xAD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -37800,6 +37416,7 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) +<<<<<<< HEAD "xBE" = ( /obj/structure/table/steel, /obj/item/stack/flag/yellow{ @@ -37824,6 +37441,8 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +======= +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo "xCd" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/disposalpipe/segment{ @@ -37852,12 +37471,6 @@ }, /turf/simulated/floor, /area/maintenance/cargo) -"xCx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) "xCX" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -38029,35 +37642,42 @@ /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "xPm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 +======= +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) +"xPD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/camera/network/exploration{ dir = 5 }, -/obj/machinery/light, /turf/simulated/floor/tiled, -/area/ai_monitored/storage/eva) +/area/tether/exploration/pilot_office) "xPO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "eva_airlock"; + pixel_y = 24 }, -/turf/simulated/floor/tiled, -/area/tether/exploration/crew) -"xPQ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/airlock_sensor{ + id_tag = "eva_sensor"; + pixel_y = 32 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1379; + id_tag = "eva_pump" }, -/turf/simulated/floor/tiled, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "xQi" = ( /obj/structure/cable/green{ @@ -38076,22 +37696,15 @@ /turf/simulated/floor, /area/maintenance/station/exploration) "xQA" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 8; - id_tag = "eva_airlock"; - pixel_x = 28 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/obj/machinery/airlock_sensor{ - id_tag = "eva_sensor"; - pixel_x = 24; - pixel_y = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) +/turf/simulated/wall, +/area/maintenance/cargo) "xQD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38140,9 +37753,21 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) +"xTg" = ( +/obj/structure/table/steel, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/tiled/milspec, +/area/tether/exploration/pilot_office) "xTB" = ( /turf/simulated/wall/r_wall, /area/tcommsat/chamber) +"xTN" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/exploration/pilot_office) "xUb" = ( /obj/effect/floor_decal/industrial/loading{ dir = 1 @@ -38271,16 +37896,17 @@ name = "\improper Telecomms Lobby" }) "ybD" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/pilot, -/obj/item/clothing/head/helmet/space/void/pilot, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/green/border, -/turf/simulated/floor/tiled, -/area/tether/exploration/pilot_office) +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "GateShut"; + layer = 3.3; + name = "Gateway Shutter" + }, +/turf/simulated/floor/plating, +/area/gateway/prep_room) "ybO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -38288,14 +37914,14 @@ /obj/machinery/holoposter{ pixel_y = -30 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) <<<<<<< HEAD @@ -45703,6 +45329,7 @@ xMk isr fji vCj +<<<<<<< HEAD fLT fLT voE @@ -45723,6 +45350,28 @@ aaa aaa aaa aaa +======= +vCj +vCj +vCj +vCj +vCj +vCj +aDv +aDv +wHt +wHt +aDv +aDv +wHt +wHt +aDv +aDv +wHt +wHt +aDv +aDv +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo aaa aaa aaa @@ -45851,20 +45500,20 @@ wQf jyJ mQh uGb -jab -bEW -pmE -oWU -tal -tal -tal -tal -tal -tal -tal -duP -aaa -aaa +aDv +tUh +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +aDv aaa aaa aaa @@ -45994,19 +45643,19 @@ bqi fjP nCV sVz -aCz -myN -cTd -tal -eZg -qGn -tal -qzo -iKm -tal -aaa -aaa -aaa +xQA +fvo +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +fxc aaa aaa aaa @@ -46136,19 +45785,19 @@ trQ mOz nEB nZC -aAV -iDc -jkV -uyg -uyg -uyg -xPQ -uyg -qUr -tal -tal -tal -tal +tUh +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +fxc aaa aaa aaa @@ -46277,20 +45926,20 @@ tUh tUh tUh tUh -tal -vML -liM -xpA -pyP -qoB -qWs -sIo -tZM -jkV -vMe -uyg -xBF -tal +aDv +tUh +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +aDv aaa aaa aaa @@ -46419,20 +46068,20 @@ lqr mqL mPj mPj -tal -cDF -rtP -xCx -pDf -xCx -xCx -xCx -omi -lvV -vMN -fWt -xPm -tal +aDv +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +aDv ahW ahW aaa @@ -46561,21 +46210,21 @@ pGr eTo ohn nJb -tal -gnV -xpA -xpA -pSR -qrF -ekj -sPJ -uFs -bJm -tal -bHG -pAj -tal -kpr +aDv +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +fxc +sNZ ahW aaa aaa @@ -46703,20 +46352,20 @@ qiw aHq rVd nNV -tal -gLW -qQx -qQx -qQx -qQx -qQx -qQx -qQx -xAo -tal -vNj -aHc -cfy +aDv +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +fxc sNZ ahW aaa @@ -46845,20 +46494,20 @@ tUh tUh tUh tUh -tal -ulT -uHv -eom -bzq -qrP -qYg -tal -vYj -uGl -tal -bHN -xQA -cfy +aDv +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +wBw +aDv uDG ahW aaa @@ -46988,6 +46637,13 @@ rkH heB llt aDv +tUh +tUh +tUh +tUh +tUh +rdo +iss aDv aDv aDv @@ -46995,13 +46651,6 @@ aDv aDv aDv aDv -aDv -tal -tal -tal -tal -tal -tal ahW ahW ahW @@ -47419,7 +47068,7 @@ tUh tUh tUh tUh -tUh +iss toy tUh tUh @@ -47946,7 +47595,7 @@ abC abC abC kVz -abC +egy abC abC abC @@ -48085,19 +47734,19 @@ pny pny pny pny -knk -ach +mIs +mIs +ack +ack +ach +oer +xTg +euy +oer +euy +xTg +oer ack -ajY -kvF -ami -ajY -lHv -mau -msn -anc -mYJ -abC bhG wku aDM @@ -48227,19 +47876,19 @@ adh hry adX pny -knk ack -ach -ajY -kxm -bQG -mQR -pyy -lIs -mtm -aZv -bxi -abC +ack +ack +ack +mIs +oer +ohc +nHx +oer +xuP +qTD +oer +ack azJ wku pBP @@ -48369,18 +48018,18 @@ bfo adw aef pny +ack +iGO +iGO iGO iGO oer oer +oGc +oer +mdM oer oer -oer -ash -jQR -muY -mIs -nay abC rot wku @@ -48511,18 +48160,18 @@ sUY eWv bYt pny -aao -jPM +ach +iGO +wNa +gCX +npk oer -oTn -uYV -oTL -oer -lIF -asP -muY -mIs -nay +wYx +jDI +quW +oMQ +xPD +fnM abC cXs wku @@ -48653,18 +48302,18 @@ tiw eWv bYt pny -vtx -aiJ +ack +iGO +ctI +gDl +ogv oer -ajz -wNa -amM -ake -lIZ -mgw -myq -mJd -nbQ +ldJ +boC +oeE +iBk +dnh +vjj abC cXs wku @@ -48787,7 +48436,7 @@ wZB wZB wZB wZB -nYi +fGW aak fGW ruq @@ -48795,18 +48444,18 @@ ruq eWv bYt pny -ahS -aiL +ack +iGO +cUD +gDl +otE oer -akc -alV -amT -ake -lIZ -avb -muY -asP -tfx +mcE +boC +boC +hkY +boC +mUb bZv azI wku @@ -48937,18 +48586,18 @@ haB eWv bYt pny -aii -aiU +ach +iGO +djU +jgd +oIV oer -akd -alY -amX -oer -asF -mgT -muY -asP -bDi +ans +wXJ +wXJ +joY +itz +xTN bZv cix qpN @@ -49079,18 +48728,18 @@ haB eWv ebG pny +aao +iGO iGO -aiZ -oer -unu -ake ake +iGO +oer +aEK +aEK oer -ajY -ajY mzB mKM -ajY +oer bZv rYh acN @@ -49235,7 +48884,7 @@ akf jZT uCB oEs -goL +jiq jiq wAC mCI @@ -49245,11 +48894,19 @@ nFZ jOH acn mnT +<<<<<<< HEAD vYJ lcy wRJ tRn vYJ +======= +wRJ +wRJ +wRJ +wRJ +wRJ +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo vYJ dPx rjV @@ -49388,6 +49045,7 @@ aih ort cXm smz +<<<<<<< HEAD smz smz smz @@ -49416,6 +49074,13 @@ aaD abU aaD ======= +======= +dch +dch +dch +dch +bZv +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo oEH pKC aaD @@ -49553,12 +49218,12 @@ bZv aAL jeL fEF -smz +dch adc dch dQR eVP -smz +bZv knK xnM xgV @@ -49678,16 +49343,16 @@ cND pPa eWv nDX -scu -scu -scu -scu -scu -scu -kXm -scu -scu -xNg +tal +tal +tal +tal +tal +tal +tal +tal +tal +tal xNg xNg xNg @@ -49697,10 +49362,10 @@ okq beY bth pLb -dge +xat lSR -fpX -smz +xat +bZv vAk fwt xgV @@ -49820,16 +49485,16 @@ jBW kiG eWv hxD -scu +tal ieS iHb -iHb +tal kbz kIR -kXK +tal lxl lML -xNg +jab aCo baI aCo @@ -49839,10 +49504,10 @@ atx xNg xNg xNg -iAk xat -wDI -smz +xat +xat +bZv cOq xuf xgV @@ -49962,28 +49627,27 @@ gOT haB eWv ops -scu -ifV -iIf -jsP -kcy -kJj +tal +ajj +cfy +cfy +cfy +oJt kZA -gIp -nac -xNg -aEK -baT +mGG +mGG +wSt baT +ufj +bZX bQj cca aCA bhK bEu xNg -amm -dUk ybD +<<<<<<< HEAD smz <<<<<<< HEAD bfH @@ -50008,6 +49672,11 @@ abQ aca aaD ======= +======= +ybD +ybD +fgh +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo etY etY aaD @@ -50128,28 +49797,29 @@ gyH haB eWv ops -scu +tal ins -iKY -lcm -kdF -kJJ -tUx -ajj -lPD -xNg -bpi -wSt +ctz +ctz +ctz +pPw +wUa +jLF +mdn +fkr +lBQ +xxH bFM iWB asN aFZ whg bPl -xNg +sWX saD -dUk +iUE rci +<<<<<<< HEAD smz hrw pMg @@ -50161,6 +49831,19 @@ hPZ isi jzJ xgV +======= +fgh +kcy +key +abn +aaM +kvF +kxm +kxG +kJj +acb +aaD +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo qJu kVK lvh @@ -50270,16 +49953,16 @@ ruq fAB eWv hBS -scu +tal iie -ajj -jtH -kel -kKh -lbi -lzl -lTD -xNg +aii +tal +obA +scu +xdE +cfy +gjU +pDE aKG bbT bFR @@ -50288,11 +49971,11 @@ cek aIA bFR bPl -xNg -smz +sWX +kCj ebM -smz -smz +snX +fgh qnL hTk xgV @@ -50412,30 +50095,30 @@ ruq ruq eWv hBS +tal +tal +tal +tal +jEf scu -hcw -ajj -uTu -obA -kxG -all +xdE lAt bkI -xNg +jab aKJ -bck +oqF bHw xNg xNg cFs bFR ccz -xNg +sWX amy eLn fIw -smz -hrw +fgh +juI tHd xgV ivD @@ -50554,30 +50237,30 @@ sUY sUY eWv hCJ -scu -iiQ -ajj -juI -key -vbm -vms -ajj +tal +apf +ctB +dYV +lIB +vCA +xmh +iyt bmv -xNg +tal aTV -bck +oqF bFR bSM chD aIA -bFR +wFN cii xNg -djU -smz -smz -smz -hrw +xNg +fgh +fgh +fgh +juI tpq xgV xgV @@ -50696,30 +50379,30 @@ bPD ali hss pXr -scu -iiU -ajj +tal +bxi +aiJ +kpK kpK -kfa alj -vmt -vCA +all +iyt plm -xNg +tal aWJ -bck +hrI oxg hpE xuu cGh -bFR +oGG geM geM xNg uId cfB vBG -hrw +juI xUI fLT gOd @@ -50733,10 +50416,10 @@ yak kMF saf fLT -rCQ -rTO -odO -fLT +aaa +aaa +aaa +aaa aaa aaa aaa @@ -50838,30 +50521,36 @@ gVQ hbc htA qer -scu +tal ajv -ajj -ajj +aiL +tal vmt +<<<<<<< HEAD hqU ajq scu +======= +sxj +pxB +iyt +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo hlX -xNg -aXm +tal +bQG bck kEI hVz lVO -aLV -box -col +oGG +oGG +oGG cqC xNg pMf -bfH -bfH -hrw +jtH +jsP +kdF hrw vga odI @@ -50874,16 +50563,16 @@ fLT knX qMM qVz -rqf -rEb -rTY -lfK fLT aaa aaa aaa aaa aaa +aaa +aaa +aaa +aaa ahW aaa aaa @@ -50980,32 +50669,40 @@ pny pny pny pny -scu +tal ajw iMe -ajE +tal ajq scu -scu -scu +ami +asF vHM -xNg +tal aXm bcx aKG aKG aKG -ctB +aKG fYY oGG -wSt +voI xNg pMf +<<<<<<< HEAD hrw etY etY etY fLT +======= +juI +aaq +aat +aaq +voE +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo kcV kcV hFa @@ -51015,17 +50712,17 @@ jnG fLT qKr wmg -lCO -fLT -aap -rVK -lnG +qYW fLT aaa aaa aaa aaa aaa +aaa +aaa +aaa +aaa ahW aaa aaa @@ -51122,16 +50819,16 @@ aac aac aac aac -scu +tal xPO -xPO -xPO -scu -scu -aac -etY +aiU +tal +mLO +vrr +anc +kpK oWW -xNg +tal xNg bdy bHV @@ -51143,11 +50840,19 @@ bYa ckR xNg pMf +<<<<<<< HEAD hrw etY aac aac fLT +======= +juI +aaq +aau +aax +voE +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo fLT fLT hFV @@ -51157,17 +50862,17 @@ jEb jYg wbf btr -fQr -fLT -adO -nRk -odT +jGw fLT aaa aaa aaa aaa aaa +aaa +aaa +aaa +aaa ahW asG asG @@ -51264,16 +50969,28 @@ aac aac aac aac -aac -aam -aam -aam -aac -aac -aac -etY +tal +ahS +ctD +tal +aiZ +ajE +ash +avb apY +tal +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq +aaq dul +<<<<<<< HEAD xdE xdE xdE @@ -51290,6 +51007,13 @@ etY aac aac aac +======= +juI +aaq +aaw +aay +aaq +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo aac fLT fLT @@ -51301,6 +51025,7 @@ khN rQq ybO fLT +<<<<<<< HEAD fLT fLT fLT @@ -51310,6 +51035,17 @@ aaa aaa aaa aaa +======= +ahW +ahW +ahW +ahW +ahW +ahW +ahW +ahW +ahW +>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo ahW asG asG @@ -51409,23 +51145,23 @@ aac aam aam aam -aam -aam -aac -aac -etY +tal +tal +tal +tal +tal aul -dVT -xdE -xmh -ctz -dYV -wUa -cUD -lIB -ogv -gDl -xdE +tal +aaq +pMf +pMf +pMf +pMf +pMf +pMf +pMf +pMf +aaq uEU jyP etY @@ -51558,18 +51294,18 @@ aac etY bfH kSu -xdE -mLO -ctD -egy -wUa -lIB -sxj -npk -vrr -xdE +aaq +pMf +pMf +pMf +pMf +pMf +pMf +pMf +pMf +aaq uEU -bfH +jPM etY aac aam @@ -51798,18 +51534,18 @@ aaa aam aac etY -hrw +aZv xQj -xdE -apf -ctI -jEf -wUa -lIB -lIB -lIB -lIB -xdE +aaq +pMf +pMf +pMf +pMf +pMf +pMf +pMf +pMf +aaq mmt gGC etY @@ -52054,18 +51790,18 @@ aam etY bZd uEU -xdE -xdE -xdE -xdE -xdE -otE -jgd -pPw -oJt -xdE +aaq +aaq +aaq +aaq +aaq pMf -hrw +pMf +pMf +pMf +aaq +pMf +juI etY aac aaa @@ -52194,20 +51930,20 @@ aaa aac aac etY -hrw -pMf +aZv pMf +dVT cCM biX lUV -xdE -xdE -xdE -xdE -xdE -xdE +aaq +aaq +aaq +aaq +aaq +aaq pMf -bfH +jPM etY aac aaa @@ -52336,20 +52072,20 @@ aaa aac aac etY -hrw -hrw -hrw -bfH -hrw -hrw -hrw -hrw -hrw +bpi +bDi +gIp +hcw +ifV +iiU +iIf +iKY +iKY bWY -bfH -hrw -hrw -bfH +jsP +iKY +iKY +jQR etY aac aaa diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index 9adb24aed1..e1ba6b14f2 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -14,7 +14,7 @@ network = "tcommsat" autolinkers = list("hub", "tether_relay", "c_relay", "m_relay", "r_relay", - "science", "medical", "supply", "service", "common", "command", "engineering", "security", "explorer", "unused", + "science", "medical", "supply", "service", "common", "command", "engineering", "security", "Away Team", "unused", "hb_relay", "receiverA", "broadcasterA" ) @@ -30,7 +30,7 @@ /obj/machinery/telecomms/server/presets/service/tether freq_listening = list(SRV_FREQ, EXP_FREQ) - autolinkers = list("service", "explorer") + autolinkers = list("service", "Away Team") // Telecommunications Satellite /area/tether/surfacebase/tcomms @@ -79,7 +79,7 @@ num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology), num2text(SUP_FREQ) = list(access_cargo), num2text(SRV_FREQ) = list(access_janitor, access_hydroponics), - num2text(EXP_FREQ) = list(access_explorer) + num2text(EXP_FREQ) = list(access_awayteam) ) /obj/item/device/multitool/tether_buffered diff --git a/maps/yw/submaps/rogue_mines/groundbase_shuttles.dm b/maps/yw/submaps/rogue_mines/groundbase_shuttles.dm index 66e856e828..1c21e86cf5 100644 --- a/maps/yw/submaps/rogue_mines/groundbase_shuttles.dm +++ b/maps/yw/submaps/rogue_mines/groundbase_shuttles.dm @@ -143,3 +143,82 @@ requires_power = 0 dynamic_lighting = 0 +//AXOLOTL + +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/axolotl + name = "short jump console" + shuttle_tag = "Axolotl" + +// The 'shuttle' +/datum/shuttle/autodock/overmap/axolotl + name = "Axolotl" + current_location = "omship_axolotl" + docking_controller_tag = "axolotl_docking" + shuttle_area = list(/area/shuttle/axolotl,/area/shuttle/axolotl_cockpit,/area/shuttle/axolotl_engineering,/area/shuttle/axolotl_q1,/area/shuttle/axolotl_q2,/area/shuttle/axolotl_galley,/area/shuttle/axolotl_head) + defer_initialisation = TRUE //We're not loaded until an admin does it + fuel_consumption = 5 + ceiling_type = /turf/simulated/floor/reinforced/airless + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/axolotl + name = "ITV Axolotl" + base_area = /area/submap/groundbase/wilderness/west + base_turf = /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c + landmark_tag = "omship_axolotl" + shuttle_type = /datum/shuttle/autodock/overmap/axolotl + +// The 'ship' +/obj/effect/overmap/visitable/ship/landable/axolotl + name = "ITV Axolotl" + scanner_desc = @{"[i]Registration[/i]: ITV Axolotl +[i]Class[/i]: Corvette +[i]Transponder[/i]: Transmitting (CIV), non-hostile +[b]Notice[/b]: Multirole independent vessel"} + vessel_mass = 4500 + vessel_size = SHIP_SIZE_LARGE + fore_dir = EAST + shuttle = "Axolotl" + known = TRUE + +/area/shuttle/axolotl + name = "\improper Axolotl Cabin" + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "gray" + requires_power = 1 + +/area/shuttle/axolotl_engineering + name = "\improper Axolotl Engineering" + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "yellow" + requires_power = 1 + +/area/shuttle/axolotl_cockpit + name = "\improper Axolotl Cockpit" + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "blue" + requires_power = 1 + +/area/shuttle/axolotl_q1 + name = "\improper Axolotl Quarters 1" + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "gray-p" + requires_power = 1 + +/area/shuttle/axolotl_q2 + name = "\improper Axolotl Quarters 2" + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "gray-s" + requires_power = 1 + +/area/shuttle/axolotl_galley + name = "\improper Axolotl Galley" + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "dark-s" + requires_power = 1 + +/area/shuttle/axolotl_head + name = "\improper Axolotl Head" + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "dark-p" + requires_power = 1 diff --git a/vorestation.dme b/vorestation.dme index 90330f2645..30e66a85f7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -823,7 +823,6 @@ #include "code\game\jobs\job\department_vr.dm" #include "code\game\jobs\job\engineering.dm" #include "code\game\jobs\job\engineering_vr.dm" -#include "code\game\jobs\job\exploration_vr.dm" #include "code\game\jobs\job\job.dm" #include "code\game\jobs\job\job_vr.dm" #include "code\game\jobs\job\medical.dm"