diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm index 122113b0db..b9b4f60ad7 100644 --- a/code/datums/outfits/jobs/civilian_vr.dm +++ b/code/datums/outfits/jobs/civilian_vr.dm @@ -1,2 +1,18 @@ -/decl/hierarchy/outfit/job/assistant/survival - flags = OUTFIT_COMPREHENSIVE_SURVIVAL +/decl/hierarchy/outfit/job/assistant/worker + id_type = /obj/item/weapon/card/id/civilian + +/decl/hierarchy/outfit/job/assistant/cargo + id_type = /obj/item/weapon/card/id/cargo + +/decl/hierarchy/outfit/job/assistant/engineer + id_type = /obj/item/weapon/card/id/engineering + flags = OUTFIT_EXTENDED_SURVIVAL + +/decl/hierarchy/outfit/job/assistant/medic + id_type = /obj/item/weapon/card/id/medical + +/decl/hierarchy/outfit/job/assistant/scientist + id_type = /obj/item/weapon/card/id/science + +/decl/hierarchy/outfit/job/assistant/officer + id_type = /obj/item/weapon/card/id/security diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index c76d5e0dcf..d18ef86d16 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -13,7 +13,7 @@ selection_color = "#9b633e" access = list(access_maint_tunnels) minimal_access = list(access_maint_tunnels) - outfit_type = /decl/hierarchy/outfit/job/assistant + outfit_type = /decl/hierarchy/outfit/job/assistant/worker /datum/job/offduty_cargo title = "Off-duty Cargo" @@ -26,7 +26,7 @@ selection_color = "#9b633e" access = list(access_maint_tunnels) minimal_access = list(access_maint_tunnels) - outfit_type = /decl/hierarchy/outfit/job/assistant + outfit_type = /decl/hierarchy/outfit/job/assistant/cargo /datum/job/offduty_engineering title = "Off-duty Engineer" @@ -39,7 +39,7 @@ selection_color = "#5B4D20" access = list(access_maint_tunnels, access_external_airlocks, access_construction) minimal_access = list(access_maint_tunnels, access_external_airlocks) - outfit_type = /decl/hierarchy/outfit/job/assistant + outfit_type = /decl/hierarchy/outfit/job/assistant/engineer /datum/job/offduty_medical title = "Off-duty Medic" @@ -52,7 +52,7 @@ selection_color = "#013D3B" access = list(access_maint_tunnels, access_external_airlocks) minimal_access = list(access_maint_tunnels, access_external_airlocks) - outfit_type = /decl/hierarchy/outfit/job/assistant + outfit_type = /decl/hierarchy/outfit/job/assistant/medic /datum/job/offduty_science title = "Off-duty Scientist" @@ -65,7 +65,7 @@ selection_color = "#633D63" access = list(access_maint_tunnels) minimal_access = list(access_maint_tunnels) - outfit_type = /decl/hierarchy/outfit/job/assistant + outfit_type = /decl/hierarchy/outfit/job/assistant/scientist /datum/job/offduty_security title = "Off-duty Officer" @@ -78,17 +78,4 @@ selection_color = "#601C1C" access = list(access_maint_tunnels) minimal_access = list(access_maint_tunnels) - outfit_type = /decl/hierarchy/outfit/job/assistant - -/datum/job/offduty_exploration - title = "Off-duty Explorer" - latejoin_only = TRUE - timeoff_factor = -1 - total_positions = -1 - faction = "Station" - department = "Exploration" - supervisors = "nobody! Enjoy your time off" - selection_color = "#999440" - access = list(access_maint_tunnels, access_external_airlocks) - minimal_access = list(access_maint_tunnels, access_external_airlocks) - outfit_type = /decl/hierarchy/outfit/job/assistant/survival + outfit_type = /decl/hierarchy/outfit/job/assistant/officer diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 5f3b928300..fe77cf98c5 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -54,7 +54,7 @@ if(alt_title && !(alt_title in job.alt_titles)) pref.player_alt_titles -= job.title -/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 20, list/splitJobs = list("Chief Engineer")) //VOREStation Edit +/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 19, list/splitJobs = list("Atmospheric Technician")) //VOREStation Edit if(!job_master) return diff --git a/maps/southern_cross/job/outfits_vr.dm b/maps/southern_cross/job/outfits_vr.dm index 902a0658cc..08ab9379d3 100644 --- a/maps/southern_cross/job/outfits_vr.dm +++ b/maps/southern_cross/job/outfits_vr.dm @@ -15,3 +15,7 @@ ..() for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents) permit.set_name(H.real_name) + +/decl/hierarchy/outfit/job/assistant/explorer + id_type = /obj/item/weapon/card/id/explorer + flags = OUTFIT_COMPREHENSIVE_SURVIVAL diff --git a/maps/southern_cross/southern_cross_jobs_vr.dm b/maps/southern_cross/southern_cross_jobs_vr.dm index 85399a7045..7835667529 100644 --- a/maps/southern_cross/southern_cross_jobs_vr.dm +++ b/maps/southern_cross/southern_cross_jobs_vr.dm @@ -14,9 +14,9 @@ var/const/SAR =(1<<14) /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) + icon_state = "cyan" + primary_color = rgb(47,189,189) + secondary_color = rgb(127,223,223) /obj/item/weapon/card/id/explorer/pilot assignment = "Pilot" @@ -31,9 +31,9 @@ var/const/SAR =(1<<14) /obj/item/weapon/card/id/explorer/head/ name = "identification card" desc = "A card which represents discovery of the unknown." - icon_state = "greenGold" - primary_color = rgb(47,189,0) - secondary_color = rgb(127,223,95) + icon_state = "cyanGold" + primary_color = rgb(47,189,189) + secondary_color = rgb(127,223,223) /obj/item/weapon/card/id/explorer/head/pathfinder assignment = "Pathfinder" @@ -108,3 +108,16 @@ var/const/SAR =(1<<14) 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 + +/datum/job/offduty_exploration + title = "Off-duty Explorer" + latejoin_only = TRUE + timeoff_factor = -1 + total_positions = -1 + faction = "Station" + department = "Exploration" + supervisors = "nobody! Enjoy your time off" + selection_color = "#999440" + access = list(access_maint_tunnels, access_external_airlocks) + minimal_access = list(access_maint_tunnels, access_external_airlocks) + outfit_type = /decl/hierarchy/outfit/job/assistant/explorer