Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes redundant and misleading alt-titles, adds title_blurbs to a lot that remain, adds one or two more alt-titles #6056

Merged
merged 10 commits into from
Oct 20, 2023
Merged

Removes redundant and misleading alt-titles, adds title_blurbs to a lot that remain, adds one or two more alt-titles #6056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0d05e25
Makes alt-titles fit the jobs
SingingSpock Oct 3, 2023
fdd0a61
I hate indents
SingingSpock Oct 3, 2023
20efaf8
Merge branch 'Citadel-Station-13:master' into Alt-Titles
SingingSpock Oct 5, 2023
1fa6f92
Fixes a landmark I broke
SingingSpock Oct 5, 2023
acc41be
Why does it want trailing newlines? I don't know. Here they are anyway
SingingSpock Oct 5, 2023
31bf12d
Is this a newline?
SingingSpock Oct 8, 2023
a0736a3
Should re-add all faction locked titles, plus medical intern
SingingSpock Oct 8, 2023
b7a6f2a
Forgot a comma
SingingSpock Oct 8, 2023
2ee027c
More Fixes, re-adds CRO
SingingSpock Oct 8, 2023
de25ff4
Adds Salvage Technician
SingingSpock Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions code/game/landmarks/spawnpoint/station/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/station/civillian/assistant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions code/modules/jobs/job_types/station/civillian/chaplain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
8 changes: 4 additions & 4 deletions code/modules/jobs/job_types/station/civillian/pilot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 6 additions & 14 deletions code/modules/jobs/job_types/station/command/captain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -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")
Expand Down
17 changes: 0 additions & 17 deletions code/modules/jobs/job_types/station/command/command_secretary.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions code/modules/jobs/job_types/station/command/head_of_personnel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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"

Expand Down
12 changes: 7 additions & 5 deletions code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
8 changes: 2 additions & 6 deletions code/modules/jobs/job_types/station/engineering/chief_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand All @@ -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")
Expand Down
7 changes: 6 additions & 1 deletion code/modules/jobs/job_types/station/engineering/senior_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
18 changes: 12 additions & 6 deletions code/modules/jobs/job_types/station/engineering/station_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/role/job/station/engineer
id = JOB_ID_STATION_ENGINEER
title = "Station Engineer"
title = "Engineer"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't really see the need to shorten this to engineer

flag = ENGINEER
departments = list(DEPARTMENT_ENGINEERING)
department_flag = ENGSEC
Expand Down Expand Up @@ -30,37 +30,43 @@
"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
)

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 \
Engineers don't care to do."

/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"
Expand Down
15 changes: 5 additions & 10 deletions code/modules/jobs/job_types/station/exploration/explorer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 1 addition & 5 deletions code/modules/jobs/job_types/station/exploration/field_medic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions code/modules/jobs/job_types/station/exploration/pathfinder.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions code/modules/jobs/job_types/station/medical/chief_medical_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading