diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index cad6438ee3..60765435f3 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -68,4 +68,32 @@ /obj/item/clothing/head/helmet/space/void/mining = 3, /obj/item/clothing/mask/breath = 3, /obj/item/weapon/tank/oxygen = 3 - ) \ No newline at end of file + ) + +/datum/supply_packs/voidsuits/explorer + name = "Exploration voidsuits" + contains = list( + /obj/item/clothing/suit/space/void/exploration = 3, + /obj/item/clothing/head/helmet/space/void/exploration = 3, + /obj/item/clothing/mask/breath = 3, + /obj/item/clothing/shoes/magboots = 3, + /obj/item/weapon/tank/oxygen = 3 + ) + cost = 50 + containertype = "/obj/structure/closet/crate/secure" + containername = "Exploration voidsuit crate" + access = access_explorer + +/datum/supply_packs/voidsuits/pilot + name = "Pilot voidsuits" + contains = list( + /obj/item/clothing/suit/space/void/pilot = 1, + /obj/item/clothing/head/helmet/space/void/pilot = 1, + /obj/item/clothing/mask/breath = 1, + /obj/item/clothing/shoes/magboots = 1, + /obj/item/weapon/tank/oxygen = 1 + ) + cost = 20 + containertype = "/obj/structure/closet/crate/secure" + containername = "Pilot voidsuit crate" + access = access_pilot \ No newline at end of file diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 667d351a9d..395b46e934 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -80,6 +80,7 @@ var/list/medical_positions = list( var/list/science_positions = list( "Research Director", + "Pathfinder", // VOREStation Edit - Added Pathfinder "Scientist", "Geneticist", //Part of both medical and science "Roboticist", diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 964d80b258..53acbb3aec 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -17,3 +17,48 @@ SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH ) + +/obj/machinery/suit_cycler/explorer + name = "Explorer suit cycler" + model_text = "Exploration" + req_access = list(access_pilot) + departments = list("Exploration","Pilot") + +/obj/machinery/suit_cycler/explorer/initialize() + species -= SPECIES_TESHARI + return ..() + +/obj/machinery/suit_cycler/apply_paintjob() + if(!target_species || !target_department) + return + + if(target_species) + if(helmet) helmet.refit_for_species(target_species) + if(suit) suit.refit_for_species(target_species) + + switch(target_department) + if("Exploration") + if(helmet) + helmet.name = "exploration voidsuit helmet" + helmet.icon_state = "helm_explorer" + helmet.item_state = "helm_explorer" + if(suit) + suit.name = "exploration voidsuit" + suit.icon_state = "void_explorer" + suit.item_state = "void_explorer" + suit.item_state_slots[slot_r_hand_str] = "wiz_voidsuit" + suit.item_state_slots[slot_l_hand_str] = "wiz_voidsuit" + if("Pilot") + if(helmet) + helmet.name = "pilot voidsuit helmet" + helmet.icon_state = "rig0_pilot" + helmet.item_state = "pilot_helm" + if(suit) + suit.name = "pilot voidsuit" + suit.icon_state = "rig-pilot" + suit.item_state = "rig-pilot" + suit.item_state_slots[slot_r_hand_str] = "sec_voidsuitTG" + suit.item_state_slots[slot_l_hand_str] = "sec_voidsuitTG" + else + return ..() + diff --git a/code/game/objects/items/devices/PDA/PDA_vr.dm b/code/game/objects/items/devices/PDA/PDA_vr.dm index 037c9777ac..e21fcbea8b 100644 --- a/code/game/objects/items/devices/PDA/PDA_vr.dm +++ b/code/game/objects/items/devices/PDA/PDA_vr.dm @@ -2,4 +2,8 @@ default_cartridge = /obj/item/weapon/cartridge/captain icon_state = "pda-h" detonate = 0 -// hidden = 1 \ No newline at end of file +// hidden = 1 + +/obj/item/device/pda/pathfinder + default_cartridge = /obj/item/weapon/cartridge/signal/science + icon_state = "pda-h" diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index c5fd513dcd..0658754c34 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -101,7 +101,7 @@ attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut") can_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned. slot_flags = SLOT_BELT - default_material = "plasteel" + default_material = "plasteel" //VOREStation Edit /obj/item/weapon/material/knife/tacknife/survival name = "survival knife" @@ -110,5 +110,5 @@ icon_state = "survivalknife" item_state = "knife" applies_material_colour = FALSE - default_material = "plasteel" + default_material = "plasteel" //VOREStation Edit toolspeed = 2 // Use a real axe if you want to chop logs. diff --git a/code/game/objects/items/weapons/material/knives_vr.dm b/code/game/objects/items/weapons/material/knives_vr.dm new file mode 100644 index 0000000000..45a52838b4 --- /dev/null +++ b/code/game/objects/items/weapons/material/knives_vr.dm @@ -0,0 +1,6 @@ +/obj/item/weapon/material/knife/machete/deluxe + name = "deluxe machete" + desc = "A fine example of a machete, with a polished blade, wooden handle and a leather cord loop." + icon = 'icons/obj/weapons_vr.dmi' + icon_state = "machetedx" + item_state = "machete" diff --git a/code/game/objects/items/weapons/storage/boxes_vr.dm b/code/game/objects/items/weapons/storage/boxes_vr.dm new file mode 100644 index 0000000000..d3dcd936da --- /dev/null +++ b/code/game/objects/items/weapons/storage/boxes_vr.dm @@ -0,0 +1,4 @@ +/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) diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 3150a5ff12..70381ee123 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -54,7 +54,7 @@ if(alt_title && !(alt_title in job.alt_titles)) pref.player_alt_titles -= job.title -/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 18, list/splitJobs = list("Chief Engineer")) +/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 19, list/splitJobs = list("Chief Engineer")) //VOREStation Edit if(!job_master) return diff --git a/code/modules/clothing/spacesuits/void/station_vr.dm b/code/modules/clothing/spacesuits/void/station_vr.dm new file mode 100644 index 0000000000..d349971a05 --- /dev/null +++ b/code/modules/clothing/spacesuits/void/station_vr.dm @@ -0,0 +1,42 @@ +//Exploration +/obj/item/clothing/head/helmet/space/void/exploration + name = "exploration voidsuit helmet" + desc = "A radiation-resistant helmet made especially for exploring unknown planetary environments." + icon_state = "helm_explorer" + item_state = "helm_explorer" + armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70) + light_overlay = "helmet_light_dual" //explorer_light + +/obj/item/clothing/suit/space/void/exploration + name = "exploration voidsuit" + desc = "A lightweight, radiation-resistant voidsuit, featuring the Explorer emblem on its chest plate. Designed for exploring unknown planetary environments." + icon_state = "void_explorer" + armor = list(melee = 40, bullet = 15, laser = 25,energy = 35, bomb = 30, bio = 100, rad = 70) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/device/healthanalyzer,/obj/item/device/gps,/obj/item/device/radio/beacon,/obj/item/weapon/shovel) + +/obj/item/clothing/suit/space/void/exploration/prepared + helmet = /obj/item/clothing/head/helmet/space/void/exploration + boots = /obj/item/clothing/shoes/magboots + +//Pilot +/obj/item/clothing/head/helmet/space/void/pilot + desc = "An atmos resistant helmet for space and planet exploration." + name = "pilot voidsuit helmet" + icon_state = "rig0_pilot" + item_state = "pilot_helm" + armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50) + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + light_overlay = "helmet_light_dual" + +/obj/item/clothing/suit/space/void/pilot + desc = "An atmos resistant voidsuit for space and planet exploration." + icon_state = "rig-pilot" + item_state = "rig-pilot" + name = "pilot voidsuit" + armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 15, bio = 100, rad = 50) + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/toolbox,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/device/t_scanner,/obj/item/weapon/rcd) + +/obj/item/clothing/suit/space/void/pilot/prepared + helmet = /obj/item/clothing/head/helmet/space/void/pilot + boots = /obj/item/clothing/shoes/magboots \ No newline at end of file diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi index 02e0994c33..b943508a47 100644 Binary files a/icons/mob/hud_jobs_vr.dmi and b/icons/mob/hud_jobs_vr.dmi differ diff --git a/icons/mob/ties_vr.dmi b/icons/mob/ties_vr.dmi deleted file mode 100644 index 2dec9f3781..0000000000 Binary files a/icons/mob/ties_vr.dmi and /dev/null differ diff --git a/icons/obj/clothing/ties_vr.dmi b/icons/obj/clothing/ties_vr.dmi deleted file mode 100644 index d2ba4a0971..0000000000 Binary files a/icons/obj/clothing/ties_vr.dmi and /dev/null differ diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi index 17d7368a7e..9535528b7e 100644 Binary files a/icons/obj/weapons_vr.dmi and b/icons/obj/weapons_vr.dmi differ diff --git a/maps/southern_cross/items/encryptionkey_sc.dm b/maps/southern_cross/items/encryptionkey_sc.dm index 31ece03bf9..6896bf1c6c 100644 --- a/maps/southern_cross/items/encryptionkey_sc.dm +++ b/maps/southern_cross/items/encryptionkey_sc.dm @@ -1,7 +1,7 @@ /obj/item/device/encryptionkey/pilot name = "pilot's encryption key" icon_state = "com_cypherkey" - channels = list("Explorer" = 1) //VOREStation Edit + channels = list("Supply" = 1, "Explorer" = 1) /obj/item/device/encryptionkey/explorer name = "explorer radio encryption key" diff --git a/maps/southern_cross/items/encryptionkey_vr.dm b/maps/southern_cross/items/encryptionkey_vr.dm new file mode 100644 index 0000000000..54f26ccebe --- /dev/null +++ b/maps/southern_cross/items/encryptionkey_vr.dm @@ -0,0 +1,3 @@ +/obj/item/device/encryptionkey/pilot + icon_state = "cypherkey" + channels = list("Explorer" = 1) diff --git a/maps/southern_cross/items/headset_sc.dm b/maps/southern_cross/items/headset_sc.dm index 1c22b751ba..ec73fbc7c7 100644 --- a/maps/southern_cross/items/headset_sc.dm +++ b/maps/southern_cross/items/headset_sc.dm @@ -1,32 +1,30 @@ /obj/item/device/radio/headset/pilot name = "pilot's headset" - desc = "A headset used by pilots, has access to supply and explorer channels." + desc = "A headset used by pilots, has access to the explorer channel." //VOREStation Edit icon_state = "pilot_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/pilot - adhoc_fallback = TRUE //VOREStation Edit /obj/item/device/radio/headset/pilot/alt name = "pilot's bowman headset" - desc = "A bowman headset used by pilots, has access to supply and explorer channels." + desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit icon_state = "pilot_headset_alt" /obj/item/device/radio/headset/pilot/alt name = "pilot's bowman headset" - desc = "A bowman headset used by pilots, has access to supply and explorer channels." + desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit 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." + desc = "Headset used by explorers for exploring. Access to explorer and science channels." //VOREStation Edit icon_state = "exp_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/explorer - adhoc_fallback = TRUE //VOREStation Edit /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." + desc = "Bowman headset used by explorers for exploring. Access to explorer and science channels." //VOREStation Edit icon_state = "exp_headset_alt" /obj/item/device/radio/headset/sar @@ -35,7 +33,6 @@ icon_state = "sar_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/sar - adhoc_fallback = TRUE //VOREStation Edit /obj/item/device/radio/headset/sar/alt name = "sar radio bowman headset" diff --git a/maps/southern_cross/items/headset_vr.dm b/maps/southern_cross/items/headset_vr.dm new file mode 100644 index 0000000000..c100fcf441 --- /dev/null +++ b/maps/southern_cross/items/headset_vr.dm @@ -0,0 +1,6 @@ +/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." + icon_state = "pilot_headset" + adhoc_fallback = TRUE + ks2type = /obj/item/device/encryptionkey/pilot diff --git a/maps/southern_cross/job/outfits.dm b/maps/southern_cross/job/outfits.dm index 54ac7f1d6b..a32b784c0d 100644 --- a/maps/southern_cross/job/outfits.dm +++ b/maps/southern_cross/job/outfits.dm @@ -62,4 +62,4 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_slot = slot_l_store id_type = /obj/item/weapon/card/id/medical/sar id_pda_assignment = "Search and Rescue" - flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL \ No newline at end of file + flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL diff --git a/maps/southern_cross/job/outfits_vr.dm b/maps/southern_cross/job/outfits_vr.dm new file mode 100644 index 0000000000..51b3c3670e --- /dev/null +++ b/maps/southern_cross/job/outfits_vr.dm @@ -0,0 +1,17 @@ +/decl/hierarchy/outfit/job/pathfinder + name = OUTFIT_JOB_NAME("Pathfinder") + shoes = /obj/item/clothing/shoes/boots/winter/explorer + uniform = /obj/item/clothing/under/explorer //TODO: Uniforms. + l_ear = /obj/item/device/radio/headset/explorer + id_slot = slot_wear_id + pda_slot = slot_l_store + pda_type = /obj/item/device/pda/pathfinder + id_type = /obj/item/weapon/card/id/science/head/pathfinder + id_pda_assignment = "Pathfinder" + flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL + backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1) + +/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H) + ..() + for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents) + permit.set_name(H.real_name) diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index 09b380aa9a..df8aae6e98 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -77,10 +77,10 @@ var/const/access_explorer = 43 faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the head of personnel" + supervisors = "the pathfinder and the head of personnel" //VOREStation Edit selection_color = "#515151" idtype = /obj/item/weapon/card/id/civilian/pilot - economic_modifier = 4 + economic_modifier = 5 //VOREStation Edit access = list(access_pilot) //VOREStation Edit minimal_access = list(access_pilot) //VOREStation Edit outfit_type = /decl/hierarchy/outfit/job/pilot @@ -91,12 +91,12 @@ var/const/access_explorer = 43 department = "Science" //VOREStation Edit department_flag = MEDSCI //VOREStation Edit faction = "Station" - total_positions = 3 //VOREStation Edit - spawn_positions = 3 //VOREStation Edit - supervisors = "the research director" //VOREStation Edit + total_positions = 2 //VOREStation Edit + spawn_positions = 2 //VOREStation Edit + supervisors = "the pathfinder and the research director" //VOREStation Edit selection_color = "#633D63" //VOREStation Edit idtype = /obj/item/weapon/card/id/civilian/explorer - economic_modifier = 4 + economic_modifier = 6 //VOREStation Edit access = list(access_pilot, access_explorer, access_research) //VOREStation Edit minimal_access = list(access_pilot, access_explorer, access_research) //VOREStation Edit outfit_type = /decl/hierarchy/outfit/job/explorer2 @@ -112,12 +112,12 @@ var/const/access_explorer = 43 department = "Medical" department_flag = MEDSCI faction = "Station" - total_positions = 2 //VOREStation Edit - spawn_positions = 2 //VOREStation Edit - supervisors = "the chief medical officer" + total_positions = 2 + spawn_positions = 2 + supervisors = "the pathfinder and the chief medical officer" //VOREStation Edit selection_color = "#013D3B" //VOREStation Edit idtype = /obj/item/weapon/card/id/medical - economic_modifier = 4 + economic_modifier = 6 //VOREStation Edit access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer) outfit_type = /decl/hierarchy/outfit/job/medical/sar \ No newline at end of file diff --git a/maps/southern_cross/southern_cross_jobs_vr.dm b/maps/southern_cross/southern_cross_jobs_vr.dm new file mode 100644 index 0000000000..b74710536f --- /dev/null +++ b/maps/southern_cross/southern_cross_jobs_vr.dm @@ -0,0 +1,24 @@ +var/const/PATHFINDER =(1<<13) //VOREStation Edit - Added Pathfinder + +/obj/item/weapon/card/id/science/head/pathfinder + desc = "A card which represents discovery of the unknown." + assignment = "Pathfinder" + rank = "Pathfinder" + job_access_type = /datum/job/pathfinder + +/datum/job/pathfinder + title = "Pathfinder" + flag = PATHFINDER + department = "Science" + department_flag = MEDSCI + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the research director" + selection_color = "#AD6BAD" + idtype = /obj/item/weapon/card/id/science/head/pathfinder + economic_modifier = 7 + + access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_research) + minimal_access = list(access_pilot, access_explorer, access_research) + outfit_type = /decl/hierarchy/outfit/job/pathfinder diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index e5dbea9ace..6904b2144b 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -99,6 +99,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, /obj/item/weapon/reagent_containers/glass/bottle/antitoxin, /obj/item/weapon/storage/belt/medical/emt, + /obj/item/weapon/material/knife/tacknife/survival, //VOREStation Add, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar, /obj/item/clothing/shoes/boots/winter/explorer, diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm new file mode 100644 index 0000000000..bdc1be0d44 --- /dev/null +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -0,0 +1,37 @@ +/obj/structure/closet/secure_closet/pathfinder + name = "pathfinder locker" + icon = 'icons/obj/closet_vr.dmi' + icon_state = "secureexp1" + icon_closed = "secureexp" + icon_locked = "secureexp1" + icon_opened = "secureexpopen" + icon_broken = "secureexpbroken" + icon_off = "secureexpoff" + req_access = list(access_explorer) + + starts_with = list( + /obj/item/clothing/under/explorer, + /obj/item/clothing/suit/storage/hooded/explorer, + /obj/item/clothing/mask/gas/explorer, + /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/clothing/gloves/black, + /obj/item/device/radio/headset/explorer, + /obj/item/device/flashlight, + /obj/item/device/gps/explorer, + /obj/item/weapon/storage/box/flare, + /obj/item/weapon/storage/box/explorerkeys, + /obj/item/device/geiger, + /obj/item/weapon/cell/device, + /obj/item/device/radio, + /obj/item/stack/marker_beacon/thirty, + /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/weapon/material/knife/machete/deluxe, + /obj/item/clothing/accessory/holster/machete, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2) + +/obj/structure/closet/secure_closet/explorer/initialize() + if(prob(50)) + starts_with += /obj/item/weapon/storage/backpack + else + starts_with += /obj/item/weapon/storage/backpack/satchel/norm + return ..() diff --git a/maps/tether/submaps/aerostat/aerostat.dmm b/maps/tether/submaps/aerostat/aerostat.dmm index 35a979ccf6..0e58d82cb0 100644 --- a/maps/tether/submaps/aerostat/aerostat.dmm +++ b/maps/tether/submaps/aerostat/aerostat.dmm @@ -5166,13 +5166,13 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv aw aw aw @@ -5302,19 +5302,19 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw aw aw @@ -5443,13 +5443,13 @@ aw aw aw aw -aw -aw -aw -aw -aw -aw -aw +cv +cv +cv +cv +cv +cv +cv cv cv cv @@ -5585,20 +5585,20 @@ aw aw aw aw +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv +cv aw -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv -cv aw aw aw @@ -5739,7 +5739,7 @@ cv cv cv cv -cv +aw aw aw aw @@ -6023,7 +6023,7 @@ cv cv cv cv -aw +cv aw aw aw @@ -6308,7 +6308,7 @@ cv cv cv cv -aw +cv aw aw aw diff --git a/maps/tether/submaps/alienship/alienship.dmm b/maps/tether/submaps/alienship/alienship.dmm index 238fc5d3ff..5ae6662727 100644 --- a/maps/tether/submaps/alienship/alienship.dmm +++ b/maps/tether/submaps/alienship/alienship.dmm @@ -7901,7 +7901,7 @@ af af ae ae -ac +ae ag ag ar @@ -9164,18 +9164,18 @@ ac ac ab ab -aa -aa -aa -aa ac -af ac -aa -aa -aa -aa -ab +ac +ac +ag +ak +ag +ac +ac +ac +ac +ac ab ac ac @@ -9305,20 +9305,20 @@ ac ac ab ab -aa ac ac +af +af +af +af +af +af +af +af +af +af ac ac -ag -ak -ag -ac -ac -ac -ac -ac -ab ab ac ac @@ -9446,23 +9446,23 @@ ac ac ab ab -aa ac ac af af -af -af -af -af -af -af +aE +aE +aE +aE +aE +aE +aE +aE af af ac ac ab -ab ac ac ae @@ -9587,7 +9587,6 @@ ac ac ab ab -aa ac ac af @@ -9600,12 +9599,13 @@ ae ae ae ae -af -af +ae +aE +uA +uA ac ac ab -ab ac ac ac @@ -9728,7 +9728,6 @@ ac ab ab ab -aa ac ac af @@ -9738,14 +9737,15 @@ ae ae ae ae -ae -ae -ae -ae -ae -uA -uA -ac +ah +ah +ah +ah +ah +ah +DW +af +aR ac ab ab @@ -9869,24 +9869,24 @@ ab ab ab aa -aa ac ac af af -ae -ae -ae -ae -ae ah ah ah ah ah ah -DW -af +ah +ah +ah +ah +ah +ah +ah +aE aR ac aa @@ -10012,7 +10012,6 @@ aa aa aa ac -ac af af ah @@ -10028,6 +10027,7 @@ ah ah ah ah +ah aE aR ac @@ -10155,7 +10155,7 @@ aa aa ac af -af +ae ah ah ah @@ -10723,7 +10723,7 @@ aa aa ac af -af +ae ah ah ah @@ -10864,7 +10864,6 @@ aa aa aa ac -ac af af ah @@ -10880,6 +10879,7 @@ ah ah ah ah +ah aE aR ac @@ -11005,24 +11005,24 @@ ab ab ab aa -aa ac ac af af +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ae -ae -ae -ae -ae -ah -ah -ah -ah -ah -ah -ah -af aR ac aa @@ -11148,7 +11148,6 @@ ac ab ab ab -aa ac ac af @@ -11158,14 +11157,15 @@ ae ae ae ae -ae -ae -ae -ae -ae +ah +ah +ah +ah +ah +ah +ah af -af -ac +aR ac ab ab @@ -11291,7 +11291,6 @@ ac ac ab ab -aa ac ac af @@ -11304,12 +11303,13 @@ ae ae ae ae +ae +ae af af ac ac ab -ab ac ac ac @@ -11434,23 +11434,23 @@ ac ac ab ab -aa ac ac af af +ae +ae +ae +ae +ae +ae +ae +ae af af -af -af -af -af -af -uA ac ac ab -ab ac ac ae @@ -11577,20 +11577,20 @@ ac ac ab ab -aa ac ac +af +af +af +af +af +af +af +af +af +uA ac ac -ag -aj -ag -ac -ac -ac -ac -ac -ab ab ac ac @@ -11720,18 +11720,18 @@ ac ac ab ab -aa -aa -aa -aa ac -af ac -aa -aa -aa -aa -ab +ac +ac +ag +aj +ag +ac +ac +ac +ac +ac ab ac ac diff --git a/maps/tether/submaps/beach/beach.dmm b/maps/tether/submaps/beach/beach.dmm index 704b01ea26..62e4c7df1e 100644 --- a/maps/tether/submaps/beach/beach.dmm +++ b/maps/tether/submaps/beach/beach.dmm @@ -8480,13 +8480,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm aa aa aa @@ -8616,12 +8616,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm bm bm bm @@ -8757,7 +8757,7 @@ aa aa aa aa -aa +bm bm bm bm @@ -9609,7 +9609,7 @@ aa aa aa aa -aa +bm bm bm bm @@ -9752,12 +9752,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm bm bm bm @@ -9900,13 +9900,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +bm +bm +bm +bm +bm +bm +bm aa aa aa diff --git a/maps/tether/submaps/tether_ships.dmm b/maps/tether/submaps/tether_ships.dmm index 898c877134..1a851d273a 100644 --- a/maps/tether/submaps/tether_ships.dmm +++ b/maps/tether/submaps/tether_ships.dmm @@ -3807,15 +3807,15 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO +eO +eO +eO gU gU gU @@ -3833,15 +3833,15 @@ et et et et -et -et -et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj +hj +hj +hj et et et @@ -3859,15 +3859,15 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz +hz +hz +hz hp hp hp @@ -3943,148 +3943,6 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -eO -eO -eO -eO -eO -eO -eO -eO -eO -gU -gU -gU -dQ -aa -gV -et -et -et -et -et -et -et -et -et -et -et -hj -hj -hj -hj -hj -hj -hj -hj -hj -et -et -et -gV -dJ -ht -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hp -hz -hz -hz -hz -hz -hz -hz -hz -hz -hp -hp -hp -ht -aa -"} -(9,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dQ -gU -gU -gU -gU -gU eO eO eO @@ -4158,6 +4016,148 @@ hp ht aa "} +(9,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +dQ +gU +gU +gU +gU +eU +eJ +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +hd +eO +gU +gU +gU +dQ +aa +gV +et +et +et +et +hg +hg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +fg +hj +et +et +et +gV +dJ +ht +hp +hp +hp +hp +hz +hy +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hq +hz +hp +hp +hp +ht +aa +"} (10,1,1) = {" aa aa @@ -4227,7 +4227,7 @@ gU gU gU eO -eJ +hd hd hd hd @@ -4253,7 +4253,7 @@ et et et hj -hg +fg fg fg fg @@ -4279,7 +4279,7 @@ hp hp hp hz -hy +hq hq hq hq @@ -5079,7 +5079,7 @@ gU gU gU eU -eU +hd hd hd hd @@ -5105,7 +5105,7 @@ et et et hm -hm +fg fg fg fg @@ -5131,7 +5131,7 @@ hp hp hp hB -hB +hq hq hq hq @@ -5220,14 +5220,14 @@ gU gU gU gU -gU -eO -eO -eO -eO -eO -eO eU +eU +hd +hd +hd +hd +hd +hd hd hd hd @@ -5246,13 +5246,7 @@ et et et et -et -hj -hj -hj -hj -hj -hj +hg hm fg fg @@ -5261,6 +5255,12 @@ fg fg fg fg +fg +fg +fg +fg +fg +fg hj et et @@ -5272,14 +5272,14 @@ hp hp hp hp -hp -hz -hz -hz -hz -hz -hz hB +hB +hq +hq +hq +hq +hq +hq hq hq hq @@ -5363,20 +5363,20 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -eO -eO eO eO eO eO eO eO +eU +hd +hd +hd +hd +hd +hd +hd eO gU gU @@ -5389,20 +5389,20 @@ et et et et -et -et -et -et -et -et -hj -hj hj hj hj hj hj hj +hm +fg +fg +fg +fg +fg +fg +fg hj et et @@ -5415,20 +5415,20 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp -hz -hz hz hz hz hz hz hz +hB +hq +hq +hq +hq +hq +hq +hq hz hp hp @@ -5511,15 +5511,15 @@ gU gU gU gU -gU -gU -gU -gU -gU -gU -gU -gU -gU +eO +eO +eO +eO +eO +eO +eO +eO +eO gU gU gU @@ -5537,15 +5537,15 @@ et et et et -et -et -et -et -et -et -et -et -et +hj +hj +hj +hj +hj +hj +hj +hj +hj et et et @@ -5563,15 +5563,15 @@ hp hp hp hp -hp -hp -hp -hp -hp -hp -hp -hp -hp +hz +hz +hz +hz +hz +hz +hz +hz +hz hp hp hp @@ -7241,15 +7241,15 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho +ho +ho +ho hc hc hc @@ -7267,15 +7267,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD +hD +hD +hD aa aa aa @@ -7377,148 +7377,6 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -ho -ho -ho -ho -ho -ho -ho -ho -ho -hc -hc -hc -gO -dJ -hu -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -hD -hD -hD -hD -hD -hD -hD -hD -hD -aa -aa -aa -hu -aa -"} -(33,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dJ -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -dJ -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -gO -hc -hc -hc -hc -hc ho ho ho @@ -7566,6 +7424,148 @@ aa hu aa "} +(33,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +dJ +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +dJ +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +gO +hc +hc +hc +hc +hr +hn +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +ho +hc +hc +hc +gO +dJ +hu +aa +aa +aa +aa +hD +hC +he +he +he +he +he +he +he +he +he +he +he +he +he +hD +aa +aa +aa +hu +aa +"} (34,1,1) = {" aa aa @@ -7661,7 +7661,7 @@ hc hc hc ho -hn +gP gP gP gP @@ -7687,7 +7687,7 @@ aa aa aa hD -hC +he he he he @@ -8513,7 +8513,7 @@ hc hc hc hr -hr +gP gP gP gP @@ -8539,7 +8539,7 @@ aa aa aa hF -hF +he he he he @@ -8654,14 +8654,14 @@ hc hc hc hc -hc -ho -ho -ho -ho -ho -ho hr +hr +gP +gP +gP +gP +gP +gP gP gP gP @@ -8680,12 +8680,6 @@ aa aa aa aa -aa -hD -hD -hD -hD -hD hD hF he @@ -8695,6 +8689,12 @@ he he he he +he +he +he +he +he +he hD aa aa @@ -8797,20 +8797,20 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -ho -ho ho ho ho ho ho ho +hr +gP +gP +gP +gP +gP +gP +gP ho hc hc @@ -8823,20 +8823,20 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -hD -hD hD hD hD hD hD hD +hF +he +he +he +he +he +he +he hD aa aa @@ -8945,15 +8945,15 @@ hc hc hc hc -hc -hc -hc -hc -hc -hc -hc -hc -hc +ho +ho +ho +ho +ho +ho +ho +ho +ho hc hc hc @@ -8971,15 +8971,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +hD +hD +hD +hD +hD +hD +hD +hD +hD aa aa aa diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 912315450e..7e9712f850 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -96,14 +96,6 @@ "aaq" = ( /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/excursion/tether) -"aar" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/excursion/tether) "aas" = ( /obj/machinery/power/smes/buildable{ charge = 2e+006; @@ -168,20 +160,6 @@ }, /turf/simulated/floor, /area/engineering/engine_smes) -"aaB" = ( -/obj/structure/table/steel, -/obj/structure/closet/walllocker/emerglocker{ - pixel_y = 32 - }, -/obj/item/device/radio/intercom{ - pixel_y = -24 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/head/pilot, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) "aaC" = ( /obj/machinery/power/grid_checker, /obj/structure/cable{ @@ -197,22 +175,6 @@ "aaD" = ( /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"aaE" = ( -/obj/structure/table/steel, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/clothing/head/pilot, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) -"aaF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/excursion/tether) "aaG" = ( /obj/machinery/power/smes/buildable{ charge = 2e+007; @@ -347,11 +309,6 @@ "aaT" = ( /turf/simulated/wall, /area/hallway/station/atrium) -"aaU" = ( -/turf/simulated/floor/reinforced, -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) "aaV" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/engi_wash) @@ -373,10 +330,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) -"aaY" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/shuttle/floor/darkred, -/area/shuttle/excursion/tether) "aaZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -384,6 +337,19 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) +"aba" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/head/helmet/space/void/pilot, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/pilot, +/obj/item/clothing/head/helmet/space/void/pilot, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) "abb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -471,6 +437,20 @@ "abk" = ( /turf/simulated/floor/reinforced, /area/engineering/engine_room) +"abl" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/excursion_dock) "abm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -498,9 +478,11 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "abp" = ( -/obj/machinery/space_heater, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/shuttle/floor/darkred, +/obj/machinery/shuttle_sensor{ + dir = 6; + id_tag = "shuttlesens_exp_int" + }, +/turf/simulated/shuttle/wall/voidcraft, /area/shuttle/excursion/tether) "abr" = ( /obj/structure/cable/cyan{ @@ -827,6 +809,20 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"abU" = ( +/obj/machinery/camera/network/northern_star, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/station/excursion_dock) +"abV" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central1{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monofloor, +/area/tether/station/excursion_dock) "abW" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -863,6 +859,12 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"acc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "acd" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; @@ -1060,6 +1062,23 @@ "acL" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_smes) +"acN" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "acO" = ( /obj/machinery/power/smes/buildable{ charge = 0; @@ -1075,6 +1094,50 @@ }, /turf/simulated/floor, /area/maintenance/substation/engineering) +"acP" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + autoclose = 1; + dir = 2; + id_tag = null; + name = "Exploration Prep"; + req_access = list(); + req_one_access = list(19,43,67) + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/monofloor, +/area/tether/station/excursion_dock) +"acQ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "acR" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -1095,6 +1158,23 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/grass, /area/hallway/station/atrium) +"acV" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/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/tether/station/explorer_prep) "acW" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -1192,6 +1272,20 @@ /obj/random/drinkbottle, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"adj" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/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/tether/station/explorer_prep) "adk" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ @@ -1264,6 +1358,20 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"adr" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "ads" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -1472,6 +1580,32 @@ /obj/structure/railing, /turf/simulated/floor/water/pool, /area/hallway/station/atrium) +"adN" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) +"adO" = ( +/obj/machinery/photocopier, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) +"adP" = ( +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/turf/simulated/floor/tiled, +/area/tether/station/excursion_dock) "adQ" = ( /obj/machinery/computer/power_monitor{ dir = 4; @@ -1562,6 +1696,15 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"aed" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, +/obj/structure/table/standard, +/obj/item/device/multitool/tether_buffered, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "aef" = ( /obj/random/junk, /obj/random/trash, @@ -1584,9 +1727,56 @@ "aei" = ( /turf/simulated/wall/r_wall, /area/mine/explored/upper_level) +"aej" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/excursion/tether) +"aem" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/space_heater, +/turf/simulated/shuttle/floor/darkred, +/area/shuttle/excursion/tether) "aen" = ( /turf/simulated/floor/tiled, /area/engineering/workshop) +"aeo" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + icon_state = "door_locked"; + id_tag = "expshuttle_door_L"; + locked = 1 + }, +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + dir = 1; + icon_state = "doorctrl0"; + id = "expshuttle_door_L"; + name = "hatch bolt control"; + pixel_y = -28; + req_one_access = list(19,43,67); + specialfunctions = 4 + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) +"aep" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + frequency = 1380; + id_tag = "expshuttle_door_Ro" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 6; + frequency = 1380; + id_tag = "expshuttle_exterior_sensor"; + master_tag = "expshuttle_docker"; + pixel_x = 4; + pixel_y = 28 + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) "aeq" = ( /turf/simulated/shuttle/wall/voidcraft/green{ hard_corner = 1 @@ -1652,6 +1842,22 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"aeu" = ( +/obj/machinery/shuttle_sensor{ + dir = 5; + id_tag = "shuttlesens_exp" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/excursion/tether) +"aev" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft, +/area/shuttle/excursion/tether) "aew" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -1678,6 +1884,28 @@ }, /turf/simulated/floor, /area/engineering/engine_monitoring) +"aex" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1380; + id_tag = "expshuttle_docker_pump_out_internal" + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) +"aey" = ( +/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/monofloor, +/area/tether/station/excursion_dock) "aez" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -1711,6 +1939,20 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_monitoring) +"aeB" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/suit_cycler/explorer, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "aeC" = ( /obj/structure/cable/green{ d1 = 2; @@ -1803,6 +2045,12 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"aeH" = ( +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) "aeJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/machinery/light{ @@ -1941,6 +2189,62 @@ icon_state = "techmaint" }, /area/engineering/storage) +"aeY" = ( +/obj/machinery/light{ + dir = 1 + }, +/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/shuttle/floor/black, +/area/shuttle/excursion/tether) +"afa" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/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 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/excursion_dock) +"afc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "afd" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -1951,6 +2255,20 @@ }, /turf/simulated/floor/tiled, /area/tether/station/excursion_dock) +"afe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/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/tether/station/pathfinder_office) "aff" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -2120,6 +2438,23 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"afH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) +"afI" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/excursion/tether) "afJ" = ( /obj/machinery/vending/snack, /obj/machinery/light{ @@ -2193,6 +2528,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"afR" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_meeting) "afS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2205,6 +2544,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/engine_monitoring) +"afT" = ( +/obj/structure/table/woodentable, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/purple/border{ + icon_state = "bordercolor"; + dir = 4 + }, +/obj/item/device/camera, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_meeting) "afU" = ( /obj/structure/window/reinforced{ dir = 1 @@ -2212,6 +2563,11 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/simulated/floor/tiled, /area/engineering/workshop) +"afV" = ( +/turf/simulated/floor/reinforced, +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "afX" = ( /obj/structure/cable/green{ d1 = 1; @@ -2313,15 +2669,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"agu" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/turf/simulated/shuttle/plating, -/area/shuttle/excursion/tether) "agx" = ( /obj/structure/bed/chair/comfy/blue{ icon_state = "comfychair_preview"; @@ -3115,28 +3462,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"aji" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 10 - }, -/obj/machinery/camera/network/northern_star, -/turf/simulated/floor/tiled, -/area/tether/station/excursion_dock) -"ajj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"ajk" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central1{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/monofloor{ - dir = 1 - }, -/area/tether/station/excursion_dock) "ajl" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/storage/backpack/parachute{ @@ -3334,132 +3659,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"ajT" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/excursion_dock) -"ajU" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/tether/station/excursion_dock) -"ajV" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"ajW" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; - dir = 2; - id_tag = null; - name = "Exploration Prep"; - req_access = list(); - req_one_access = list(19,43,67) - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central1, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/monofloor, -/area/tether/station/excursion_dock) -"ajX" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"ajY" = ( -/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 = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"ajZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"aka" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/structure/table/standard, -/obj/item/device/multitool/tether_buffered, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) "ake" = ( /obj/structure/cable/green{ d1 = 1; @@ -3580,14 +3779,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/excursion_dock) -"akH" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/turf/simulated/floor/tiled, -/area/tether/station/excursion_dock) "akI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3600,29 +3791,9 @@ dir = 1 }, /area/tether/station/excursion_dock) -"akJ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) "akL" = ( /turf/simulated/floor/tiled, /area/tether/station/explorer_prep) -"akM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"akN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) "akO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -3729,30 +3900,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"ali" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 9 - }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - frequency = 1380; - id_tag = "expshuttle_docker"; - pixel_y = 26; - req_one_access = list(19,43,67); - tag_airpump = "expshuttle_vent"; - tag_chamber_sensor = "expshuttle_sensor"; - tag_exterior_door = "expshuttle_door_Ro"; - tag_exterior_sensor = "expshuttle_exterior_sensor"; - tag_interior_door = "expshuttle_door_Ri" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) "alk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -3770,35 +3917,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"alm" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - icon_state = "extinguisher_closed"; - pixel_x = 30 - }, -/turf/simulated/floor/tiled, -/area/tether/station/excursion_dock) -"aln" = ( -/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/monofloor, -/area/tether/station/excursion_dock) -"alp" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) "alr" = ( /obj/machinery/computer/station_alert{ dir = 1 @@ -3825,12 +3943,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/engineering/engineering_monitoring) -"alu" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) "alv" = ( /turf/simulated/wall/r_wall, /area/engineering/engineering_monitoring) @@ -4159,24 +4271,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"amD" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - icon_state = "door_locked"; - id_tag = "expshuttle_door_L"; - locked = 1 - }, -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - dir = 1; - icon_state = "doorctrl0"; - id = "expshuttle_door_L"; - name = "hatch bolt control"; - pixel_y = -28; - req_one_access = list(19,43,67); - specialfunctions = 4 - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) "amE" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/plating, @@ -4223,24 +4317,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"amK" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ro" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6; - frequency = 1380; - id_tag = "expshuttle_exterior_sensor"; - master_tag = "expshuttle_docker"; - pixel_x = 4; - pixel_y = 28 - }, -/turf/simulated/shuttle/floor/black, -/area/shuttle/excursion/tether) "amL" = ( /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; @@ -4711,16 +4787,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"aoc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monotile, -/area/tether/station/excursion_dock) "aoe" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 @@ -5068,16 +5134,6 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"apk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/turf/simulated/shuttle/floor/darkred, -/area/shuttle/excursion/tether) "apn" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -5165,6 +5221,25 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/backup) +"apt" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "expshuttle_docker"; + pixel_y = 26; + req_one_access = list(19,43,67); + tag_airpump = "expshuttle_vent"; + tag_chamber_sensor = "expshuttle_sensor"; + tag_exterior_door = "expshuttle_door_Ro"; + tag_exterior_sensor = "expshuttle_exterior_sensor"; + tag_interior_door = "expshuttle_door_Ri" + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) "apu" = ( /obj/structure/cable/green{ d1 = 4; @@ -7598,6 +7673,14 @@ /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) +"awf" = ( +/obj/structure/table/bench/wooden, +/obj/effect/landmark/start{ + name = "Explorer" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "awi" = ( /obj/machinery/door/airlock/glass{ name = "Shuttle Bay" @@ -20872,34 +20955,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"bQJ" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"bQK" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/item/clothing/suit/space/void/explorer, -/obj/item/clothing/head/helmet/space/void/explorer, -/turf/simulated/floor/tiled/monotile, -/area/tether/station/explorer_prep) "bQM" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -20915,36 +20970,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_prep) -"bQR" = ( -/obj/structure/table/bench/wooden, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"bQS" = ( -/obj/structure/table/bench/wooden, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) -"bQT" = ( -/obj/machinery/door/window/brigdoor/westleft{ - req_access = list(); - req_one_access = list(19,43,67) - }, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) "bSN" = ( /obj/structure/flora/pottedplant, /turf/simulated/floor/carpet, @@ -21403,12 +21428,26 @@ /obj/machinery/meter, /turf/simulated/shuttle/floor/darkred, /area/shuttle/excursion/tether) -"deW" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 10 +"dkC" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/excursion/tether) +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) +"dlk" = ( +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "dvn" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -21435,6 +21474,14 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/hallway/station/atrium) +"dDZ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "dMN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -21460,6 +21507,21 @@ /obj/machinery/photocopier, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"dYE" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/structure/window/reinforced/polarized, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) "edg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -21470,6 +21532,25 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"ekp" = ( +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/pathfinder_office) "epz" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -21520,6 +21601,33 @@ /obj/item/device/universal_translator, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"fmN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/excursion_dock) +"fpA" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "fsu" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -21564,20 +21672,14 @@ }, /turf/simulated/floor/plating, /area/tether/station/explorer_meeting) -"grh" = ( -/obj/machinery/alarm{ - frequency = 1441; - pixel_y = 22 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/purple/border{ - icon_state = "bordercolor"; - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_meeting) +"gUt" = ( +/obj/structure/table/steel, +/obj/item/clothing/head/pilot, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) +"hCe" = ( +/turf/simulated/wall/r_wall, +/area/tether/station/pathfinder_office) "hJg" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -21586,10 +21688,14 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"irt" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_meeting) +"ibX" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/shuttle/plating, +/area/shuttle/excursion/tether) "ixk" = ( /obj/structure/table/woodentable, /obj/machinery/photocopier/faxmachine{ @@ -21604,9 +21710,36 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"jjb" = ( -/turf/simulated/mineral/vacuum, -/area/tether/station/explorer_meeting) +"jcG" = ( +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(); + req_one_access = list(19,43,67) + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) +"jdD" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 + }, +/turf/simulated/floor/tiled, +/area/tether/station/excursion_dock) +"jki" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Pathfinder" + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "jop" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, @@ -21636,30 +21769,41 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"jKX" = ( -/obj/structure/table/woodentable, -/obj/item/device/camera, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +"jZN" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" }, -/obj/effect/floor_decal/corner/purple/border{ - icon_state = "bordercolor"; - dir = 4 +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "hop_office" }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_meeting) -"jZJ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) +"kZI" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/structure/closet/secure_closet/guncabinet/excursion, /turf/simulated/floor/tiled, /area/tether/station/explorer_prep) "lue" = ( @@ -21757,6 +21901,12 @@ /obj/machinery/vending/cola, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"mcB" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "mtd" = ( /obj/structure/table/woodentable, /obj/item/weapon/folder/yellow, @@ -21815,6 +21965,14 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"mSH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/shuttle/plating, +/area/shuttle/excursion/tether) "nks" = ( /obj/structure/bed/chair/office/dark, /obj/structure/cable/green{ @@ -21867,6 +22025,33 @@ }, /turf/simulated/shuttle/plating, /area/shuttle/excursion/tether) +"nYc" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "hop_office" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) +"nYp" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/closet/secure_closet/guncabinet/excursion, +/turf/simulated/shuttle/floor/darkred, +/area/shuttle/excursion/tether) "nYM" = ( /turf/simulated/wall/r_wall, /area/tether/station/explorer_meeting) @@ -21883,6 +22068,14 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"oeg" = ( +/obj/structure/table/bench/wooden, +/obj/effect/landmark/start{ + name = "Explorer" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "oEH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -21899,14 +22092,37 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/excursion/tether) -"poz" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 +"prz" = ( +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/explorer_prep) +"pAD" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/weapon/pen, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/tether/station/explorer_prep) +/area/tether/station/pathfinder_office) "pHd" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -21917,16 +22133,31 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"pZL" = ( -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp" +"pIq" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/purple/border, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ +/turf/simulated/floor/tiled, +/area/tether/station/explorer_meeting) +"pYE" = ( +/obj/structure/closet/secure_closet/pathfinder, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/excursion/tether) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "qgR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21955,6 +22186,28 @@ /obj/machinery/washing_machine, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"qIf" = ( +/obj/structure/table/rack/shelf, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/turf/simulated/shuttle/floor/black, +/area/shuttle/excursion/tether) +"qSW" = ( +/obj/structure/table/woodentable, +/obj/machinery/button/windowtint{ + id = "pathfinder_office"; + pixel_x = 26; + pixel_y = -26 + }, +/obj/item/device/binoculars, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "rhA" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/industrial/danger, @@ -21988,6 +22241,24 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) +"sqC" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "hop_office" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) "sSn" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -22017,6 +22288,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"tpZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "twv" = ( /obj/machinery/shuttle_sensor{ dir = 2; @@ -22050,31 +22337,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals9, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) -"tAc" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/suit/space/void/explorer, -/obj/item/clothing/head/helmet/space/void/explorer, -/turf/simulated/floor/tiled/monotile, -/area/tether/station/explorer_prep) -"tCn" = ( -/obj/machinery/shuttle_sensor{ - dir = 6; - id_tag = "shuttlesens_exp_int" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/excursion/tether) "tEu" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -22084,6 +22346,12 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"tIi" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 + }, +/turf/simulated/shuttle/floor/darkred, +/area/shuttle/excursion/tether) "tNS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -22102,6 +22370,41 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/tether/station/explorer_prep) +"ugj" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green, +/obj/structure/window/reinforced/polarized, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) +"uoG" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "uzS" = ( /obj/structure/table/woodentable, /obj/item/weapon/folder/blue, @@ -22140,6 +22443,64 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) +"vEZ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/structure/window/reinforced/polarized, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) +"vQL" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/research{ + name = "Pathfinder's Office"; + req_access = list(43); + req_one_access = list(43) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) +"vUd" = ( +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/explorer_prep) "vUO" = ( /obj/machinery/light{ dir = 8; @@ -22163,6 +22524,30 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) +"wcD" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/turf/simulated/shuttle/plating, +/area/shuttle/excursion/tether) +"weM" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "wmC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, @@ -22220,6 +22605,25 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/explorer_meeting) +"wZn" = ( +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) +"xcY" = ( +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) "xhk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -22247,12 +22651,9 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/tether/station/excursion_dock) -"xxc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/excursion/tether) +"ygn" = ( +/turf/simulated/floor/tiled, +/area/tether/station/pathfinder_office) (1,1,1) = {" aaa @@ -25611,13 +26012,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25747,19 +26148,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa aaa aaa @@ -25888,13 +26289,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp ayp ayp ayp @@ -26030,20 +26431,20 @@ aaa aaa aaa aaa +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp +ayp aaa -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp -ayp aaa aaa aaa @@ -26184,7 +26585,7 @@ ayp ayp ayp ayp -ayp +aaa aaa aaa aaa @@ -26468,7 +26869,7 @@ ayp ayp ayp ayp -aaa +ayp aaa aaa aaa @@ -26753,7 +27154,7 @@ ayp ayp ayp ayp -aaa +ayp cch cch cch @@ -33233,13 +33634,13 @@ aap aap aap aap -aap -aap -aap -aap -aap -aap -aap +aaq +abp +aeo +aaq +aaq +aau +afV avK avN aad @@ -33369,19 +33770,19 @@ aat aad aal aap -aap -aap -aap -aap -aap -aap aaq -tCn -amD +wcD +aaq +wcD aaq aaq -aau -aaU +aaq +nYp +amF +avG +adB +aaq +afV avK avN aad @@ -33510,20 +33911,20 @@ aat aat aad aal -aap aaq -agu +aau +aba aaq -agu +adJ +ajc +abK aaq -aaq -aaq -abp +aem amF avG adB aaq -aaU +afV avK auH aad @@ -33652,15 +34053,15 @@ aat aat aad aal +ibX +gUt +aeH aaq -aau -aaB +qIf +aaD +auT aaq -adJ -ajc -abK -aaq -aaY +adA amF axK aau @@ -33794,16 +34195,16 @@ aat aat aad aal -aar +ibX aav agx aaJ aaM aaD -auT +ajP aaJ -adA -amF +alg +amG avG aph aap @@ -33936,7 +34337,7 @@ aat aat aad aal -aar +ibX aaw aaD aaK @@ -33944,8 +34345,8 @@ aaD aaD aaD aaK -alg -amG +aaD +aaD avG aaD aap @@ -34078,7 +34479,7 @@ aat aat aad aal -aar +ibX aax agx aaJ @@ -34220,18 +34621,18 @@ aat aat aad aal -aaq -aau -aaE +ibX +gUt +aaD twv aaM -ajf +aaD ajP aaq -ali +aex amI anX -apk +afI oVP aap gcH @@ -34362,20 +34763,20 @@ aat aat aad aal -aap aaq -aaF +aau +aeY aaq -aaF +aaM +ajf +ajP aaq +apt +aaD +avG +tIi aaq -aaq -alk -amL -aob -dbI -aaq -aaU +afV avK auQ aad @@ -34505,19 +34906,19 @@ aat aad aal aap -aap -aap -aap -aap -aap -aap aaq -deW -amK -pZL -xxc -aau -aaU +mSH +aaq +mSH +aaq +aaq +aaq +alk +amL +aob +dbI +aaq +afV avK qgR aad @@ -34653,13 +35054,13 @@ aap aap aap aap -aap -aap -aap -aap -aap -aap -aap +aaq +aej +aep +aeu +aev +aau +afV avK qgR aad @@ -34936,11 +35337,11 @@ aaI aaZ aiu abd -ajU +abl akI -aln +aey amS -aoc +afa apn aqd arw @@ -35077,12 +35478,12 @@ aah aah abc aad -aji -ajT -akH -alm +abU +acN +jdD +adP amP -aah +fmN aad soc nxL @@ -35219,12 +35620,12 @@ aad aad aad aad -ajk -ajW -aad +abV +acP aad aad aad +vQL aad aad aTU @@ -35358,17 +35759,17 @@ aaa aac aac aac -aac -aiv +aad ajl -ajj -ajV -akJ -akL -akL -alp +dkC +acc +acQ amU aiv +xcY +afc +wZn +nYM oaO wFb vUO @@ -35500,17 +35901,17 @@ aaa aac aac aac -aac -aiv -ajn +aad +ajl akL -ajY -akM -akM -bQR -alu +oeg +acV amU aiv +adO +afe +mcB +nYM fsu sbI sZd @@ -35642,17 +36043,17 @@ aaa aaa aaa aac -aac -aiv +aad nOF akL -ajX -akL -akL bQQ -alu +adj amU -aiv +jZN +dDZ +tpZ +dDZ +ugj uDP nks uzS @@ -35784,18 +36185,18 @@ aaa aaa aaa aaa -aac -aiv +aad eAe akL -ajX -akL -akL bQQ -alu +adj amU -aiv -grh +nYc +ygn +fpA +pAD +vEZ +uDP mId wrg flX @@ -35926,21 +36327,21 @@ aaa aaa aaa aaa -aac -aiv +aad ajn akL -ajZ -akN -akN -bQS -alu +awf +adr amW -aiv +sqC +ygn +jki +qSW +dYE uDP nks mtd -irt +afR lNs jop ash @@ -36068,23 +36469,23 @@ aaa aaa aaa aaa -aaa -aiv +aad ajo -poz -aka -akL -akL -akL akL +aed +afH amW -aiv +hCe +pYE +dlk +ekp +nYM nma lue hJg mtd tEu -wmC +pIq ash amg amg @@ -36210,17 +36611,17 @@ aaa aaa aaa aaa -aaa -aiv -aiv -aiv -aiv -bQJ -bQT -bQJ -bQJ -bQJ -aiv +aad +uoG +jcG +weM +kZI +adN +hCe +hCe +hCe +hCe +nYM jDS wLj cNq @@ -36352,16 +36753,16 @@ aaa aaa aaa aaa -aaa -aac -aac -aac aiv -bQK -bQK -tAc +prz +prz +vUd tWI -jZJ +aeB +aiv +aac +aac +aac nYM uDP mFo @@ -36494,22 +36895,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aiv +aiv +aiv +aiv +aiv +aiv +aiv +aac +aac aac -aiv -aiv -aiv -aiv -aiv -aiv nYM qzk dMN mcn dPZ -jKX +afT ixk ash amg @@ -36645,7 +37046,7 @@ aac aac aac aac -jjb +aac nYM dvn ggi @@ -37334,13 +37735,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa aaa @@ -37470,12 +37871,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf aaf aaf aaf @@ -37611,7 +38012,7 @@ aaa aaa aaa aaa -aaa +aaf aaf aaf aaf @@ -38463,7 +38864,7 @@ aaa aaa aaa aaa -aaa +aaf aaf aaf aaf @@ -38606,12 +39007,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf aaf aaf aaf @@ -38754,13 +39155,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa aaa diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index 870ad1e6ad..910b8d8e66 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -447,6 +447,9 @@ /area/tether/station/explorer_meeting name = "\improper Explorer Meeting Room" +/area/tether/station/pathfinder_office + name = "\improper Pathfinder's Office" + /area/shuttle/excursion name = "\improper Excursion Shuttle" icon_state = "shuttle2" diff --git a/vorestation.dme b/vorestation.dme index 923b29fe1f..87913d51b3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1112,6 +1112,7 @@ #include "code\game\objects\items\weapons\material\gravemarker.dm" #include "code\game\objects\items\weapons\material\kitchen.dm" #include "code\game\objects\items\weapons\material\knives.dm" +#include "code\game\objects\items\weapons\material\knives_vr.dm" #include "code\game\objects\items\weapons\material\material_armor.dm" #include "code\game\objects\items\weapons\material\material_weapons.dm" #include "code\game\objects\items\weapons\material\misc.dm" @@ -1129,6 +1130,7 @@ #include "code\game\objects\items\weapons\storage\belt.dm" #include "code\game\objects\items\weapons\storage\bible.dm" #include "code\game\objects\items\weapons\storage\boxes.dm" +#include "code\game\objects\items\weapons\storage\boxes_vr.dm" #include "code\game\objects\items\weapons\storage\briefcase.dm" #include "code\game\objects\items\weapons\storage\fancy.dm" #include "code\game\objects\items\weapons\storage\firstaid.dm" @@ -1573,6 +1575,7 @@ #include "code\modules\clothing\spacesuits\void\merc.dm" #include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\station.dm" +#include "code\modules\clothing\spacesuits\void\station_vr.dm" #include "code\modules\clothing\spacesuits\void\void.dm" #include "code\modules\clothing\spacesuits\void\void_vr.dm" #include "code\modules\clothing\spacesuits\void\wizard.dm" @@ -2876,16 +2879,21 @@ #include "maps\RandomZLevels\snowfield.dm" #include "maps\RandomZLevels\zoo.dm" #include "maps\southern_cross\southern_cross_jobs.dm" +#include "maps\southern_cross\southern_cross_jobs_vr.dm" #include "maps\southern_cross\items\encryptionkey_sc.dm" +#include "maps\southern_cross\items\encryptionkey_vr.dm" #include "maps\southern_cross\items\headset_sc.dm" +#include "maps\southern_cross\items\headset_vr.dm" #include "maps\southern_cross\items\clothing\sc_accessory.dm" #include "maps\southern_cross\items\clothing\sc_suit.dm" #include "maps\southern_cross\items\clothing\sc_under.dm" #include "maps\southern_cross\job\outfits.dm" +#include "maps\southern_cross\job\outfits_vr.dm" #include "maps\southern_cross\loadout\loadout_head.dm" #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\structures\closets\misc.dm" +#include "maps\southern_cross\structures\closets\misc_vr.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm" #include "maps\submaps\engine_submaps\engine_areas.dm"