diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 513154dafd..f879164ca1 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -510,7 +510,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 4efee5e4e3..8e50e1d536 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 @@ -132,12 +131,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, @@ -146,8 +144,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 @@ -178,7 +175,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 cc258e42cb..621b1555d5 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..8a248c4ddc 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 = access_eva /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 bbe8fc094a..e8549769da 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 = access_eva /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" @@ -52,7 +52,7 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth mining voidsuit crate" access = access_mining - + /datum/supply_pack/voidsuits/com_anomaly name = "Commonwealth anomaly suit" contains = list( @@ -63,7 +63,7 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth anomaly suit crate" access = access_xenoarch - + /datum/supply_pack/voidsuits/com_riot name = "Commonwealth riot voidsuit" contains = list( @@ -74,7 +74,7 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth riot voidsuit crate" access = access_brig - + /datum/supply_pack/voidsuits/com_pilot name = "Commonwealth pilot voidsuit" contains = list( @@ -85,7 +85,7 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth pilot voidsuit crate" access = access_pilot - + /datum/supply_pack/voidsuits/com_medical name = "Commonwealth medical voidsuit" contains = list( @@ -105,8 +105,8 @@ cost = 150 containertype = /obj/structure/closet/crate/secure name = "Commonwealth exploration voidsuit crate" - access = access_explorer - + access = access_eva + /datum/supply_pack/voidsuits/com_engineer name = "Commonwealth engineering voidsuit" contains = list( @@ -117,7 +117,7 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth engineering voidsuit crate" access = access_engine - + /datum/supply_pack/voidsuits/com_atmos name = "Commonwealth atmos voidsuit" contains = list( @@ -128,7 +128,7 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth atmos voidsuit crate" access = access_atmospherics - + /datum/supply_pack/voidsuits/com_captain name = "Commonwealth captain voidsuit" contains = list( @@ -139,4 +139,3 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth captain voidsuit crate" access = access_captain - 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 8be9393505..fa3b3bad9a 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -21,7 +21,6 @@ "Research Intern" = /datum/alt_title/intern_sci, "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/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index 9a1b5ce954..2ecb576105 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" @@ -98,6 +98,7 @@ pto_type = PTO_SECURITY economic_modifier = 4 +/* /datum/job/offduty_exploration title = "Off-duty Explorer" latejoin_only = TRUE @@ -113,3 +114,4 @@ job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_EXPLORATION economic_modifier = 5 +*/ diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 9ee8ad6f6e..940a6f89e3 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -663,14 +663,14 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache) /datum/suit_cycler_choice/department/emag ) can_repair = 1 - +/* //VOREStation Removal /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 be0d121096..df9063c8c7 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,8 +1,9 @@ // 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) - +*/ /obj/machinery/suit_cycler/pilot req_access = list(access_pilot) @@ -58,4 +59,4 @@ name = "Talon miner suit cycler" model_text = "Talon miner" req_access = list(access_talon) - departments = list(/datum/suit_cycler_choice/department/talon/miner) \ No newline at end of file + departments = list(/datum/suit_cycler_choice/department/talon/miner) diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 974b34a93f..210beae3d0 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -46,8 +46,10 @@ name = "Shaft Miner" /obj/effect/landmark/start/pf name = "Pathfinder" +/* //VOREStation Removal /obj/effect/landmark/start/explorer name = "Explorer" +*/ /obj/effect/landmark/start/fieldmedic name = "Field Medic" /obj/effect/landmark/start/bartender 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 f492f097ed..5294ae139e 100644 --- a/code/game/objects/items/devices/radio/encryptionkey_vr.dm +++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm @@ -1,18 +1,18 @@ /obj/item/device/encryptionkey/heads/hop name = "head of personnel's encryption key" icon_state = "hop_cypherkey" - channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Explorer" = 1) + channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Away Team" = 1) /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 name = "research director's encryption key" @@ -20,15 +20,15 @@ channels = list("Command" = 1, "Science" = 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 name = "pathfinder's encryption key" icon_state = "com_cypherkey" - channels = list("Command" = 1, "Explorer" = 1) + channels = list("Command" = 1, "Away Team" = 1) /obj/item/device/encryptionkey/qm name = "quartermaster's encryption key" @@ -38,17 +38,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..b0bd2c682c 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'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 88c699e099..227636f4df 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/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( 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 02ebe67460..4c1c83a300 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -57,37 +57,37 @@ 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","Field Medic","Pathfinder","Talon Captain","Talon Guard") /datum/gear/accessory/brown_vest - 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","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + 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","Field Medic","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") /datum/gear/accessory/black_vest - display_name = "webbing, black (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","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + 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","Field Medic","Pathfinder","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","Field Medic","Talon Doctor") /datum/gear/accessory/brown_drop_pouches - display_name = "drop pouches, 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","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + 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","Field Medic","Pathfinder","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, 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","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") + 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","Field Medic","Pathfinder","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","Field Medic","Talon Doctor") /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","Field Medic","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard","Talon Miner","Pilot") cost = 2 /datum/gear/accessory/webbing @@ -138,4 +138,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..bcf3cbf39b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -2,8 +2,8 @@ allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") /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", "Pathfinder") /datum/gear/eyes/arglasses display_name = "AR glasses" 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 1182964e0c..4886349f01 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -130,7 +130,7 @@ 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", - "Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic") + "Engineer","Warden","Detective","Security Officer", "Pathfinder", "Field Medic") /datum/gear/uniform/job_trek/cmd/ds9 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 5b5a4e5598..8d1ea66e3d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -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 8913040278..c3e7f9905a 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 SolCom space, by law." /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 cf88287d50..60b8f57e5a 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,4 @@ /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!" - icon_state = "christmascroppedgreen" \ No newline at end of file + icon_state = "christmascroppedgreen" diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index d14e663b47..29249cf9aa 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -54,7 +54,7 @@ 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), - EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), +// EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), //VOREStation removal 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 d98430d3be..b53916b402 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,7 +58,7 @@ var/list/department_radio_keys = list( ":г" = "Supply", ".г" = "Supply", ":м" = "Service", ".м" = "Service", ":з" = "AI Private", ".з" = "AI Private", - ":н" = "Explorer", ".н" = "Explorer", + ":н" = "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 a2cd526ef2..86262c2b2f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -171,7 +171,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 2a8ffcb3e1..86875071dc 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,7 @@ modules += bandaid synths += medicine - var/obj/item/weapon/gun/energy/phasegun/mounted/cyborg/phasegun = new(src) + var/obj/item/weapon/gun/energy/phasegun/mounted/cyborg/phasegun = new(src) modules += phasegun emag = new /obj/item/weapon/chainsaw(src) 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/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 7d222264a4..c5b72166a3 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -855,7 +855,6 @@ /area/groundbase/civilian/kitchen) "nN" = ( /obj/machinery/light, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "nR" = ( @@ -1323,7 +1322,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "vs" = ( @@ -1595,7 +1593,6 @@ /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "zG" = ( -/obj/machinery/suit_cycler/exploration, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -3141,7 +3138,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "WF" = ( diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index 2021964eb7..0d3f0e13f7 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,7 +74,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/groundbase_buffered 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 ee51fc4f0c..0ce445ac8c 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/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index af2f046ef3..0c7ff9f139 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -2069,7 +2069,6 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "en" = ( @@ -4957,7 +4956,6 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "kh" = ( @@ -7557,7 +7555,6 @@ /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" = ( @@ -9250,7 +9247,6 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck1/portcent) "te" = ( -/obj/machinery/suit_cycler/exploration, /obj/machinery/firealarm/angled, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) @@ -19219,7 +19215,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" = ( @@ -19637,7 +19632,6 @@ /obj/structure/bed/chair/backed_red{ dir = 8 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "PD" = ( @@ -21528,7 +21522,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" = ( @@ -21597,7 +21590,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" = ( @@ -22523,7 +22515,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Vp" = ( @@ -23245,7 +23236,6 @@ /obj/structure/bed/chair/backed_red{ dir = 4 }, -/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "WJ" = ( 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/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 7a6edc6697..754d98604a 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -27863,7 +27863,6 @@ /turf/simulated/floor/plating, /area/tether/station/dock_two) "mYJ" = ( -/obj/machinery/suit_cycler/exploration, /obj/effect/floor_decal/borderfloor{ dir = 10 }, 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/vorestation.dme b/vorestation.dme index 82efe5b521..a861e435e7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -796,7 +796,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"