diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 1ece4c93a6..518db6f9ec 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -19,6 +19,7 @@ var/list/med = new() var/list/sci = new() var/list/car = new() + var/list/pla = new() //VOREStation Edit var/list/civ = new() var/list/bot = new() var/list/misc = new() @@ -72,6 +73,11 @@ if(real_rank in cargo_positions) car[name] = rank department = 1 + //VOREStation Edit Begin + if(real_rank in planet_positions) + pla[name] = rank + department = 1 + //VOREStation Edit End if(real_rank in civilian_positions) civ[name] = rank department = 1 @@ -118,6 +124,13 @@ for(name in car) dat += "[name][car[name]][isactive[name]]" even = !even + //VOREStation Edit Begin + if(pla.len > 0) + dat += "Exploration" + for(name in pla) + dat += "[name][pla[name]][isactive[name]]" + even = !even + //VOREStation Edit End if(civ.len > 0) dat += "Civilian" for(name in civ) diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm new file mode 100644 index 0000000000..b9b4f60ad7 --- /dev/null +++ b/code/datums/outfits/jobs/civilian_vr.dm @@ -0,0 +1,18 @@ +/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/defines/obj.dm b/code/defines/obj.dm index 479a651867..ee2ddea1c0 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -157,7 +157,7 @@ var/global/list/PDA_Manifest = list() list("cat" = "Medical", "elems" = med), list("cat" = "Science", "elems" = sci), list("cat" = "Cargo", "elems" = car), - // list("cat" = "Planetside", "elems" = pla), // VOREStation Edit - Don't show empty dpt in PDA + list("cat" = "Exploration", "elems" = pla), // VOREStation Edit list("cat" = "Civilian", "elems" = civ), list("cat" = "Silicon", "elems" = bot), list("cat" = "Miscellaneous", "elems" = misc) diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index d246c013d8..8e18827c06 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,4 +78,4 @@ selection_color = "#601C1C" 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/officer diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index cd698067f5..086003a479 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -73,18 +73,15 @@ var/list/medical_positions = list( "Geneticist", "Psychiatrist", "Chemist", - "Field Medic", // VOREStation Edit - Moved SAR from planetary -> medical "Paramedic" ) var/list/science_positions = list( "Research Director", - "Pathfinder", // VOREStation Edit - Added Pathfinder "Scientist", "Geneticist", //Part of both medical and science "Roboticist", - "Explorer", // VOREStation Edit - Moved Explorer from planetary -> science "Xenobiologist" ) @@ -104,7 +101,6 @@ var/list/civilian_positions = list( "Librarian", "Lawyer", "Chaplain", - "Pilot", // VOREStation Edit - Moved Pilot from planetary -> civ USELESS_JOB, //VOREStation Edit - Visitor not Assistant "Intern" //VOREStation Edit - Intern ) @@ -119,9 +115,10 @@ var/list/security_positions = list( var/list/planet_positions = list( - // "Explorer", // VOREStation Edit - Moved Explorer from planetary -> science - // "Pilot", // VOREStation Edit - Moved Pilot from planetary -> civ - // "Search and Rescue" // VOREStation Edit - Moved SAR from planetary -> medical + "Pathfinder", // VOREStation Edit - Added Pathfinder + "Explorer", + "Pilot", + "Field Medic" // VOREStation Edit - Field Medic ) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 42a418c7ad..9b1dd198d9 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -108,7 +108,7 @@ list("cat" = "Science", "jobs" = format_jobs(science_positions)), list("cat" = "Security", "jobs" = format_jobs(security_positions)), list("cat" = "Cargo", "jobs" = format_jobs(cargo_positions)), - list("cat" = "Planetside", "jobs" = format_jobs(planet_positions)), + list("cat" = "Exploration", "jobs" = format_jobs(planet_positions)), //VOREStation Edit list("cat" = "Civilian", "jobs" = format_jobs(civilian_positions)), list("cat" = "CentCom", "jobs" = format_jobs(get_all_centcom_jobs())) ) diff --git a/code/game/world.dm b/code/game/world.dm index b9bdab1ca2..b611c884b0 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -159,6 +159,7 @@ var/world_topic_spam_protect_time = world.timeofday "med" = medical_positions, "sci" = science_positions, "car" = cargo_positions, + "pla" = planet_positions, //VOREStation Edit, "civ" = civilian_positions, "bot" = nonhuman_positions ) diff --git a/code/global.dm b/code/global.dm index ce0d041d26..a1ecb08cff 100644 --- a/code/global.dm +++ b/code/global.dm @@ -173,7 +173,7 @@ var/max_explosion_range = 14 // Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it. var/global/obj/item/device/radio/intercom/omni/global_announcer = new /obj/item/device/radio/intercom/omni(null) -var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian") +var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Exploration", "Civilian") //VOREStation Edit //Icons for in-game HUD glasses. Why don't we just share these a little bit? var/static/icon/ingame_hud = icon('icons/mob/hud.dmi') diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3252219086..fb680f74ab 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -516,7 +516,28 @@ jobs += "" counter = 0 jobs += "" + //VOREStation Edit Start + //Exploration (Purple) + counter = 0 + jobs += "" + jobs += "" + for(var/jobPos in planet_positions) + if(!jobPos) continue + var/datum/job/job = job_master.GetJob(jobPos) + if(!job) continue + if(jobban_isbanned(M, job.title)) + jobs += "" + counter++ + else + jobs += "" + counter++ + + if(counter >= 5) //So things dont get squiiiiished! + jobs += "" + counter = 0 + jobs += "
Exploration Positions
[replacetext(job.title, " ", " ")][replacetext(job.title, " ", " ")]
" + //VOREstation Edit End //Civilian (Grey) counter = 0 jobs += "" @@ -670,6 +691,14 @@ var/datum/job/temp = job_master.GetJob(jobPos) if(!temp) continue joblist += temp.title + //VOREStation Edit Start + if("explorationdept") + for(var/jobPos in planet_positions) + if(!jobPos) continue + var/datum/job/temp = job_master.GetJob(jobPos) + if(!temp) continue + joblist += temp.title + //VOREStation Edit End if("civiliandept") for(var/jobPos in civilian_positions) if(!jobPos) continue diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 70381ee123..ca2bc4d787 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 = 19, list/splitJobs = list("Chief Engineer")) //VOREStation Edit +/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 20, list/splitJobs = list("Pathfinder")) //VOREStation Edit if(!job_master) return diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 2b3dc81b99..e6df874652 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -111,6 +111,7 @@ nanoui is used to open and update nano browser uis add_script("nano_base_callbacks.js") // The NanoBaseCallbacks JS, this is used to set up (before and after update) callbacks which are common to all UIs add_script("nano_base_helpers.js") // The NanoBaseHelpers JS, this is used to set up template helpers which are common to all UIs add_stylesheet("shared.css") // this CSS sheet is common to all UIs + add_stylesheet("shared_vr.css") // VOREStation Add add_stylesheet("icons.css") // this CSS sheet is common to all UIs /** diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi index 88d68a41f1..4a0eba7d74 100644 Binary files a/icons/mob/hud_jobs_vr.dmi and b/icons/mob/hud_jobs_vr.dmi differ 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 251417dbba..7835667529 100644 --- a/maps/southern_cross/southern_cross_jobs_vr.dm +++ b/maps/southern_cross/southern_cross_jobs_vr.dm @@ -1,7 +1,7 @@ -var/const/SAR =(1<<11) -var/const/PILOT =(1<<15) +var/const/PATHFINDER =(1<<11) var/const/EXPLORER =(1<<12) -var/const/PATHFINDER =(1<<13) +var/const/PILOT =(1<<13) +var/const/SAR =(1<<14) /obj/item/weapon/card/id/medical/sar assignment = "Field Medic" @@ -14,9 +14,9 @@ var/const/PATHFINDER =(1<<13) /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/PATHFINDER =(1<<13) /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" @@ -43,31 +43,32 @@ var/const/PATHFINDER =(1<<13) /datum/job/pathfinder title = "Pathfinder" flag = PATHFINDER - department = "Science" + department = "Exploration" + head_position = 1 department_flag = MEDSCI faction = "Station" total_positions = 1 spawn_positions = 1 supervisors = "the research director" - selection_color = "#AD6BAD" + selection_color = "#d6d05c" idtype = /obj/item/weapon/card/id/explorer/head/pathfinder economic_modifier = 7 minimal_player_age = 7 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) + minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, 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 + department = "Exploration" + department_flag = MEDSCI faction = "Station" total_positions = 2 spawn_positions = 2 supervisors = "the pathfinder and the head of personnel" - selection_color = "#515151" + selection_color = "#999440" idtype = /obj/item/weapon/card/id/explorer/pilot economic_modifier = 5 minimal_player_age = 3 @@ -78,13 +79,13 @@ var/const/PATHFINDER =(1<<13) /datum/job/explorer title = "Explorer" flag = EXPLORER - department = "Science" + department = "Exploration" department_flag = MEDSCI faction = "Station" total_positions = 2 spawn_positions = 2 supervisors = "the pathfinder and the research director" - selection_color = "#633D63" + selection_color = "#999440" idtype = /obj/item/weapon/card/id/explorer/explorer economic_modifier = 6 access = list(access_explorer, access_research) @@ -94,16 +95,29 @@ var/const/PATHFINDER =(1<<13) /datum/job/sar title = "Field Medic" flag = SAR - department = "Medical" + department = "Exploration" department_flag = MEDSCI faction = "Station" total_positions = 2 spawn_positions = 2 supervisors = "the pathfinder and the chief medical officer" - selection_color = "#013D3B" + selection_color = "#999440" idtype = /obj/item/weapon/card/id/medical/sar economic_modifier = 6 minimal_player_age = 3 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 diff --git a/nano/css/shared_vr.css b/nano/css/shared_vr.css new file mode 100644 index 0000000000..a368b1fac5 --- /dev/null +++ b/nano/css/shared_vr.css @@ -0,0 +1,5 @@ +th.Exploration{ + background: #bab421; + font-weight: bold; + color: #ffffff; +} \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 95659c3324..2b19169f6b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -329,6 +329,7 @@ #include "code\datums\outfits\costumes\halloween.dm" #include "code\datums\outfits\jobs\cargo.dm" #include "code\datums\outfits\jobs\civilian.dm" +#include "code\datums\outfits\jobs\civilian_vr.dm" #include "code\datums\outfits\jobs\command.dm" #include "code\datums\outfits\jobs\engineering.dm" #include "code\datums\outfits\jobs\job.dm"