cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

unfucc exploration

Browse Source 
please do not the department
This commit is contained in:
Razgriz
2023-01-21 22:21:39 -07:00
parent 764e792895
commit 418643dce3
39 changed files with 150 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/_helpers/global_lists_vr.dm
View File

@@ -534,6 +534,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
"Research Intern",
"Security Cadet",
"Jr. Cargo Tech",
"Jr. Explorer", //CHOMP explo keep
"Server",
"Electrician",
"Barista")

2
code/controllers/communications.dm
View File

@@ -141,7 +141,7 @@ var/list/radiochannels = list(
"Raider" = RAID_FREQ,
"Supply" = SUP_FREQ,
"Service" = SRV_FREQ,
"Away Team" = EXP_FREQ,
"Explorer" = EXP_FREQ, //CHOMP explo keep
"AI Private" = AI_FREQ,
"Entertainment" = ENT_FREQ,
"Medical(I)" = MED_I_FREQ,

9
code/datums/supplypacks/misc_vr.dm
View File

@@ -26,6 +26,7 @@
containername = "eva hardsuit crate"
access = list(access_mining,
access_eva,
access_explorer, //CHOMP explo keep
access_pilot)
one_access = TRUE
@@ -124,11 +125,12 @@
access = list(access_mining,
access_xenoarch,
access_eva,
access_explorer, //CHOMP explo keep
access_pilot)
one_access = TRUE
/datum/supply_pack/randomised/misc/explorer_shield
name = "Away Team shield"
name = "Explorer shield" //CHOMP explo keep
num_contained = 2
contains = list(
/obj/item/weapon/shield/riot/explorer,
@@ -137,7 +139,8 @@
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
containername = "exploration shield crate"
access = list(access_eva,
access = list(access_explorer, //CHOMP explo keep
access_eva,
access_pilot)
one_access = TRUE
@@ -168,7 +171,7 @@
containertype = /obj/structure/closet/crate/secure/gear
containername = "exploration radio headsets crate"
access = list(
access_awayteam,
access_explorer, //CHOMP explo keep
access_eva,
access_pilot
)

4
code/datums/supplypacks/munitions_vr.dm
View File

@@ -7,7 +7,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure
containername = "frontier phaser crate"
access = access_security
access = access_explorer //CHOMP explo keep
/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_security
access = access_explorer //CHOMP explo keep
/datum/supply_pack/munitions/ofd_charge_emp
name = "OFD Charge - EMP"

7
code/datums/supplypacks/supply.dm
View File

@@ -157,7 +157,7 @@
containername = "Cargo Train Trolley Crate"
/datum/supply_pack/explorergear
name="Away Team gear"
name="Explore gear" //CHOMP explo keep
contains = list (
/obj/item/device/cataloguer,
/obj/item/device/geiger,
@@ -178,8 +178,8 @@
)
cost=25
containertype = /obj/structure/closet/crate/secure/xion
containername = "Away Team equipment"
access = list(access_eva, access_awayteam)
containername = "Explore equipment" //CHOMP explo keep
access = access_explorer //CHOMP explo keep
/datum/supply_pack/pilotgear
name= "Pilot gear"
@@ -192,6 +192,7 @@
/obj/item/stack/marker_beacon/thirty,
/obj/item/device/gps/explorer,
/obj/item/clothing/gloves/fingerless,
/obj/item/device/cataloguer/compact, //CHOMP explo keep
/obj/item/clothing/suit/storage/toggle/bomber/pilot,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/device/flashlight,

87
code/datums/supplypacks/voidsuits_vr.dm
View File

@@ -1,5 +1,5 @@
/datum/supply_pack/voidsuits/explorer
name = "Away Team voidsuits"
name = "Exploration voidsuits" //CHOMP explo keep
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 = "Away Team voidsuit crate"
access = list(access_eva, access_awayteam)
containername = "Exploration voidsuit crate" //CHOMP explo keep
access = access_exolorer //CHOMP explo keep
/datum/supply_pack/voidsuits/explorer_medic
name = "Away Team Medic voidsuits"
name = "Expedition Medic voidsuits" //CHOMP explo keep
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 = "Away Team Medic voidsuit crate"
access = access_medical
containername = "Expedition Medic voidsuit crate" //CHOMP explo keep
access = access_explorer //CHOMP explo keep
/datum/supply_pack/voidsuits/pilot
name = "Pilot voidsuits"
@@ -53,15 +53,9 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov mining voidsuit crate"
access = access_mining
<<<<<<< HEAD
/datum/supply_pack/voidsuits/solgov_anomaly
name = "Solgov anomaly suit"
=======
/datum/supply_pack/voidsuits/com_anomaly
name = "Commonwealth anomaly suit"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
/datum/supply_pack/voidsuits/solgov_anomaly //CHOMP explo keep
name = "Solgov anomaly suit" //CHOMP explo keep
contains = list(
/obj/item/clothing/suit/space/anomaly/alt,
/obj/item/clothing/head/helmet/space/anomaly/alt
@@ -70,15 +64,9 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov anomaly suit crate"
access = access_xenoarch
<<<<<<< HEAD
/datum/supply_pack/voidsuits/solgov_riot
name = "Solgov riot voidsuit"
=======
/datum/supply_pack/voidsuits/com_riot
name = "Commonwealth riot voidsuit"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
/datum/supply_pack/voidsuits/solgov_riot //CHOMP explo keep
name = "Solgov riot voidsuit" //CHOMP explo keep
contains = list(
/obj/item/clothing/suit/space/void/security/riot/alt,
/obj/item/clothing/head/helmet/space/void/security/riot/alt
@@ -87,15 +75,9 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov riot voidsuit crate"
access = access_brig
<<<<<<< HEAD
/datum/supply_pack/voidsuits/solgov_pilot
name = "Solgov pilot voidsuit"
=======
/datum/supply_pack/voidsuits/com_pilot
name = "Commonwealth pilot voidsuit"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
/datum/supply_pack/voidsuits/solgov_pilot //CHOMP explo keep
name = "Solgov pilot voidsuit" //CHOMP explo keep
contains = list(
/obj/item/clothing/suit/space/void/pilot/alt2,
/obj/item/clothing/head/helmet/space/void/pilot/alt2
@@ -104,15 +86,9 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov pilot voidsuit crate"
access = access_pilot
<<<<<<< HEAD
/datum/supply_pack/voidsuits/solgov_medical
name = "Solgov medical voidsuit"
=======
/datum/supply_pack/voidsuits/com_medical
name = "Commonwealth medical voidsuit"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
/datum/supply_pack/voidsuits/solgov_medical //CHOMP explo keep
name = "Solgov medical voidsuit" //CHOMP explo keep
contains = list(
/obj/item/clothing/suit/space/void/medical/alt2,
/obj/item/clothing/head/helmet/space/void/medical/alt2
@@ -129,19 +105,11 @@
)
cost = 150
containertype = /obj/structure/closet/crate/secure
<<<<<<< HEAD
name = "Solgov exploration voidsuit crate"
access = access_explorer
name = "Solgov exploration voidsuit crate" //CHOMP explo keep
access = access_explorer //CHOMP explo keep
/datum/supply_pack/voidsuits/solgov_engineer
name = "Solgov engineering voidsuit"
=======
name = "Commonwealth exploration voidsuit crate"
access = list(access_eva, access_awayteam)
/datum/supply_pack/voidsuits/com_engineer
name = "Commonwealth engineering voidsuit"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
contains = list(
/obj/item/clothing/suit/space/void/engineering/alt2,
/obj/item/clothing/head/helmet/space/void/engineering/alt2
@@ -150,15 +118,9 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov engineering voidsuit crate"
access = access_engine
<<<<<<< HEAD
/datum/supply_pack/voidsuits/solgov_atmos
name = "Solgov atmos voidsuit"
=======
/datum/supply_pack/voidsuits/com_atmos
name = "Commonwealth atmos voidsuit"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
/datum/supply_pack/voidsuits/solgov_atmos //CHOMP explo keep
name = "Solgov atmos voidsuit" //CHOMP explo keep
contains = list(
/obj/item/clothing/suit/space/void/atmos/alt2,
/obj/item/clothing/head/helmet/space/void/atmos/alt2
@@ -167,15 +129,9 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov atmos voidsuit crate"
access = access_atmospherics
<<<<<<< HEAD
/datum/supply_pack/voidsuits/solgov_captain
name = "Solgov captain voidsuit"
=======
/datum/supply_pack/voidsuits/com_captain
name = "Commonwealth captain voidsuit"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
/datum/supply_pack/voidsuits/solgov_captain //CHOMP explo keep
name = "Solgov captain voidsuit" //CHOMP explo keep
contains = list(
/obj/item/clothing/suit/space/void/captain/alt,
/obj/item/clothing/head/helmet/space/void/captain/alt
@@ -184,8 +140,5 @@
containertype = /obj/structure/closet/crate/secure
name = "Solgov captain voidsuit crate"
access = access_captain
<<<<<<< HEAD
// CHOMPStation EDIT End
=======
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo

12
code/game/jobs/access_datum_vr.dm
View File

@@ -1,16 +1,16 @@
//Moved from southern_cross_jobs.vr to fix a runtime
var/const/access_awayteam = 43
/datum/access/awayteam
id = access_awayteam
desc = "Away Team"
var/const/access_explorer = 43 //CHOMP explo keep
/datum/access/explorer //CHOMP explo keep
id = access_explorer //CHOMP explo keep
desc = "Explorer" //CHOMP explo keep
region = ACCESS_REGION_GENERAL
/*
//CHOMP explo keep removed a wide comment field on this line
/var/const/access_pathfinder = 44
/datum/access/pathfinder
id = access_pathfinder
desc = "Pathfinder"
region = ACCESS_REGION_GENERAL
*/
//CHOMP explo keep removed the closing wide comment field on this line. KEEP THE PATHFINDER
var/const/access_pilot = 67
/datum/access/pilot
id = access_pilot

4
code/game/jobs/job/assistant_vr.dm
View File

@@ -57,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
/*
//CHOMP explo keep removed a wide comment field here
/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
*/
//CHOMP explo keep removed the end of the wide comment field here
/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."

4
code/game/jobs/job/civilian_vr.dm
View File

@@ -214,8 +214,8 @@
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
total_positions = 2
spawn_positions = 2
total_positions = 5 //CHOMP explo keep
spawn_positions = 5 //CHOMP explo keep
supervisors = "the Head of Personnel"
selection_color = "#515151"
economic_modifier = 5

8
code/game/jobs/job/medical_vr.dm
View File

@@ -80,13 +80,9 @@
/datum/job/paramedic
pto_type = PTO_MEDICAL
<<<<<<< HEAD
alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder) //CHOMPedit: Removed SAR because that's an actual job here
=======
alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder, "Search and Rescue" = /datum/alt_title/sar)
total_positions = 3
spawn_positions = 3
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
// total_positions = 3 //CHOMP Remove these two lines were added by the Virgo Explo Removal, because I guess they wanted more station paramedics because no more field medics on their code
// spawn_positions = 3 //CHOMP Remove ^
/datum/alt_title/medical_responder
title = "Medical Responder"

2
code/game/machinery/suit_storage_unit_vr.dm
View File

@@ -2,7 +2,7 @@
/obj/machinery/suit_cycler/exploration
req_access = null
req_one_access = list(access_awayteam,access_medical_equip)
req_one_access = list(access_explorer,access_medical_equip) //CHOMP explo keep
/obj/machinery/suit_cycler/pilot
req_access = list(access_pilot)

4
code/game/objects/effects/job_start_landmarks.dm
View File

@@ -44,14 +44,14 @@
name = "Cargo Technician"
/obj/effect/landmark/start/miner
name = "Shaft Miner"
/* //VOREStation Removal
//CHOMP explo keep removed wide comment field
/obj/effect/landmark/start/pf
name = "Pathfinder"
/obj/effect/landmark/start/explorer
name = "Explorer"
/obj/effect/landmark/start/fieldmedic
name = "Field Medic"
*/
//CHOMP explo keep removed wide comment field end
/obj/effect/landmark/start/bartender
name = "Bartender"
/obj/effect/landmark/start/botanist

1
code/game/objects/effects/semirandom_mobs_vr.dm
View File

@@ -534,6 +534,7 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/vore/oregrub = 5,
/mob/living/simple_mob/vore/oregrub/lava = 1
) = 15,
list(/mob/living/simple_mob/vore/alienanimals/teppi) = 15, //CHOMP explo keep
list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish) = 5,
list(/mob/living/simple_mob/vore/alienanimals/space_ghost) = 5,
list(

2
code/game/objects/items/devices/paicard.dm
View File

@@ -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) = "Away Team"
num2text(EXP_FREQ) = "Explorer" //CHOMP explo keep
)
GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)

36
code/game/objects/items/devices/radio/encryptionkey_vr.dm
View File

@@ -1,11 +1,7 @@
/obj/item/device/encryptionkey/heads/hop //YW Edit: removes Explorer channel access, not in line with our chain of command.
/obj/item/device/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
<<<<<<< HEAD
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1)
=======
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1, "Away Team" = 1)
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1) //YW Edit: removes Explorer channel access, not in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
@@ -18,45 +14,41 @@
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1)
/obj/item/device/encryptionkey/heads/rd //YW Edit: adds Explorer channel access, to come in line with our chain of command.
/obj/item/device/encryptionkey/heads/rd
name = "research director's encryption key"
icon_state = "rd_cypherkey"
channels = list("Command" = 1, "Science" = 1, "Explorer" = 1)
channels = list("Command" = 1, "Science" = 1, "Explorer" = 1) //YW Edit: adds Explorer channel access, to come in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/ert
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Away Team" = 1)
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) //CHOMP explo keep
/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, "Away Team" = 1)
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) //CHOMP explo keep
/obj/item/device/encryptionkey/pathfinder //YW Edit: removes command channel access, not in line with our chain of command.
/obj/item/device/encryptionkey/pathfinder
name = "pathfinder's encryption key"
icon_state = "com_cypherkey"
<<<<<<< HEAD
channels = list("Explorer" = 1)
=======
channels = list("Command" = 1, "Away Team" = 1)
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
channels = list("Explorer" = 1) //YW Edit: removes command channel access, not in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/qm //YW Edit: removes command channel access, not in line with our chain of command.
/obj/item/device/encryptionkey/qm
name = "quartermaster's encryption key"
icon_state = "qm_cypherkey"
channels = list("Supply" = 1)
channels = list("Supply" = 1) //YW Edit: removes command channel access, not in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/pilot
name = "pilot's encryption key"
icon_state = "cypherkey"
channels = list("Away Team" = 1)
channels = list("Explorer" = 1) //CHOMP explo keep
/obj/item/device/encryptionkey/explorer
name = "away team's encryption key"
name = "explorer's encryption key" //CHOMP explo keep
icon_state = "rob_cypherkey"
channels = list("Away Team" = 1)
channels = list("Explorer" = 1) //CHOMP explo keep
/obj/item/device/encryptionkey/sar
name = "fm's encryption key"
icon_state = "med_cypherkey"
channels = list("Medical" = 1, "Away Team" = 1)
channels = list("Medical" = 1, "Explorer" = 1) //CHOMP explo keep
/obj/item/device/encryptionkey/talon
channels = list("Talon" = 1)

