diff --git a/code/game/landmarks/spawnpoint/station/jobs.dm b/code/game/landmarks/spawnpoint/station/jobs.dm index 5af1a161e028..96ac821e63a4 100644 --- a/code/game/landmarks/spawnpoint/station/jobs.dm +++ b/code/game/landmarks/spawnpoint/station/jobs.dm @@ -124,9 +124,10 @@ job_path = /datum/role/job/station/doctor /obj/landmark/spawnpoint/job/head_nurse - name = "Head Nurse" + name = "Senior Physician" // icon_state = "Medical Doctor" - job_path = /datum/role/job/station/head_nurse + job_path = /datum/role/job/station/senior_physician + /obj/landmark/spawnpoint/job/paramedic name = "Paramedic" icon_state = "Paramedic" diff --git a/code/modules/jobs/job_types/station/civillian/assistant.dm b/code/modules/jobs/job_types/station/civillian/assistant.dm index e7ccd81f940e..55e2c25531d7 100644 --- a/code/modules/jobs/job_types/station/civillian/assistant.dm +++ b/code/modules/jobs/job_types/station/civillian/assistant.dm @@ -7,7 +7,7 @@ department_flag = CIVILIAN total_positions = -1 spawn_positions = -1 - supervisors = "nobody! You don't work here" + supervisors = "Nobody! You don't work here." selection_color = "#515151" timeoff_factor = 0 diff --git a/code/modules/jobs/job_types/station/civillian/chaplain.dm b/code/modules/jobs/job_types/station/civillian/chaplain.dm index 02a6c0d11f83..90d927078ea5 100644 --- a/code/modules/jobs/job_types/station/civillian/chaplain.dm +++ b/code/modules/jobs/job_types/station/civillian/chaplain.dm @@ -20,14 +20,14 @@ outfit_type = /datum/outfit/job/station/chaplain desc = "The Chaplain ministers to the spiritual needs of the crew." alt_titles = list( - "Counselor" = /datum/prototype/struct/alt_title/counselor, + "Religious Counselor" = /datum/prototype/struct/alt_title/counselor, "Religious Affairs Advisor" = /datum/prototype/struct/alt_title/chaplain/advisor ) // Chaplain Alt Titles /datum/prototype/struct/alt_title/counselor - title = "Counselor" - title_blurb = "The Counselor attends to the emotional needs of the crew, without a specific medicinal or spiritual focus." + title = "Religious Counselor" + title_blurb = "The Religious Counselor attends to the emotional needs of the crew, usually through the lens of a religion or spiritual ideology." /datum/prototype/struct/alt_title/chaplain/advisor title = "Religious Affairs Advisor" diff --git a/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm b/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm index ab8032505715..60642c768ecd 100644 --- a/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm +++ b/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm @@ -17,14 +17,10 @@ minimal_player_age = 7 outfit_type = /datum/outfit/job/station/internal_affairs_agent - alt_titles = list("Regulatory Affairs Agent" = /datum/prototype/struct/alt_title/iaa/regulator) desc = "An Internal Affairs Agent makes sure that the crew is following Standard Operating Procedure. They also \ handle complaints against crew members, and can have issues brought to the attention of Central Command, \ assuming their paperwork is in order." -/datum/prototype/struct/alt_title/iaa/regulator - title = "Regulatory Affairs Agent" - /* /datum/role/job/station/lawyer/equip(var/mob/living/carbon/human/H) . = ..() diff --git a/code/modules/jobs/job_types/station/civillian/pilot.dm b/code/modules/jobs/job_types/station/civillian/pilot.dm index 9078f9806684..f5ce3fdefcf0 100644 --- a/code/modules/jobs/job_types/station/civillian/pilot.dm +++ b/code/modules/jobs/job_types/station/civillian/pilot.dm @@ -17,15 +17,15 @@ ACCESS_ENGINEERING_AIRLOCK, ) outfit_type = /datum/outfit/job/station/pilot - desc = "A Pilot flies the various shuttles in the Virgo-Erigone System." + desc = "A Pilot flies the various shuttles attached to the installation." alt_titles = list( - "Co-Pilot" = /datum/prototype/struct/alt_title/co_pilot, + "Junior Pilot" = /datum/prototype/struct/alt_title/co_pilot, "Navigator" = /datum/prototype/struct/alt_title/navigator ) /datum/prototype/struct/alt_title/co_pilot - title = "Co-Pilot" - title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" + title = "Junior Pilot" + title_blurb = "A Junior Pilot is still a trainee, here to learn from the Pilot and assist them. They are not qualified to pilot a shuttlecraft solo." /datum/prototype/struct/alt_title/navigator title = "Navigator" diff --git a/code/modules/jobs/job_types/station/command/captain.dm b/code/modules/jobs/job_types/station/command/captain.dm index 87dd8c513ac4..55e5944c10ee 100644 --- a/code/modules/jobs/job_types/station/command/captain.dm +++ b/code/modules/jobs/job_types/station/command/captain.dm @@ -2,7 +2,7 @@ var/datum/legacy_announcement/minor/captain_announcement = new(do_newscast = 1) /datum/role/job/station/captain id = JOB_ID_CAPTAIN - title = "Facility Director" + title = "Captain" economy_payscale = ECONOMY_PAYSCALE_JOB_CAPTAIN flag = CAPTAIN disallow_jobhop = TRUE @@ -25,14 +25,12 @@ var/datum/legacy_announcement/minor/captain_announcement = new(do_newscast = 1) ideal_character_age = 70 // Old geezer captains ftw outfit_type = /datum/outfit/job/station/captain - desc = "The Facility Director manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \ - they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The Facility Director is expected to \ + desc = "The Captain manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \ + they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The Captain is expected to \ have an understanding of Standard Operating Procedure, and is subject to it, and legal action, in the same way as every other crew member." alt_titles = list( "Overseer"= /datum/prototype/struct/alt_title/overseer, - "Site Manager" = /datum/prototype/struct/alt_title/captain/site, - "Director of Operations" = /datum/prototype/struct/alt_title/captain/director, - "Captain" = /datum/prototype/struct/alt_title/captain/captain + "Facility Director" = /datum/prototype/struct/alt_title/captain/fd ) /datum/role/job/station/captain/get_access() @@ -41,14 +39,8 @@ var/datum/legacy_announcement/minor/captain_announcement = new(do_newscast = 1) /datum/prototype/struct/alt_title/overseer title = "Overseer" -/datum/prototype/struct/alt_title/captain/site - title = "Site Manager" - -/datum/prototype/struct/alt_title/captain/director - title = "Director of Operations" - -/datum/prototype/struct/alt_title/captain/captain - title = "Captain" +/datum/prototype/struct/alt_title/captain/fd + title = "Facility Director" /datum/outfit/job/station/captain name = OUTFIT_JOB_NAME("Captain") diff --git a/code/modules/jobs/job_types/station/command/command_secretary.dm b/code/modules/jobs/job_types/station/command/command_secretary.dm index 1cc5f5e8d9fb..5f5cefb9ea97 100644 --- a/code/modules/jobs/job_types/station/command/command_secretary.dm +++ b/code/modules/jobs/job_types/station/command/command_secretary.dm @@ -25,28 +25,11 @@ as well as to assist in piloting the ship when deemed necessary and applicable." alt_titles = list( - "Command Liaison" = /datum/prototype/struct/alt_title/command_liaison, - "Bridge Secretary" = /datum/prototype/struct/alt_title/bridge_secretary, - "Command Assistant" = /datum/prototype/struct/alt_title/command_assistant, "Command Intern" = /datum/prototype/struct/alt_title/command_intern, "Helmsman" = /datum/prototype/struct/alt_title/commsec/helmsman, "Command Secretary" = /datum/prototype/struct/alt_title/commsec/actually_commsec ) -//! todo: WHY DO WE HAVE SO MANY GET RID OF THEM - -/datum/prototype/struct/alt_title/command_liaison - title = "Command Liaison" - title_outfit = /datum/outfit/job/station/command_secretary - -/datum/prototype/struct/alt_title/bridge_secretary - title = "Bridge Secretary" - title_outfit = /datum/outfit/job/station/command_secretary - -/datum/prototype/struct/alt_title/command_assistant - title = "Command Assistant" - title_outfit = /datum/outfit/job/station/command_secretary - /datum/prototype/struct/alt_title/command_intern title = "Command Intern" title_outfit = /datum/outfit/job/station/command_secretary diff --git a/code/modules/jobs/job_types/station/command/head_of_personnel.dm b/code/modules/jobs/job_types/station/command/head_of_personnel.dm index 95b401686641..5c60b1068871 100644 --- a/code/modules/jobs/job_types/station/command/head_of_personnel.dm +++ b/code/modules/jobs/job_types/station/command/head_of_personnel.dm @@ -32,6 +32,7 @@ manage the Supply department, through the Quartermaster. In addition, the Head of Personnel oversees the personal accounts \ of the crew, including their money and access. If necessary, the Head of Personnel is first in line to assume Acting Command." alt_titles = list( + "First Officer" = /datum/prototype/struct/alt_title/fo, "Crew Resources Officer" = /datum/prototype/struct/alt_title/cro, "Deputy Director" = /datum/prototype/struct/alt_title/hop/deputy ) @@ -74,6 +75,9 @@ ACCESS_SUPPLY_QM, ) +/datum/prototype/struct/alt_title/fo + title = "First Officer" + /datum/prototype/struct/alt_title/cro title = "Crew Resources Officer" diff --git a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm index c0a70735458a..d749659f5b18 100644 --- a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm +++ b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm @@ -32,25 +32,27 @@ understanding of the pipes, vents, and scrubbers that move gasses around the station, and to be familiar with proper firefighting procedure." alt_titles = list( - "Atmospherics Maintainer" = /datum/prototype/struct/alt_title/atmos_maint, + "Life Support Technician" = /datum/prototype/struct/alt_title/life_support, "Pipe Network Specialist" = /datum/prototype/struct/alt_title/pipe_spec, "Disposals Technician" = /datum/prototype/struct/alt_title/disposals_tech, - "Artificer" = /datum/prototype/struct/alt_title/atmos_artificer +"Artificer" = /datum/prototype/struct/alt_title/atmos_artificer ) // Atmos Tech Alt Titles -/datum/prototype/struct/alt_title/atmos_maint - title = "Atmospherics Maintainer" +/datum/prototype/struct/alt_title/life_support + title = "Life Support Technician" + title_blurb = "A Life Support Technician is an Atmospheric Technician who specializes in establishing and maintaining breatheable air in a needed area, whether that's the primary facility or a forward base." /datum/prototype/struct/alt_title/pipe_spec title = "Pipe Network Specialist" + title_blurb = "A Pipe Network Specialist is an Atmospheric Technician who specializes in the complicated art of pipe networks." /datum/prototype/struct/alt_title/disposals_tech title = "Disposals Technician" title_blurb = "A Disposals Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." /datum/prototype/struct/alt_title/atmos_artificer - title = "Artificer" + title = "Artificer-Climatic" background_allow = list( /datum/lore/character_background/faction/naramadiguilds ) diff --git a/code/modules/jobs/job_types/station/engineering/chief_engineer.dm b/code/modules/jobs/job_types/station/engineering/chief_engineer.dm index e29e309639e4..7209ea6332e7 100644 --- a/code/modules/jobs/job_types/station/engineering/chief_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/chief_engineer.dm @@ -47,8 +47,7 @@ minimal_player_age = 7 alt_titles = list( - "Head Engineer" = /datum/prototype/struct/alt_title/head_engineer, - "Maintenance Manager" = /datum/prototype/struct/alt_title/maintenance_manager, + "Head of Engineering" = /datum/prototype/struct/alt_title/head_engineer, "Engineering Director" = /datum/prototype/struct/alt_title/engineering_director ) @@ -61,10 +60,7 @@ title = "Engineering Director" /datum/prototype/struct/alt_title/head_engineer - title = "Head Engineer" - -/datum/prototype/struct/alt_title/maintenance_manager - title = "Maintenance Manager" + title = "Head of Engineering" /datum/outfit/job/station/chief_engineer name = OUTFIT_JOB_NAME("Chief engineer") diff --git a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm index 8bb275e78fe6..f127253365e2 100644 --- a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm @@ -30,12 +30,17 @@ outfit_type = /datum/outfit/job/station/station_engineer/senior desc = "A Senior Engineer fulfills similar duties to other engineers, but usually occupies spare time with with training of other, newer Engineers \ - and making sure the Chief's orders are followed to the letter. You are not in command of the Engineering departement." + and giving advice in tricky engineering situtations. You are not in command of the Engineering departement, but should assist the CE in accordance with Standard Operating Procedures." alt_titles = list( + "Engineering Training Specialist" = /datum/prototype/struct/alt_title/engi_trainer, "Artificer-Adept" = /datum/prototype/struct/alt_title/artificer_adept ) +/datum/prototype/struct/alt_title/engi_trainer + title = "Engineering Training Specialist" + title_blurb = "An Engineering Training Specialist is an experienced engineer who dedicates their time and expertise to the training of those who are less knowledgeable." + /datum/prototype/struct/alt_title/artificer_adept title = "Artificer-Adept" background_allow = list( diff --git a/code/modules/jobs/job_types/station/engineering/station_engineer.dm b/code/modules/jobs/job_types/station/engineering/station_engineer.dm index 0b245b654ce9..f1097840ce77 100644 --- a/code/modules/jobs/job_types/station/engineering/station_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/station_engineer.dm @@ -1,6 +1,6 @@ /datum/role/job/station/engineer id = JOB_ID_STATION_ENGINEER - title = "Station Engineer" + title = "Engineer" flag = ENGINEER departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC @@ -30,6 +30,7 @@ "Electrician" = /datum/prototype/struct/alt_title/electrician, "Apprentice Engineer" = /datum/prototype/struct/alt_title/apprentice_engineer, "Construction Engineer" = /datum/prototype/struct/alt_title/construction_engi, + "Damage Control Technician" = /datum/prototype/struct/alt_title/damage_tech, "Artificer-Apprentice" = /datum/prototype/struct/alt_title/artificer_apprentice, "Artificer" = /datum/prototype/struct/alt_title/artificer ) @@ -37,8 +38,8 @@ minimal_player_age = 3 outfit_type = /datum/outfit/job/station/station_engineer - desc = "An Engineer keeps the station running. They repair damages, keep the atmosphere stable, and ensure that power is being \ - generated and distributed. On quiet shifts, they may be called upon to make cosmetic alterations to the station." + desc = "An Engineer keeps the facility running. They repair damages, keep the atmosphere stable, and ensure that power is being \ + generated and distributed. On quiet shifts, they may be called upon to make cosmetic alterations to the facility." /datum/prototype/struct/alt_title/maint_tech title = "Maintenance Technician" title_blurb = "A Maintenance Technician is generally a junior Engineer, and can be expected to run the mildly unpleasant or boring tasks that other \ @@ -46,21 +47,26 @@ /datum/prototype/struct/alt_title/engine_tech title = "Engine Technician" - title_blurb = "An Engine Technician tends to the engine, most commonly a Supermatter crystal. They are expected to be able to keep it stable, and \ + title_blurb = "An Engine Technician tends to the primary engine, whatever form it takes. They are expected to be able to keep it stable, and \ possibly even run it beyond normal tolerances." /datum/prototype/struct/alt_title/electrician title = "Electrician" - title_blurb = "An Electrician's primary duty is making sure power is properly distributed thoughout the station, utilizing solars, substations, and other \ + title_blurb = "An Electrician's primary duty is making sure power is properly distributed thoughout the facility, utilizing solars, substations, and other \ methods to ensure every department has power in an emergency." /datum/prototype/struct/alt_title/apprentice_engineer title = "Apprentice Engineer" + title_blurb = "An Apprentice Engineer is still learning the art of engineering, and should listen to other engineers for direction." /datum/prototype/struct/alt_title/construction_engi title = "Construction Engineer" title_blurb = "A Construction Engineer fulfills similar duties to other engineers, but usually occupies spare time with construction of extra facilities in dedicated areas or \ - as additions to station layout." + as additions to facility layout." + +/datum/prototype/struct/alt_title/damage_tech + title = "Damage Control Technician" + title_blurb = "A Damage Control Technician specializes in repairing a damaged facility as quickly as possible, usually possessing good skills with both atmospherics and quick repair work." /datum/prototype/struct/alt_title/artificer_apprentice title = "Artificer-Apprentice" diff --git a/code/modules/jobs/job_types/station/exploration/explorer.dm b/code/modules/jobs/job_types/station/exploration/explorer.dm index 54f986d32d3f..c16ea2e3148c 100644 --- a/code/modules/jobs/job_types/station/exploration/explorer.dm +++ b/code/modules/jobs/job_types/station/exploration/explorer.dm @@ -22,26 +22,21 @@ desc = "An Explorer searches for interesting things, and returns them to the station." alt_titles = list( "Surveyor" = /datum/prototype/struct/alt_title/surveyor, - "Offsite Scout" = /datum/prototype/struct/alt_title/offsite_scout, "Field Scout" = /datum/prototype/struct/alt_title/explorer/field_scout, - "Pioneer" = /datum/prototype/struct/alt_title/explorer/pioneer, - "Jr. Explorer" = /datum/prototype/struct/alt_title/explorer/junior + "Junior Explorer" = /datum/prototype/struct/alt_title/explorer/junior ) /datum/prototype/struct/alt_title/surveyor title = "Surveyor" - -/datum/prototype/struct/alt_title/offsite_scout - title = "Offsite Scout" + title_blurb = "A Surveyor is an Explorer who specializes in measuring and mapping previously unknown areas." /datum/prototype/struct/alt_title/explorer/field_scout title = "Field Scout" - -/datum/prototype/struct/alt_title/explorer/pioneer - title = "Pioneer" + title_blurb = "A Field Scout is an Explorer who specializes in navigating unknown environment and locating points of interest to the team." /datum/prototype/struct/alt_title/explorer/junior - title = "Jr. Explorer" + title = "Junior Explorer" + title_blurb = "A Junior Explorer has less experience than a full Explorer, and should listen to their direction." /datum/outfit/job/station/explorer name = OUTFIT_JOB_NAME("Explorer") diff --git a/code/modules/jobs/job_types/station/exploration/field_medic.dm b/code/modules/jobs/job_types/station/exploration/field_medic.dm index ff234f881073..40a6ff249cf1 100644 --- a/code/modules/jobs/job_types/station/exploration/field_medic.dm +++ b/code/modules/jobs/job_types/station/exploration/field_medic.dm @@ -28,16 +28,12 @@ outfit_type = /datum/outfit/job/station/sar desc = "A Field medic works as the field doctor of expedition teams." alt_titles = list( - "Expedition Medic" = /datum/prototype/struct/alt_title/expedition_medic, - "Search and Rescue" = /datum/prototype/struct/alt_title/field_medic/sar + "Expedition Medic" = /datum/prototype/struct/alt_title/expedition_medic ) /datum/prototype/struct/alt_title/expedition_medic title = "Expedition Medic" -/datum/prototype/struct/alt_title/field_medic/sar - title = "Search and Rescue" - /datum/outfit/job/station/sar name = OUTFIT_JOB_NAME("Field Medic") uniform = /obj/item/clothing/under/utility/blue diff --git a/code/modules/jobs/job_types/station/exploration/pathfinder.dm b/code/modules/jobs/job_types/station/exploration/pathfinder.dm index 87cd7e3a0ff0..1226d904a818 100644 --- a/code/modules/jobs/job_types/station/exploration/pathfinder.dm +++ b/code/modules/jobs/job_types/station/exploration/pathfinder.dm @@ -30,20 +30,12 @@ outfit_type = /datum/outfit/job/station/pathfinder desc = "The Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions." alt_titles = list( - "Expedition Lead" = /datum/prototype/struct/alt_title/expedition_lead, - "Exploration Manager" = /datum/prototype/struct/alt_title/exploration_manager, - "Lead Pioneer" = /datum/prototype/struct/alt_title/pathfinder/pioneer + "Expedition Lead" = /datum/prototype/struct/alt_title/expedition_lead ) /datum/prototype/struct/alt_title/expedition_lead title = "Expedition Lead" -/datum/prototype/struct/alt_title/exploration_manager - title = "Exploration Manager" - -/datum/prototype/struct/alt_title/pathfinder/pioneer - title = "Lead Pioneer" - /datum/outfit/job/station/pathfinder name = OUTFIT_JOB_NAME("Pathfinder") shoes = /obj/item/clothing/shoes/boots/winter/explorer diff --git a/code/modules/jobs/job_types/station/medical/chief_medical_officer.dm b/code/modules/jobs/job_types/station/medical/chief_medical_officer.dm index 2c936269ae33..fbaba4592018 100644 --- a/code/modules/jobs/job_types/station/medical/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/station/medical/chief_medical_officer.dm @@ -52,8 +52,7 @@ about the importance of Suit Sensors." alt_titles = list ( "Chief Physician" = /datum/prototype/struct/alt_title/cmo/physician, - "Director of Medicine" = /datum/prototype/struct/alt_title/cmo/director, - "Chief Surgeon" = /datum/prototype/struct/alt_title/cmo/surgeon + "Director of Medicine" = /datum/prototype/struct/alt_title/cmo/director ) /datum/prototype/struct/alt_title/cmo/physician @@ -62,9 +61,6 @@ /datum/prototype/struct/alt_title/cmo/director title = "Director of Medicine" -/datum/prototype/struct/alt_title/cmo/surgeon - title = "Chief Surgeon" - /datum/outfit/job/station/chief_medical_officer name = OUTFIT_JOB_NAME("Chief Medical Officer") l_ear =/obj/item/radio/headset/heads/cmo diff --git a/code/modules/jobs/job_types/station/medical/head_nurse.dm b/code/modules/jobs/job_types/station/medical/head_nurse.dm index c7628dc97fd8..546cba82fc0a 100644 --- a/code/modules/jobs/job_types/station/medical/head_nurse.dm +++ b/code/modules/jobs/job_types/station/medical/head_nurse.dm @@ -1,5 +1,5 @@ -/datum/role/job/station/head_nurse - title = "Head Nurse" +/datum/role/job/station/senior_physician + title = "Senior Physician" id = JOB_ID_HEAD_NURSE flag = HEAD_NURSE economy_payscale = ECONOMY_PAYSCALE_JOB_SENIOR @@ -23,18 +23,16 @@ ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ) - outfit_type = /datum/outfit/job/station/medical_doctor/head_nurse - desc = "A Head Nurse is a senior medical professional from the nursing field. They are expected to coordinate and perform the duties associated with \ - nurses, such as sensors monitoring and non-critical care, as well as provide them and other medical staff with guidance and oversight when presented with \ - difficult situations related to patient care." + outfit_type = /datum/outfit/job/station/medical_doctor/senior_physician + desc = "A Senior Physician is an experienced medical professional who fulfills a similar role to other doctors but usually occupies spare time with with training of other, newer doctors \ + and giving advice in tricky medical situtations. You are not in command of the Medical departement, but should assist the CMO in accordance with Standard Operating Procedures." minimal_player_age = 14 minimum_character_age = 25 ideal_character_age = 45 alt_titles = list ( - "Medical Specialist" = /datum/prototype/struct/alt_title/medical_specialist, - "Consultant Physician" = /datum/prototype/struct/alt_title/consultant_physician, + "Medical Training Specialist" = /datum/prototype/struct/alt_title/medical_specialist, "Biotechnical Advisor" = /datum/prototype/struct/alt_title/biotechnical_advisor ) @@ -47,20 +45,14 @@ background_enforce = TRUE /datum/prototype/struct/alt_title/medical_specialist - title = "Medical Specialist" - title_blurb = "A Medical Specialist is a senior medical professional with extensive knowledge within a particular field of medicine which \ - is expected to perform the standard duties of a medical doctor, as well as offer training, guidance and oversight to both resident \ - and attending physicians in all matters, especially when presented with difficult situations within their field of expertise." + title = "Medical Training Specialist" + title_blurb = "A Medical Training Specialist is a senior medical professional with extensive knowledge within a particular field of medicine which \ + is expected to perform the standard duties of a medical doctor, as well as offer training and guidance to both resident \ + and attending physicians in all matters, especially when presented with difficult situations within their field of expertise." title_outfit = /datum/outfit/job/station/medical_doctor -/datum/prototype/struct/alt_title/consultant_physician - title = "Consultant Physician" - title_blurb = "A Consultant Physician is a senior medical professional with extensive training in general medical practice which is expected to perform the \ - standard duties of a medical doctor, as well as offer training, guidance and oversight to resident and attending physicians, especially when presented with difficult \ - situations related to patient care." - title_outfit = /datum/outfit/job/station/medical_doctor -/datum/outfit/job/station/medical_doctor/head_nurse +/datum/outfit/job/station/medical_doctor/senior_physician name = OUTFIT_JOB_NAME("Medical Doctor") uniform = /obj/item/clothing/under/rank/medical suit = /obj/item/clothing/suit/storage/toggle/labcoat diff --git a/code/modules/jobs/job_types/station/medical/medical_doctor.dm b/code/modules/jobs/job_types/station/medical/medical_doctor.dm index 70153d37884b..2ea4ceb48a91 100644 --- a/code/modules/jobs/job_types/station/medical/medical_doctor.dm +++ b/code/modules/jobs/job_types/station/medical/medical_doctor.dm @@ -33,7 +33,6 @@ "Virologist" = /datum/prototype/struct/alt_title/virologist, "Medical Resident" = /datum/prototype/struct/alt_title/doctor/resident, "Medical Intern" = /datum/prototype/struct/alt_title/doctor/intern, - "Orderly" = /datum/prototype/struct/alt_title/orderly, "Biotechnician" = /datum/prototype/struct/alt_title/biotechnician ) @@ -53,12 +52,6 @@ to know the ins and outs of anesthesia and surgery." title_outfit = /datum/outfit/job/station/medical_doctor/surgeon -/datum/prototype/struct/alt_title/orderly - title = "Orderly" - title_blurb = "An Orderly acts as Medbay's general helping hand, assisting any doctor that might need some form of help, as well as handling manual \ - and dirty labor around the department." - title_outfit = /datum/outfit/job/station/medical_doctor/nurse - /datum/prototype/struct/alt_title/emergency_physician title = "Emergency Physician" title_blurb = "An Emergency Physician is a Medical professional trained for stabilizing and treating severely injured and/or dying patients. \ @@ -68,7 +61,7 @@ /datum/prototype/struct/alt_title/nurse title = "Nurse" - title_blurb = "A Nurse acts as a general purpose Doctor's Aide, providing basic care to non-critical patients, and stabilizing critical patients during \ + title_blurb = "A Nurse acts as a general purpose aide to the doctors, providing basic care to non-critical patients, and stabilizing critical patients during \ busy periods. They frequently watch the suit sensors console, to help manage the time of other Doctors. In rare occasions, a Nurse can be \ called upon to revive deceased crew members." title_outfit = /datum/outfit/job/station/medical_doctor/nurse @@ -81,9 +74,11 @@ /datum/prototype/struct/alt_title/doctor/resident title = "Medical Resident" - + title_blurb = "A Medical Resident is someone who has a medical dregree but is still in their resdiency, training under the supervision of more experienced doctors." + /datum/prototype/struct/alt_title/doctor/intern title = "Medical Intern" + title_blurb = "A Medical Intern is someone just learning the ropes of the medical field, learning from and answering to other medbay staff." /datum/outfit/job/station/medical_doctor name = OUTFIT_JOB_NAME("Medical Doctor") diff --git a/code/modules/jobs/job_types/station/medical/paramedic.dm b/code/modules/jobs/job_types/station/medical/paramedic.dm index 45717a8b6a32..3d13371411ff 100644 --- a/code/modules/jobs/job_types/station/medical/paramedic.dm +++ b/code/modules/jobs/job_types/station/medical/paramedic.dm @@ -25,11 +25,10 @@ ACCESS_ENGINEERING_AIRLOCK, ) outfit_type = /datum/outfit/job/station/paramedic - desc = "A Paramedic is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \ + desc = "A Paramedic is primarily concerned with the stabilization and recovery of patients who are unable to make it to the Medical Department on their own. \ They may also be called upon to keep patients stable when Medical is busy or understaffed." alt_titles = list( "Emergency Medical Technician" = /datum/prototype/struct/alt_title/emt, - "Medical Responder" = /datum/prototype/struct/alt_title/medical_responder, "Biotechnical Responder" = /datum/prototype/struct/alt_title/biotech_responder ) @@ -43,13 +42,7 @@ /datum/prototype/struct/alt_title/emt title = "Emergency Medical Technician" - title_blurb = "An Emergency Medical Technician is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ - own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." - title_outfit = /datum/outfit/job/station/paramedic/emt - -/datum/prototype/struct/alt_title/medical_responder - title = "Medical Responder" - title_blurb = "A Medical Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ + title_blurb = "An Emergency Medical Technician is primarily concerned with the stabilization and recovery of patients who are unable to make it to the Medical Department on their \ own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." title_outfit = /datum/outfit/job/station/paramedic/emt diff --git a/code/modules/jobs/job_types/station/medical/psychiatrist.dm b/code/modules/jobs/job_types/station/medical/psychiatrist.dm index 71765e4f41ad..f75400357157 100644 --- a/code/modules/jobs/job_types/station/medical/psychiatrist.dm +++ b/code/modules/jobs/job_types/station/medical/psychiatrist.dm @@ -24,9 +24,7 @@ ails the mentally unwell, frequently under Security supervision. They understand the effects of various psychoactive drugs." alt_titles = list( "Psychologist" = /datum/prototype/struct/alt_title/psychologist, - "Psychoanalyst" = /datum/prototype/struct/alt_title/psychologist/psychoanalyst, - "Counselor" = /datum/prototype/struct/alt_title/counselor, - "Therapist" = /datum/prototype/struct/alt_title/therapist + "Counselor" = /datum/prototype/struct/alt_title/counselor ) /datum/prototype/struct/alt_title/psychologist @@ -35,16 +33,10 @@ called upon to determine whatever ails the mentally unwell, frequently under Security supervision." title_outfit = /datum/outfit/job/station/psychiatrist/psychologist -/datum/prototype/struct/alt_title/psychologist/psychoanalyst - title = "Psychoanalyst" - title_blurb = "A Psychoanalyst provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ - called upon to determine whatever ails the mentally unwell, frequently under Security supervision." - /datum/prototype/struct/alt_title/counselor title = "Counselor" - -/datum/prototype/struct/alt_title/therapist - title = "Therapist" + title_blurb = "A Counselor tends to the emotional needs of the crew, and usually specializes in giving advice to those struggling with interpersonal \ + relationships, addictions, self-esteem issues, and/or grief." /datum/outfit/job/station/psychiatrist name = OUTFIT_JOB_NAME("Psychiatrist") diff --git a/code/modules/jobs/job_types/station/science/research_director.dm b/code/modules/jobs/job_types/station/science/research_director.dm index 557f12603fed..38d4d6d44341 100644 --- a/code/modules/jobs/job_types/station/science/research_director.dm +++ b/code/modules/jobs/job_types/station/science/research_director.dm @@ -58,18 +58,14 @@ are encouraged to allow their staff to perform their own duties." alt_titles = list( "Research Supervisor" = /datum/prototype/struct/alt_title/research_supervisor, - "Head of Development" = /datum/prototype/struct/alt_title/head_of_development, - "Head Scientist" = /datum/prototype/struct/alt_title/head_scientist + "Chief Science Officer" = /datum/prototype/struct/alt_title/cso ) /datum/prototype/struct/alt_title/research_supervisor title = "Research Supervisor" -/datum/prototype/struct/alt_title/head_of_development - title = "Head of Development" - -/datum/prototype/struct/alt_title/head_scientist - title = "Head Scientist" +/datum/prototype/struct/alt_title/cso + title = "Chief Science Officer" /datum/outfit/job/station/research_director name = OUTFIT_JOB_NAME("Research Director") diff --git a/code/modules/jobs/job_types/station/science/roboticist.dm b/code/modules/jobs/job_types/station/science/roboticist.dm index ce228060f5e2..fb5f3427d8e2 100644 --- a/code/modules/jobs/job_types/station/science/roboticist.dm +++ b/code/modules/jobs/job_types/station/science/roboticist.dm @@ -25,14 +25,13 @@ desc = "A Roboticist maintains and repairs the station's synthetics, including crew with prosthetic limbs. \ They can also assist the station by producing simple robots and even pilotable exosuits." alt_titles = list( - "Biomechanical Engineer" = /datum/prototype/struct/alt_title/biomech, - "Mechatronic Engineer" = /datum/prototype/struct/alt_title/mech_tech, - "Prosthetists" = /datum/prototype/struct/alt_title/prosthetists, - "Artificer-Specialist" = /datum/prototype/struct/alt_title/artificer_specialist + "Biomechanical Technician" = /datum/prototype/struct/alt_title/biomech, + "Mechatronic Technician" = /datum/prototype/struct/alt_title/mech_tech, + "Artificer-Biotechnicist" = /datum/prototype/struct/alt_title/artificer_biotechnicist ) -/datum/prototype/struct/alt_title/artificer_specialist - title = "Artificer-Specialist" +/datum/prototype/struct/alt_title/artificer_biotechnicist + title = "Artificer-Biotechnicist" background_allow = list( /datum/lore/character_background/faction/naramadiguilds ) @@ -48,11 +47,6 @@ title_blurb = "A Mechatronic Engineer focuses on the construction and maintenance of Exosuits, and should be well versed in their use. \ They may also be called upon to work on synthetics and prosthetics, if needed." -/datum/prototype/struct/alt_title/prosthetists - title = "Prosthetists" - title_blurb = "Prosthetists design and fabricate medical supportive devices and measure and fit patients for them. These devices \ - include artificial limbs (arms, hands, legs, and feet), braces, and other medical or surgical devices." - /datum/outfit/job/station/roboticist name = OUTFIT_JOB_NAME("Roboticist") uniform = /obj/item/clothing/under/rank/roboticist diff --git a/code/modules/jobs/job_types/station/science/scientist.dm b/code/modules/jobs/job_types/station/science/scientist.dm index 918b4c003095..daef006d325a 100644 --- a/code/modules/jobs/job_types/station/science/scientist.dm +++ b/code/modules/jobs/job_types/station/science/scientist.dm @@ -33,8 +33,7 @@ "Lab Assistant" = /datum/prototype/struct/alt_title/scientist/assistant, "Researcher" = /datum/prototype/struct/alt_title/scientist/researcher, "Xenoarchaeologist" = /datum/prototype/struct/alt_title/scientist/xenoarch, - "Anomalist" = /datum/prototype/struct/alt_title/scientist/anomalist, \ - "Phoron Researcher" = /datum/prototype/struct/alt_title/scientist/phoron_research, + "Anomalist" = /datum/prototype/struct/alt_title/scientist/anomalist, "Circuit Designer" = /datum/prototype/struct/alt_title/scientist/circuit, "Research Field Technician" = /datum/prototype/struct/alt_title/scientist/fieldtech, "Xenobotanist" = /datum/prototype/struct/alt_title/scientist/xenobotanist, @@ -64,12 +63,6 @@ title_blurb = "An Anomalist is a Scientist whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \ function. They work closely with Xenoarchaeologists, or Miners, if either role is present." -/datum/prototype/struct/alt_title/scientist/phoron_research - title = "Phoron Researcher" - title_blurb = "A Phoron Researcher is a specialist in the practical applications of phoron, and has knowledge of its practical uses and dangers. \ - Many Phoron Researchers are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \ - of working with the substance in that state." - /datum/prototype/struct/alt_title/scientist/circuit title = "Circuit Designer" title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ diff --git a/code/modules/jobs/job_types/station/science/senior_researcher.dm b/code/modules/jobs/job_types/station/science/senior_researcher.dm index a3a36c804763..17652bf1a84d 100644 --- a/code/modules/jobs/job_types/station/science/senior_researcher.dm +++ b/code/modules/jobs/job_types/station/science/senior_researcher.dm @@ -10,6 +10,8 @@ supervisors = "the Research Director" selection_color = "#633D63" idtype = /obj/item/card/id/science/scientist + pto_type = PTO_SCIENCE + minimal_access = list( ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, @@ -26,8 +28,16 @@ ideal_character_age = 45 outfit_type = /datum/outfit/job/station/scientist/senior_researcher - pto_type = PTO_SCIENCE - desc = "Lorem Ipsum" + desc = "A Senior Researcher fulfills similar duties to other scientists, but usually occupies spare time with with training of other, newer scientists \ + and giving advice to ensure safety. You are not in command of the Science departement, but should assist the RD in accordance with Standard Operating Procedures." + + alt_titles = list( + "Research Training Specialist" = /datum/prototype/struct/alt_title/sci_trainer + ) + +/datum/prototype/struct/alt_title/sci_trainer + title = "Research Training Specialist" + title_blurb = "An Research Training Specialist is an experienced scientist who dedicates their time and expertise to the training of those who are less knowledgeable." /datum/outfit/job/station/scientist/senior_researcher @@ -45,7 +55,3 @@ satchel_one = /obj/item/storage/backpack/satchel/tox messenger_bag = /obj/item/storage/backpack/messenger/tox dufflebag = /obj/item/storage/backpack/dufflebag/sci - -/datum/outfit/job/station/scientist/xenobiologist - name = OUTFIT_JOB_NAME("Xenobiologist") - id_type = /obj/item/card/id/science/xenobiologist diff --git a/code/modules/jobs/job_types/station/security/detective.dm b/code/modules/jobs/job_types/station/security/detective.dm index 2b631aafd7e7..9f9da5dce977 100644 --- a/code/modules/jobs/job_types/station/security/detective.dm +++ b/code/modules/jobs/job_types/station/security/detective.dm @@ -31,21 +31,12 @@ For crimes only witnessed after the fact, or those with no survivors, they attempt to piece together what they can from pure evidence." alt_titles = list( "Forensic Technician" = /datum/prototype/struct/alt_title/detective/forensics_tech, - "Crime Scene Investigator" = /datum/prototype/struct/alt_title/detective/csi, - "Investigatory Specialist" = /datum/prototype/struct/alt_title/detective/inv_spec + "Crime Scene Investigator" = /datum/prototype/struct/alt_title/detective/csi ) -/datum/prototype/struct/alt_title/detective/inv_spec - title = "Investigatory Specialist" - background_allow = list( - /datum/lore/character_background/faction/onkhera_necropolis - ) - background_enforce = TRUE - /datum/prototype/struct/alt_title/detective/csi title = "Crime Scene Investigator" -/// Detective Alt Titles /datum/prototype/struct/alt_title/detective/forensics_tech title = "Forensic Technician" title_blurb = "A Forensic Technician works more with hard evidence and labwork than a Detective, but they share the purpose of solving crimes." @@ -76,9 +67,3 @@ name = OUTFIT_JOB_NAME("Forensic technician") head = null suit = /obj/item/clothing/suit/storage/forensics/blue - -/datum/outfit/job/station/detective/vice - name = OUTFIT_JOB_NAME("Vice Investigator") - head = null - uniform = /obj/item/clothing/under/hawaiian - suit = null diff --git a/code/modules/jobs/job_types/station/security/warden.dm b/code/modules/jobs/job_types/station/security/warden.dm index d4209d778eb9..559e5aae627c 100644 --- a/code/modules/jobs/job_types/station/security/warden.dm +++ b/code/modules/jobs/job_types/station/security/warden.dm @@ -34,15 +34,16 @@ Armoury gear in a crisis, and retrieving it when the crisis has passed. In an emergency, the Warden may be called upon to direct the \ Security Department as a whole." alt_titles = list( - "Jailor" = /datum/prototype/struct/alt_title/warden/jailor, + "Brig Overseer" = /datum/prototype/struct/alt_title/warden/overseer, "Dispatch Officer" = /datum/prototype/struct/alt_title/warden/dispatch_officer ) -/datum/prototype/struct/alt_title/warden/jailor - title = "Jailor" +/datum/prototype/struct/alt_title/warden/overseer + title = "Brig Overseer" /datum/prototype/struct/alt_title/warden/dispatch_officer title = "Dispatch Officer" + title_blurb = "The Dispatch Officer fulfills the standard duties of the Warden, but also assists with dispatching officers to needed locations to lessen the load on the Head of Security." /datum/outfit/job/station/warden name = OUTFIT_JOB_NAME("Warden") diff --git a/code/modules/jobs/job_types/station/supply/quartermaster.dm b/code/modules/jobs/job_types/station/supply/quartermaster.dm index 53de368f7b57..8764cfead31e 100644 --- a/code/modules/jobs/job_types/station/supply/quartermaster.dm +++ b/code/modules/jobs/job_types/station/supply/quartermaster.dm @@ -31,9 +31,10 @@ ideal_character_age = 40 outfit_type = /datum/outfit/job/station/quartermaster - desc = "The Quartermaster manages the Supply department, checking cargo orders and ensuring supplies get to where they are needed." + desc = "The Quartermaster manages the Supply department under the Head of Personnel, checking cargo orders and ensuring supplies get to where they are needed." alt_titles = list( "Supply Chief" = /datum/prototype/struct/alt_title/supply_chief, + "Logistics Manager" = /datum/prototype/struct/alt_title/logi_man, "Logisticai-Adept" = /datum/prototype/struct/alt_title/logisticai_adept ) @@ -47,6 +48,9 @@ /datum/prototype/struct/alt_title/supply_chief title = "Supply Chief" +/datum/prototype/struct/alt_title/logi_man + title= "Logistics Manager" + /datum/outfit/job/station/quartermaster name = OUTFIT_JOB_NAME("Quartermaster") uniform = /obj/item/clothing/under/rank/cargo diff --git a/code/modules/jobs/job_types/station/supply/shaft_miner.dm b/code/modules/jobs/job_types/station/supply/shaft_miner.dm index 609bc44969d6..6dec92615a2f 100644 --- a/code/modules/jobs/job_types/station/supply/shaft_miner.dm +++ b/code/modules/jobs/job_types/station/supply/shaft_miner.dm @@ -26,7 +26,8 @@ desc = "A Shaft Miner mines and processes minerals to be delivered to departments that need them." alt_titles = list( "Drill Technician" = /datum/prototype/struct/alt_title/miner/drill_tech, - "Belt Miner" = /datum/prototype/struct/alt_title/miner/belt + "Belt Miner" = /datum/prototype/struct/alt_title/miner/belt, + "Salvage Technician" = /datum/prototype/struct/alt_title/salvage ) /datum/prototype/struct/alt_title/miner @@ -39,6 +40,10 @@ /datum/prototype/struct/alt_title/miner/belt title = "Belt Miner" +/datum/prototype/struct/alt_title/salvage + title = "Salvage Technician" + title_blurb = "A Salvage Technician specialized in traveling to wrecks and stripping them of useful items and materials." + /datum/outfit/job/station/shaft_miner name = OUTFIT_JOB_NAME("Shaft Miner") uniform = /obj/item/clothing/under/rank/miner