diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 7629ce19a2..5e6dfae145 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -77,9 +77,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(wcoats)) /datum/gear/accessory/holster - display_name = "holster selection (Security, CD, HoP, Explorer)" + display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder") //VOREStation Edit + allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") /datum/gear/accessory/holster/New() ..() @@ -135,32 +135,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Field Medic","Pathfinder") //VOREStation Edit + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor") /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Field Medic","Pathfinder") //VOREStation Edit + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor") /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Field Medic","Pathfinder") //VOREStation Edit + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor") /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Field Medic","Pathfinder") //VOREStation Edit + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Field Medic","Pathfinder") //VOREStation Edit + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Field Medic","Pathfinder") //VOREStation Edit + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/fannypack display_name = "fannypack selection" @@ -239,7 +239,7 @@ /datum/gear/accessory/stethoscope display_name = "stethoscope" path = /obj/item/clothing/accessory/stethoscope - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") //VOREStation Edit + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Search and Rescue") /datum/gear/accessory/locket display_name = "locket" 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 86ea0381d0..c3d4adc34b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -30,11 +30,36 @@ display_name = "collar, holo" path = /obj/item/clothing/accessory/collar/holo -/datum/gear/accessory/white_drop_pouches - allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") +/datum/gear/accessory/holster + display_name = "holster selection (Security, CD, HoP, Exploration)" + allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder") + +/datum/gear/accessory/brown_vest + display_name = "webbing, brown" + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder") + +/datum/gear/accessory/black_vest + display_name = "webbing, black" + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder") /datum/gear/accessory/white_vest - allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") + display_name = "webbing, white (Medical)" + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") + +/datum/gear/accessory/brown_drop_pouches + display_name = "drop pouches, brown" + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder") + +/datum/gear/accessory/black_drop_pouches + display_name = "drop pouches, black" + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder") + +/datum/gear/accessory/white_drop_pouches + display_name = "drop pouches, white (Medical)" + allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic") + +/datum/gear/accessory/stethoscope + allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") /datum/gear/accessory/khcrystal display_name = "KH Life Crystal" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 85e007da90..5981424753 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -57,7 +57,7 @@ /datum/gear/eyes/medical display_name = "Medical HUD (Medical)" path = /obj/item/clothing/glasses/hud/health - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //VOREStation Edit + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Search and Rescue") /datum/gear/eyes/medical/prescriptionmed display_name = "Medical HUD, prescription (Medical)" 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 94094428c9..da9ad9021d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -1,3 +1,10 @@ +/datum/gear/eyes/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + +/datum/gear/eyes/meson + display_name = "Optical Meson Scanners (Engineering, Science)" + allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") + /datum/gear/eyes/arglasses display_name = "AR glasses" path = /obj/item/clothing/glasses/omnihud diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm index ff04b6a989..73cce9a17e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm @@ -1,3 +1,9 @@ +/datum/gear/shoes/boots/winter/science + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder") + +/datum/gear/shoes/boots/winter/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + /datum/gear/shoes/black/cuffs display_name = "legwraps, black" path = /obj/item/clothing/shoes/black/cuffs diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 87382eae60..41d37b8a67 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -480,7 +480,7 @@ datum/gear/suit/duster /datum/gear/suit/snowsuit/medical display_name = "snowsuit, medical" path = /obj/item/clothing/suit/storage/snowsuit/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //VOREStation Edit + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Search and Rescue") /datum/gear/suit/snowsuit/science display_name = "snowsuit, science" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 002d032a3d..719ba98a38 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -1,3 +1,21 @@ +/datum/gear/suit/roles/poncho/cloak/research + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder") + +/datum/gear/suit/roles/poncho/cloak/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + +/datum/gear/suit/wintercoat/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + +/datum/gear/suit/wintercoat/science + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder") + +/datum/gear/suit/snowsuit/medical + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") + +/datum/gear/suit/snowsuit/science + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder") + /datum/gear/suit/labcoat_colorable display_name = "labcoat, colorable" path = /obj/item/clothing/suit/storage/toggle/labcoat 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 9845ba9855..4edfe9246f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -54,4 +54,4 @@ /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sci - allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer") + allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer","Pathfinder") diff --git a/maps/southern_cross/items/encryptionkey_sc.dm b/maps/southern_cross/items/encryptionkey_sc.dm index 6896bf1c6c..feb63e5894 100644 --- a/maps/southern_cross/items/encryptionkey_sc.dm +++ b/maps/southern_cross/items/encryptionkey_sc.dm @@ -6,7 +6,7 @@ /obj/item/device/encryptionkey/explorer name = "explorer radio encryption key" icon_state = "com_cypherkey" - channels = list("Science" = 1, "Explorer" = 1) //VOREStation Edit + channels = list("Explorer" = 1) /obj/item/device/encryptionkey/sar name = "sar's encryption key" diff --git a/maps/southern_cross/items/encryptionkey_vr.dm b/maps/southern_cross/items/encryptionkey_vr.dm index 54f26ccebe..94b12bdd2c 100644 --- a/maps/southern_cross/items/encryptionkey_vr.dm +++ b/maps/southern_cross/items/encryptionkey_vr.dm @@ -1,3 +1,6 @@ /obj/item/device/encryptionkey/pilot icon_state = "cypherkey" channels = list("Explorer" = 1) + +/obj/item/device/encryptionkey/explorer + channels = list("Science" = 1, "Explorer" = 1) diff --git a/maps/southern_cross/items/headset_sc.dm b/maps/southern_cross/items/headset_sc.dm index 6007317792..eca7eeb27d 100644 --- a/maps/southern_cross/items/headset_sc.dm +++ b/maps/southern_cross/items/headset_sc.dm @@ -1,40 +1,35 @@ /obj/item/device/radio/headset/pilot name = "pilot's headset" - desc = "A headset used by pilots, has access to the explorer channel." //VOREStation Edit + desc = "A headset used by pilots, has access to supply and explorer channels." icon_state = "pilot_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/pilot /obj/item/device/radio/headset/pilot/alt name = "pilot's bowman headset" - desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit - icon_state = "pilot_headset_alt" - -/obj/item/device/radio/headset/pilot/alt - name = "pilot's bowman headset" - desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit + desc = "A bowman headset used by pilots, has access to supply and explorer channels." icon_state = "pilot_headset_alt" /obj/item/device/radio/headset/explorer name = "explorer's headset" - desc = "Headset used by explorers for exploring. Access to explorer and science channels." //VOREStation Edit + desc = "Headset used by explorers for exploring. Access to the explorer 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 explorer and science channels." //VOREStation Edit + desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." icon_state = "exp_headset_alt" /obj/item/device/radio/headset/sar - name = "fm radio headset" //VOREStation Edit - desc = "A headset for field medics." //VOREStation Edit + name = "sar radio headset" + desc = "A headset for search and rescue." icon_state = "sar_headset" adhoc_fallback = TRUE ks2type = /obj/item/device/encryptionkey/sar /obj/item/device/radio/headset/sar/alt - name = "fm radio bowman headset" //VOREStation Edit - desc = "A bowman headset for field medics." //VOREStation Edit + name = "sar radio bowman headset" + desc = "A bowman headset for search and rescue." icon_state = "sar_headset_alt" diff --git a/maps/southern_cross/items/headset_vr.dm b/maps/southern_cross/items/headset_vr.dm index c100fcf441..ac737845b5 100644 --- a/maps/southern_cross/items/headset_vr.dm +++ b/maps/southern_cross/items/headset_vr.dm @@ -1,3 +1,23 @@ +/obj/item/device/radio/headset/pilot + desc = "A headset used by pilots, has access to the explorer channel." + +/obj/item/device/radio/headset/pilot/alt + desc = "A bowman headset used by pilots, has access to the explorer channel." + +/obj/item/device/radio/headset/explorer + desc = "Headset used by explorers for exploring. Access to explorer and science channels." + +/obj/item/device/radio/headset/explorer/alt + desc = "Bowman headset used by explorers for exploring. Access to explorer and science channels." + +/obj/item/device/radio/headset/sar + name = "fm radio headset" + desc = "A headset for field medics." + +/obj/item/device/radio/headset/sar/alt + name = "fm radio bowman headset" + desc = "A bowman headset for field medics." + /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." diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index db05c6b04a..12166d1478 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -1,9 +1,8 @@ -//VORESTATION EDIT!!! This whole file is being included by hand to get these jobs rather than using the map datum itself. // Pilots var/const/SAR =(1<<11) -var/const/PILOT =(1<<15) //VOREStation Edit - Bumped up 2 -var/const/EXPLORER =(1<<12) //VOREStation Edit - Moved to science +var/const/PILOT =(1<<13) +var/const/EXPLORER =(1<<14) var/const/access_pilot = 67 var/const/access_explorer = 43 @@ -21,30 +20,16 @@ var/const/access_explorer = 43 //SC IDs /obj/item/weapon/card/id/medical/sar - //VOREStation Block Edit - Start - assignment = "Field Medic" - rank = "Field Medic" - icon_state = "cyan" - primary_color = rgb(47,189,189) - secondary_color = rgb(127,223,223) - //VOREStation Block Edit - End + assignment = "Search and Rescue" + rank = "Search and Rescue" job_access_type = /datum/job/sar -//VOREStation Block Edit - Start -/obj/item/weapon/card/id/explorer - name = "identification card" - desc = "A card issued to station exploration staff." - icon_state = "green" - primary_color = rgb(47,189,0) - secondary_color = rgb(127,223,95) -//VOREstation Block Edit - End - -/obj/item/weapon/card/id/explorer/pilot +/obj/item/weapon/card/id/civilian/pilot assignment = "Pilot" rank = "Pilot" job_access_type = /datum/job/pilot -/obj/item/weapon/card/id/explorer/explorer +/obj/item/weapon/card/id/civilian/explorer assignment = "Explorer" rank = "Explorer" job_access_type = /datum/job/explorer @@ -91,28 +76,28 @@ var/const/access_explorer = 43 faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the pathfinder and the head of personnel" //VOREStation Edit + supervisors = "the head of personnel" selection_color = "#515151" - idtype = /obj/item/weapon/card/id/explorer/pilot //VOREStation Edit - economic_modifier = 5 //VOREStation Edit - access = list(access_pilot) //VOREStation Edit - minimal_access = list(access_pilot) //VOREStation Edit + idtype = /obj/item/weapon/card/id/civilian/pilot + economic_modifier = 4 + access = list(access_pilot, access_cargo, access_mining, access_mining_station) + minimal_access = list(access_pilot, access_cargo, access_mining, access_mining_station) outfit_type = /decl/hierarchy/outfit/job/pilot /datum/job/explorer title = "Explorer" flag = EXPLORER - department = "Science" //VOREStation Edit - department_flag = MEDSCI //VOREStation Edit + department = "Civilian" + department_flag = CIVILIAN faction = "Station" - total_positions = 2 //VOREStation Edit - spawn_positions = 2 //VOREStation Edit - supervisors = "the pathfinder and the research director" //VOREStation Edit - selection_color = "#633D63" //VOREStation Edit - idtype = /obj/item/weapon/card/id/explorer/explorer //VOREStation Edit - economic_modifier = 6 //VOREStation Edit - access = list(access_explorer, access_research) //VOREStation Edit - minimal_access = list(access_explorer, access_research) //VOREStation Edit + total_positions = 4 + spawn_positions = 4 + supervisors = "the explorer leader and the head of personnel" + selection_color = "#515151" + idtype = /obj/item/weapon/card/id/civilian/explorer + economic_modifier = 4 + access = list(access_explorer) + minimal_access = list(access_explorer) outfit_type = /decl/hierarchy/outfit/job/explorer2 /* alt_titles = list( @@ -121,17 +106,17 @@ var/const/access_explorer = 43 */ /datum/job/sar - title = "Field Medic" //VOREStation Edit + title = "Search and Rescue" flag = SAR department = "Medical" department_flag = MEDSCI faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the pathfinder and the chief medical officer" //VOREStation Edit - selection_color = "#013D3B" //VOREStation Edit - idtype = /obj/item/weapon/card/id/medical/sar //VOREStation Edit - economic_modifier = 6 //VOREStation Edit - access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks, access_pilot) //VOREStation Edit - minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot) //VOREStation Edit + supervisors = "the chief medical officer" + selection_color = "#515151" + idtype = /obj/item/weapon/card/id/medical + economic_modifier = 4 + access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) + minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer) outfit_type = /decl/hierarchy/outfit/job/medical/sar \ No newline at end of file diff --git a/maps/southern_cross/southern_cross_jobs_vr.dm b/maps/southern_cross/southern_cross_jobs_vr.dm index c162d63d53..90b9f3ce1d 100644 --- a/maps/southern_cross/southern_cross_jobs_vr.dm +++ b/maps/southern_cross/southern_cross_jobs_vr.dm @@ -1,4 +1,45 @@ -var/const/PATHFINDER =(1<<13) //VOREStation Edit - Added Pathfinder +var/const/SAR =(1<<11) +var/const/PILOT =(1<<15) +var/const/EXPLORER =(1<<12) +var/const/PATHFINDER =(1<<13) + +var/const/access_pilot = 67 +var/const/access_explorer = 43 + +/datum/access/pilot + id = access_pilot + desc = "Pilot" + region = ACCESS_REGION_SUPPLY + +/datum/access/explorer + id = access_explorer + desc = "Explorer" + region = ACCESS_REGION_GENERAL + +/obj/item/weapon/card/id/medical/sar + assignment = "Field Medic" + rank = "Field Medic" + icon_state = "cyan" + primary_color = rgb(47,189,189) + secondary_color = rgb(127,223,223) + job_access_type = /datum/job/sar + +/obj/item/weapon/card/id/explorer + name = "identification card" + desc = "A card issued to station exploration staff." + icon_state = "green" + primary_color = rgb(47,189,0) + secondary_color = rgb(127,223,95) + +/obj/item/weapon/card/id/explorer/pilot + assignment = "Pilot" + rank = "Pilot" + job_access_type = /datum/job/pilot + +/obj/item/weapon/card/id/explorer/explorer + assignment = "Explorer" + rank = "Explorer" + job_access_type = /datum/job/explorer /obj/item/weapon/card/id/explorer/head/ name = "identification card" @@ -28,3 +69,51 @@ var/const/PATHFINDER =(1<<13) //VOREStation Edit - Added Pathfinder access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_research, access_gateway) minimal_access = list(access_eva, access_pilot, access_explorer, access_research, access_gateway) outfit_type = /decl/hierarchy/outfit/job/pathfinder + +/datum/job/pilot + title = "Pilot" + flag = PILOT + department = "Civilian" + department_flag = CIVILIAN + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the pathfinder and the head of personnel" + selection_color = "#515151" + idtype = /obj/item/weapon/card/id/explorer/pilot + economic_modifier = 5 + access = list(access_pilot) + minimal_access = list(access_pilot) + outfit_type = /decl/hierarchy/outfit/job/pilot + +/datum/job/explorer + title = "Explorer" + flag = EXPLORER + department = "Science" + department_flag = MEDSCI + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the pathfinder and the research director" + selection_color = "#633D63" + idtype = /obj/item/weapon/card/id/explorer/explorer + economic_modifier = 6 + access = list(access_explorer, access_research) + minimal_access = list(access_explorer, access_research) + outfit_type = /decl/hierarchy/outfit/job/explorer2 + +/datum/job/sar + title = "Field Medic" + flag = SAR + department = "Medical" + department_flag = MEDSCI + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the pathfinder and the chief medical officer" + selection_color = "#013D3B" + idtype = /obj/item/weapon/card/id/medical/sar + economic_modifier = 6 + access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks, access_pilot) + minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot) + outfit_type = /decl/hierarchy/outfit/job/medical/sar diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index b24b33ce9f..82b2bd65cb 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -36,15 +36,6 @@ /obj/structure/closet/secure_closet/explorer name = "explorer locker" - //VOREStation Add begin - icon = 'icons/obj/closet_vr.dmi' //VOREStation Add - icon_state = "secureexp1" - icon_closed = "secureexp" - icon_locked = "secureexp1" - icon_opened = "secureexpopen" - icon_broken = "secureexpbroken" - icon_off = "secureexpoff" - //VOREStation Add end req_access = list(access_explorer) starts_with = list( @@ -60,11 +51,7 @@ /obj/item/device/geiger, /obj/item/weapon/cell/device, /obj/item/device/radio, - /obj/item/stack/marker_beacon/thirty, - /obj/item/weapon/material/knife/tacknife/survival, //VOREStation Add, - /obj/item/weapon/material/knife/machete, //VOREStation Add, - /obj/item/clothing/accessory/holster/machete, //VOREStation Add, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2) //VOREStation Add + /obj/item/stack/marker_beacon/thirty) /obj/structure/closet/secure_closet/explorer/initialize() if(prob(50)) @@ -82,7 +69,7 @@ //SAR Lockers /obj/structure/closet/secure_closet/sar - name = "field medic locker" //VOREStation Edit + name = "search and rescue locker" desc = "Supplies for a wilderness first responder." icon_state = "medical1" icon_closed = "medical" @@ -99,12 +86,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, /obj/item/weapon/reagent_containers/glass/bottle/antitoxin, /obj/item/weapon/storage/belt/medical/emt, - //VOREStation Block Edit - Start, - /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/gun/energy/frontier/locked/holdout, - /obj/item/clothing/mask/gas/explorer, - /obj/item/clothing/suit/storage/hooded/explorer/medic, - //VOREStation Block Edit - End, + /obj/item/clothing/mask/gas, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar, /obj/item/clothing/shoes/boots/winter/explorer, /obj/item/device/radio/headset/sar, @@ -115,7 +97,6 @@ /obj/item/device/healthanalyzer, /obj/item/device/radio/off, /obj/random/medical, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 3, //VOREStation Add, /obj/item/weapon/tool/crowbar, /obj/item/weapon/extinguisher/mini, /obj/item/weapon/storage/box/freezer, @@ -134,17 +115,15 @@ starts_with = list( /obj/item/weapon/storage/backpack/parachute, /obj/item/weapon/material/knife/tacknife/survival, - /obj/item/weapon/gun/energy/frontier/locked/holdout, //VOREStation Add, /obj/item/clothing/head/pilot, /obj/item/clothing/under/rank/pilot1, /obj/item/clothing/suit/storage/toggle/bomber/pilot, - /obj/item/clothing/shoes/boots/winter/explorer, //VOREStation Add, /obj/item/clothing/mask/gas/half, /obj/item/clothing/shoes/black, /obj/item/clothing/gloves/fingerless, /obj/item/device/radio/headset/pilot/alt, /obj/item/device/flashlight, - /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2, //VOREStation Edit, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, /obj/item/weapon/storage/box/flare, /obj/item/weapon/cell/device, diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index 27b0150331..11403493d4 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -1,3 +1,85 @@ +/obj/structure/closet/secure_closet/explorer + icon = 'icons/obj/closet_vr.dmi' + icon_state = "secureexp1" + icon_closed = "secureexp" + icon_locked = "secureexp1" + icon_opened = "secureexpopen" + icon_broken = "secureexpbroken" + icon_off = "secureexpoff" + + starts_with = list( + /obj/item/clothing/under/explorer, + /obj/item/clothing/suit/storage/hooded/explorer, + /obj/item/clothing/mask/gas/explorer, + /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/clothing/gloves/black, + /obj/item/device/radio/headset/explorer, + /obj/item/device/flashlight, + /obj/item/device/gps/explorer, + /obj/item/weapon/storage/box/flare, + /obj/item/device/geiger, + /obj/item/weapon/cell/device, + /obj/item/device/radio, + /obj/item/stack/marker_beacon/thirty, + /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/weapon/material/knife/machete, + /obj/item/clothing/accessory/holster/machete, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2) + +/obj/structure/closet/secure_closet/sar + name = "field medic locker" + + starts_with = list( + /obj/item/weapon/storage/backpack/dufflebag/emt, + /obj/item/weapon/storage/box/autoinjectors, + /obj/item/weapon/storage/box/syringes, + /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, + /obj/item/weapon/reagent_containers/glass/bottle/antitoxin, + /obj/item/weapon/storage/belt/medical/emt, + /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/weapon/gun/energy/frontier/locked/holdout, + /obj/item/clothing/mask/gas/explorer, + /obj/item/clothing/suit/storage/hooded/explorer/medic, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar, + /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/device/radio/headset/sar, + /obj/item/weapon/cartridge/medical, + /obj/item/device/flashlight, + /obj/item/weapon/tank/emergency/oxygen/engi, + /obj/item/clothing/glasses/hud/health, + /obj/item/device/healthanalyzer, + /obj/item/device/radio/off, + /obj/random/medical, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 3, + /obj/item/weapon/tool/crowbar, + /obj/item/weapon/extinguisher/mini, + /obj/item/weapon/storage/box/freezer, + /obj/item/clothing/accessory/storage/white_vest, + /obj/item/taperoll/medical, + /obj/item/device/gps, + /obj/item/device/geiger, + /obj/item/bodybag/cryobag) + +/obj/structure/closet/secure_closet/pilot + starts_with = list( + /obj/item/weapon/storage/backpack/parachute, + /obj/item/weapon/material/knife/tacknife/survival, + /obj/item/weapon/gun/energy/frontier/locked/holdout, + /obj/item/clothing/head/pilot, + /obj/item/clothing/under/rank/pilot1, + /obj/item/clothing/suit/storage/toggle/bomber/pilot, + /obj/item/clothing/shoes/boots/winter/explorer, + /obj/item/clothing/mask/gas/half, + /obj/item/clothing/shoes/black, + /obj/item/clothing/gloves/fingerless, + /obj/item/device/radio/headset/pilot/alt, + /obj/item/device/flashlight, + /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2, + /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, + /obj/item/weapon/storage/box/flare, + /obj/item/weapon/cell/device, + /obj/item/device/radio) + /obj/structure/closet/secure_closet/pathfinder name = "pathfinder locker" icon = 'icons/obj/closet_vr.dmi' diff --git a/vorestation.dme b/vorestation.dme index 518ef9d997..7ac7195465 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2955,7 +2955,6 @@ #include "maps\RandomZLevels\listeningpost.dm" #include "maps\RandomZLevels\snowfield.dm" #include "maps\RandomZLevels\zoo.dm" -#include "maps\southern_cross\southern_cross_jobs.dm" #include "maps\southern_cross\southern_cross_jobs_vr.dm" #include "maps\southern_cross\items\encryptionkey_sc.dm" #include "maps\southern_cross\items\encryptionkey_vr.dm"