14
code/game/objects/items/devices/radio/headset_vr.dm
View File

@@ -91,15 +91,15 @@
icon_state = "pilot_headset_alt"
/obj/item/device/radio/headset/explorer
name = "away team member's headset"
desc = "Headset used by the away team for exploring. Access to the away team channel."
name = "explorer's headset" //CHOMP explo keep
desc = "Headset used by explorers for exploring. Access to the explorer channel." //CHOMP explo keep
icon_state = "exp_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/device/encryptionkey/explorer
/obj/item/device/radio/headset/explorer/alt
name = "away team's bowman headset"
desc = "Bowman headset used by the away team for exploring. Access to the away team channel."
name = "explorer's bowman headset" //CHOMP explo keep
desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." //CHOMP explo keep
icon_state = "exp_headset_alt"
/obj/item/device/radio/headset/sar
@@ -114,14 +114,14 @@
desc = "A bowman headset for field medics."
icon_state = "sar_headset_alt"
/* //They're all volunteers now.
//CHOMP explo removed wide comment field
/obj/item/device/radio/headset/volunteer
name = "volunteer's headset"
desc = "A headset used by volunteers to expedition teams, has access to the Away Team channel."
desc = "A headset used by volunteers to expedition teams, has access to the exploration channel." //CHOMP explo keep
icon_state = "pilot_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/device/encryptionkey/explorer
*/
//CHOMP explo keep removed wide comment field end
/obj/item/device/radio/headset/talon
name = "talon headset"

2
code/game/objects/items/devices/radio/radio.dm
View File

@@ -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_awayteam) //VOREStation Edit
num2text(EXP_FREQ) = list(access_explorer) //CHOMP explo keep
)
var/global/list/default_medbay_channels = list(

4
code/game/objects/items/weapons/shields_vr.dm
View File

@@ -22,7 +22,7 @@
/obj/item/weapon/shield/riot/explorer
name = "green away team shield"
name = "green explorer shield" //CHOMP explo keep
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 away team shield"
name = "purple explorer shield" //CHOMP explo keep
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"

2
code/game/objects/items/weapons/storage/boxes_vr.dm
View File

@@ -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/explorer = 7)
starts_with = list(/obj/item/device/radio/headset/volunteer = 7) //CHOMP explo keep
/obj/item/weapon/storage/box/commandkeys
name = "box of command keys"

15
code/game/objects/structures/crates_lockers/closets/misc_vr.dm
View File

@@ -24,7 +24,7 @@
/obj/structure/closet/secure_closet/guncabinet/rifle
name = "rifle cabinet"
req_one_access = list(access_brig)
req_one_access = list(access_explorer,access_brig) //CHOMP explo keep
starts_with = list(
/obj/item/ammo_magazine/clip/c762/hunter = 9,
@@ -38,8 +38,8 @@
return ..()
/obj/structure/closet/secure_closet/guncabinet/phase
name = "away team weapon cabinet"
req_one_access = list(access_brig)
name = "explorer weapon cabinet" //CHOMP explo keep
req_one_access = list(access_explorer,access_brig) //CHOMP explo keep
starts_with = list(
/obj/item/weapon/gun/energy/locked/phasegun = 2,
@@ -51,8 +51,8 @@
* Explorer
*/
/obj/structure/closet/secure_closet/explorer
name = "away team locker"
req_access = list(access_awayteam)
name = "explorer locker" //CHOMP explo keep
req_access = list(access_explorer) //CHOMP explo keep
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_heads)
req_access = list(access_pathfinder) //CHOMP explo keep
closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
starts_with = list(
@@ -197,6 +197,7 @@
starts_with = list(
/obj/item/weapon/storage/backpack/parachute,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/gun/energy/locked/frontier/holdout, //CHOMP explo keep
/obj/item/clothing/head/pilot_vr,
/obj/item/clothing/under/rank/pilot1,
/obj/item/clothing/suit/storage/toggle/bomber/pilot,
@@ -214,7 +215,7 @@
/obj/item/weapon/cell/device,
/obj/item/device/radio,
/obj/item/device/gps/explorer,
/obj/item/weapon/gun/energy/taser)
/obj/item/device/cataloguer/compact) //CHOMP explo keep
/obj/structure/closet/secure_closet/pilot/Initialize()
if(prob(50))

2
code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
View File

@@ -52,7 +52,7 @@
//VOREStation Add Start
/obj/structure/closet/secure_closet/guncabinet/excursion
name = "expedition weaponry cabinet"
req_one_access = list(access_armory)
req_one_access = list(access_explorer,access_armory) //CHOMP keep explo
/obj/structure/closet/secure_closet/guncabinet/excursion/New()
..()

49
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -61,69 +61,40 @@
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Talon Captain","Talon Guard")
/datum/gear/accessory/brown_vest
<<<<<<< HEAD
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" //CHOMP keep explo
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
/datum/gear/accessory/black_vest
display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)"
display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)" //CHOMP keep explo
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") //CHOMP keep explo
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)"
display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)" //CHOMP keep explo
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)"
display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)" //CHOMP keep explo
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
=======
display_name = "webbing, brown (Eng, Sec, Med, Miner)"
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner")
/datum/gear/accessory/black_vest
display_name = "webbing, black (Eng, Sec, Med, Miner)"
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner")
/datum/gear/accessory/white_vest
display_name = "webbing, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Talon Doctor")
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown (Eng, Sec, Med, Miner)"
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner")
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black (Eng, Sec, Med, Miner)"
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner")
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Talon Doctor")
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") //CHOMP keep explo
/datum/gear/accessory/bluespace
display_name = "bluespace badge (Eng, Sec, Med, Miner, Pilot)"
display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner, Pilot)" //CHOMP keep explo
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","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","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard","Talon Miner","Pilot") //CHOMP keep explo
cost = 2
/datum/gear/accessory/webbing
cost = 1
/datum/gear/accessory/stethoscope
<<<<<<< HEAD
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
=======
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor")
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") //CHOMP keep explo
/datum/gear/accessory/khcrystal
display_name = "Life Crystal"
@@ -139,7 +110,7 @@
display_name = "pilot qualification pin"
description = "An iron pin denoting the qualification to fly USG spacecraft."
path = /obj/item/clothing/accessory/solgov/specialty/pilot
allowed_roles = list("Pilot","Talon Pilot")
allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot") //CHOMP keep explo
/datum/gear/accessory/flops
display_name = "drop straps"

8
code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
View File

@@ -1,9 +1,9 @@
/datum/gear/eyes/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist","Field Medic") //CHOMP keep explo
/datum/gear/eyes/meson
display_name = "Optical Meson Scanners (Eng, Sci)"
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director")
display_name = "Optical Meson Scanners (Eng, Sci, Explo)"
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") //CHOMP keep explo
/datum/gear/eyes/arglasses
display_name = "AR glasses"
@@ -38,7 +38,7 @@
/datum/gear/eyes/arglasses/med
display_name = "AR-M glasses (Medical)"
path = /obj/item/clothing/glasses/omnihud/med
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
/datum/gear/eyes/arglasses/all
display_name = "AR-B glasses (SM, HoP)"

4
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
View File

@@ -649,7 +649,7 @@
display_name = "Kenzie's Hypospray"
ckeywhitelist = list("lm40")
character_name = list("Kenzie Houser")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") //CHOMP keep explo
/datum/gear/fluff/brianna_backpack
path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana
@@ -1297,7 +1297,7 @@
slot = slot_belt
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Off-duty Medic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic", "Off-duty Medic") //CHOMP keep explo
/datum/gear/fluff/tempest_backpack
path = /obj/item/weapon/storage/backpack/saddlebag/tempest

2
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
View File

@@ -1,7 +1,7 @@
/datum/gear/head/cap/med
display_name = "cap, medical (Medical)"
path = /obj/item/clothing/head/soft/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") //CHOMP keep explo
/*/datum/gear/head/cap/sol
display_name = "cap, sol"

2
code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm
View File

@@ -1,5 +1,5 @@
/datum/gear/shoes/boots/winter/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
/datum/gear/shoes/black/cuffs
display_name = "legwraps, black"

10
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -390,12 +390,12 @@
/datum/gear/suit/wintercoat/medical
display_name = "winter coat, medical"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
/datum/gear/suit/wintercoat/medical/alt
display_name = "winter coat, medical alt"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist","Field Medic") //CHOMP keep explo
/datum/gear/suit/wintercoat/medical/viro
display_name = "winter coat, virologist"
@@ -420,11 +420,7 @@
/datum/gear/suit/wintercoat/medical/sar
display_name = "winter coat, search and rescue"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
<<<<<<< HEAD
allowed_roles = list("Chief Medical Officer", "Field Medic")
=======
allowed_roles = list("Chief Medical Officer","Paramedic")
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
allowed_roles = list("Chief Medical Officer", "Field Medic") //CHOMP keep explo
/datum/gear/suit/wintercoat/science
display_name = "winter coat, science"

8
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
View File

@@ -1,5 +1,5 @@
/datum/gear/suit/snowsuit/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
/datum/gear/suit/labcoat_colorable
display_name = "labcoat, colorable"
@@ -74,7 +74,7 @@
/datum/gear/suit/roles/medical/ems_jacket
display_name = "first responder jacket"
path = /obj/item/clothing/suit/storage/toggle/fr_jacket
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic") //CHOMP keep explo
//imo-superior 'martian' style jacket with the star-of-life design
/datum/gear/suit/roles/medical/ems_jacket/alt
@@ -85,7 +85,7 @@
/datum/gear/suit/roles/medical/paramedic_vest
display_name = "paramedic vest"
path = /obj/item/clothing/suit/storage/toggle/paramedic
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic") //CHOMP keep explo
//greek thing
/datum/gear/suit/chiton
@@ -113,7 +113,7 @@ Talon winter coat
/datum/gear/suit/armor/combat/crusader_explo
display_name = "knight, explo"
path = /obj/item/clothing/suit/armor/combat/crusader_explo
allowed_roles = list("Explorer","Pathfinder")
allowed_roles = list("Explorer","Field Medic","Pathfinder") //CHOMP keep explo
/datum/gear/suit/armor/combat/crusader_explo/FM
display_name = "knight, Field Medic"

22
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -20,7 +20,7 @@
/datum/gear/uniform/job_turtle/medical
display_name = "turtleneck, medical"
path = /obj/item/clothing/under/rank/medical/turtleneck
allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Chemist")
allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Field Medic", "Chemist") //CHOMP keep explo
//KHI Uniforms
/datum/gear/uniform/job_khi/cmd
@@ -36,7 +36,7 @@
/datum/gear/uniform/job_khi/med
display_name = "ge uniform, med" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist") //CHOMP keep explo
/datum/gear/uniform/job_khi/eng
display_name = "ge uniform, eng" //CHOMPedit: changed to GE suit
@@ -66,7 +66,7 @@
/datum/gear/suit/job_fed/medsci
display_name = "fed uniform, med/sci"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/suit/job_fed/eng
display_name = "fed uniform, eng"
@@ -83,7 +83,7 @@
/datum/gear/uniform/job_trek/medsci/tos
display_name = "TOS uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
@@ -101,7 +101,7 @@
/datum/gear/uniform/job_trek/medsci/tng
display_name = "TNG uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/next
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
@@ -119,7 +119,7 @@
/datum/gear/uniform/job_trek/medsci/voy
display_name = "VOY uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/voy
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
@@ -136,11 +136,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",
<<<<<<< HEAD
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
"Engineer","Warden","Detective","Security Officer")
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS //CHOMP keep explo
/datum/gear/uniform/job_trek/cmd/ds9
@@ -151,7 +147,7 @@
/datum/gear/uniform/job_trek/medsci/ds9
display_name = "DS9 uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ds9
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
@@ -169,7 +165,7 @@
/datum/gear/uniform/job_trek/medsci/ent
display_name = "ENT uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ent
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.

4
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
View File

@@ -35,7 +35,7 @@
/datum/gear/utility/dufflebag/med
display_name = "medical dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/med
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist")
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Field Medic") //CHOMP explo keep
/datum/gear/utility/dufflebag/med/emt
display_name = "EMT dufflebag"
@@ -57,7 +57,7 @@
allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist")
/datum/gear/utility/dufflebag/explorer
display_name = "away team dufflebag"
display_name = "aexplorer dufflebag" //CHOMP explo keep
path = /obj/item/weapon/storage/backpack/dufflebag/explorer
/datum/gear/utility/dufflebag/talon

2
code/modules/clothing/shoes/boots.dm
View File

@@ -169,7 +169,7 @@
icon_state = "winterboots_hydro"
/obj/item/clothing/shoes/boots/winter/explorer
name = "away team winter boots"
name = "explorer winter boots" //CHOMP keep explo
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)

2
code/modules/clothing/under/accessories/permits_vr.dm
View File

@@ -2,5 +2,5 @@
desc = "A card issued by the EIO, indicating that the owner is a Drone Intelligence. Drones are mandated to carry this card within SolGov space, by law." //YW EDIT: SolGov
/obj/item/clothing/accessory/permit/gun/planetside
name = "away team gun permit"
name = "explorer gun permit" //CHOMP keep explo
desc = "A card indicating that the owner is allowed to carry a firearm during active missions."

6
code/modules/clothing/under/miscellaneous.dm
View File

@@ -1114,7 +1114,7 @@
/obj/item/clothing/under/explorer
desc = "A green uniform for operating in hazardous environments."
name = "away team's jumpsuit"
name = "explorer's jumpsuit" //CHOMP keep explo
icon_state = "explorer"
/obj/item/clothing/under/explorer/armored
@@ -1501,8 +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!"
<<<<<<< HEAD
icon_state = "christmascroppedgreen"
=======
icon_state = "christmascroppedgreen"
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo

6
code/modules/mob/living/say.dm
View File

@@ -16,7 +16,7 @@ var/list/department_radio_keys = list(
":u" = "Supply", ".u" = "Supply",
":v" = "Service", ".v" = "Service",
":p" = "AI Private", ".p" = "AI Private",
":a" = "Away Team", ".a" = "Away Team", //VOREStation Edit
":a" = "Explorer", ".a" = "Explorer", //VOREStation Edit //CHOMP keep explo
":y" = "Talon", ".y" = "Talon", //VOREStation Add,
":g" = "Casino", ".g" = "Casino",
@@ -36,7 +36,7 @@ var/list/department_radio_keys = list(
":U" = "Supply", ".U" = "Supply",
":V" = "Service", ".V" = "Service",
":P" = "AI Private", ".P" = "AI Private",
":A" = "Away Team", ".A" = "Away Team",
":A" = "Explorer", ".A" = "Explorer", //CHOMP keep explo
":Y" = "Talon", ".Y" = "Talon", //VOREStation Add,
":G" = "Casino", ".G" = "Casino",
@@ -58,7 +58,7 @@ var/list/department_radio_keys = list(
":г" = "Supply", ".г" = "Supply",
":м" = "Service", ".м" = "Service",
":з" = "AI Private", ".з" = "AI Private",
":ф" = "Away Team", ".ф" = "Away Team",
":ф" = "Explorer", ".ф" = "Explorer", //CHOMP keep explo
":н" = "Talon", ".н" = "Talon", //VOREStation Add
":п" = "Casino", ".п" = "Casino",
)

2
code/modules/mob/living/silicon/robot/robot_modules/station.dm
View File

@@ -172,7 +172,7 @@ var/global/list/robot_modules = list(
"Supply" = 1,
"Science" = 1,
"Command" = 1,
"Away Team" = 1
"Explorer" = 1 //CHOMP keep explo
)
// Cyborgs (non-drones), default loadout. This will be given to every module.

8
code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
View File

@@ -44,7 +44,7 @@
)
channels = list(
"Science" = 1,
"Away Team" = 1
"Explorer" = 1
)
/obj/item/weapon/robot_module/robot/platform/explorer/New()
@@ -64,11 +64,7 @@
modules += bandaid
synths += medicine
<<<<<<< HEAD
var/obj/item/weapon/gun/energy/locked/phasegun/unlocked/mounted/cyborg/phasegun = new(src)
=======
var/obj/item/weapon/gun/energy/phasegun/mounted/cyborg/phasegun = new(src)
>>>>>>> 244095be9e... Merge pull request #14220 from Very-Soft/removeexplo
var/obj/item/weapon/gun/energy/locked/phasegun/unlocked/mounted/cyborg/phasegun = new(src) //CHOMP Edit
modules += phasegun
emag = new /obj/item/weapon/chainsaw(src)

4
code/modules/pda/pda_vr.dm
View File

@@ -3,8 +3,8 @@
/obj/item/device/pda/multicaster/exploration/New()
..()
owner = "Away Team"
name = "Away Team (Relay)"
owner = "Exploration Department" //CHOMP keep explo
name = "Exploration Department (Relay)" //CHOMP keep explo
cartridges_to_send_to = exploration_cartridges
/obj/item/device/pda/centcom

6
maps/southern_cross/datums/supplypacks/munitions.dm
View File

@@ -12,7 +12,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/hedberg
containername = "Hunting Rifle crate"
access = access_brig
access = access_explorer //CHOMP keep explo
/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_brig
access = access_explorer //CHOMP keep explo
/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_brig
access = access_explorer //CHOMP keep explo

1
vorestation.dme
View File

@@ -823,6 +823,7 @@
#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"