Skip to content

[MIRROR] [MIRROR] Some extra alt titles #3298

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

Open
VoRe-bot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[MIRROR] [MIRROR] Some extra alt titles #3298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a1ff78
[MIRROR] Some extra alt titles (#11795)
CHOMPStation2StaffMirrorBot Oct 8, 2025
80a2416
[MIRROR] Some extra alt titles
VoRe-bot Oct 9, 2025
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: 5 additions & 0 deletions code/__defines/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
#define JOB_ALT_SUPPLY_COURIER "Supply Courier"
#define JOB_ALT_DISPOSALS_SORTER "Disposals Sorter"
#define JOB_ALT_MAILMAN "Mailman"
#define JOB_ALT_DELIVERY_WORKER "Delivery Worker"

#define JOB_SHAFT_MINER "Shaft Miner"
// Shaft Miner alt titles
Expand Down Expand Up @@ -194,6 +195,8 @@
#define JOB_ALT_FISHER "Fisher"
#define JOB_ALT_FORTUNE_TELLER "Fortune Teller"
#define JOB_ALT_SPIRIT_HEALER "Spirit Healer"
#define JOB_ALT_EDUCATOR "Educator"
#define JOB_ALT_INSTRUCTOR "Instructor"
//___________________________________________________________


Expand Down Expand Up @@ -330,6 +333,7 @@
#define JOB_ALT_SECURITY_DEPUTY "Security Deputy"
#define JOB_ALT_JUNIOR_OFFICER "Junior Officer"
#define JOB_ALT_SECURITY_CONTRACTOR "Security Contractor"
#define JOB_ALT_LOSS_PREVENTION "Loss Prevention Officer"

// CHOMPAdd
#define JOB_BRIG_PHYSICIAN "Brig Physician"
Expand All @@ -340,6 +344,7 @@
#define JOB_ALT_JUNIOR_BRIGPHYS "Junior Brig Physician"
#define JOB_ALT_DETENTION_HEALTH_OFFICER "Detention Health Officer"
// CHOMPAdd End

//___________________________________________________________


Expand Down
6 changes: 6 additions & 0 deletions code/datums/outfits/jobs/civilian_vr.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,9 @@

/decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
l_hand = /obj/item/storage/box/spirit_healer

/decl/hierarchy/outfit/job/assistant/entrepreneur/educator
uniform = /obj/item/clothing/under/suit_jacket/charcoal
r_hand = /obj/item/clipboard
l_pocket = /obj/item/pen/fountain2
r_pocket = /obj/item/laser_pointer
7 changes: 6 additions & 1 deletion code/game/jobs/job/cargo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
because Central Command gives a partial refund."

alt_titles = list(JOB_ALT_CARGO_LOADER = /datum/alt_title/cargo_loader, JOB_ALT_CARGO_HANDLER = /datum/alt_title/cargo_handler, JOB_ALT_SUPPLY_COURIER = /datum/alt_title/supply_courier,
JOB_ALT_DISPOSALS_SORTER = /datum/alt_title/disposal_sorter, JOB_ALT_MAILMAN = /datum/alt_title/mailman)
JOB_ALT_DISPOSALS_SORTER = /datum/alt_title/disposal_sorter, JOB_ALT_MAILMAN = /datum/alt_title/mailman, JOB_ALT_DELIVERY_WORKER = /datum/alt_title/delivery_worker)

/datum/alt_title/supply_courier
title = JOB_ALT_SUPPLY_COURIER
Expand All @@ -85,6 +85,11 @@
title_blurb = "A Mail Carrier is tasked with delivering packages or mail to whoever it might adress."
title_outfit = /decl/hierarchy/outfit/job/cargo/cargo_tech/mailman

/datum/alt_title/delivery_worker
title = JOB_ALT_DELIVERY_WORKER
title_blurb = "A " + JOB_ALT_DELIVERY_WORKER + " takes a more personal role in delivering items directly to those who ordered them."


//////////////////////////////////
// Shaft Miner
//////////////////////////////////
Expand Down
13 changes: 12 additions & 1 deletion code/game/jobs/job/civilian.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,8 @@
JOB_ALT_YOGA_TEACHER = /datum/alt_title/yoga_teacher, JOB_ALT_MASSEUSE = /datum/alt_title/masseuse, JOB_ALT_TRADESPERSON = /datum/alt_title/tradesperson,
JOB_ALT_STREAMER = /datum/alt_title/streamer, JOB_ALT_INFLUENCER = /datum/alt_title/influencer, JOB_ALT_PARANORMAL_INVESTIGATOR = /datum/alt_title/paranormal_investigator,
JOB_ALT_PERSONAL_SECRETARY = /datum/alt_title/personal_secretary, JOB_ALT_STYLIST = /datum/alt_title/stylist, JOB_ALT_FISHER = /datum/alt_title/fisher,
JOB_ALT_FORTUNE_TELLER = /datum/alt_title/fortune_teller, JOB_ALT_SPIRIT_HEALER = /datum/alt_title/spirit_healer)
JOB_ALT_FORTUNE_TELLER = /datum/alt_title/fortune_teller, JOB_ALT_SPIRIT_HEALER = /datum/alt_title/spirit_healer, JOB_ALT_EDUCATOR = /datum/alt_title/educator,
JOB_ALT_INSTRUCTOR = /datum/alt_title/instructor)

/datum/alt_title/lawyer
title = JOB_ALT_LAWYER
Expand Down Expand Up @@ -490,3 +491,13 @@
title = JOB_ALT_SPIRIT_HEALER
title_blurb = "A " + JOB_ALT_SPIRIT_HEALER + " offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?"
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer

/datum/alt_title/educator
title = JOB_ALT_EDUCATOR
title_blurb = "A " + JOB_ALT_EDUCATOR + " provides an education of some sort to the crew. Perhaps somebody coming in to teach a health and safety course, or teach about cultures?"
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/educator

/datum/alt_title/instructor
title = JOB_ALT_INSTRUCTOR
title_blurb = "A " + JOB_ALT_INSTRUCTOR + " provides instructions on how to perform certain tasks, providing training for crew members in new skills."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/educator
6 changes: 5 additions & 1 deletion code/game/jobs/job/security.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@
apprehending criminals. A " + JOB_SECURITY_OFFICER + " is responsible for the health, safety, and processing of any prisoner they arrest. \
No one is above the Law, not Security or Command."
alt_titles = list(JOB_ALT_PATROL_OFFICER = /datum/alt_title/patrol_officer, JOB_ALT_SECURITY_GUARD = /datum/alt_title/security_guard,
JOB_ALT_SECURITY_DEPUTY = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer, JOB_ALT_SECURITY_CONTRACTOR = /datum/alt_title/security_contractor)
JOB_ALT_SECURITY_DEPUTY = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer,
JOB_ALT_SECURITY_CONTRACTOR = /datum/alt_title/security_contractor, JOB_ALT_LOSS_PREVENTION = /datum/alt_title/loss_prevention)

min_age_by_species = list(SPECIES_PROMETHEAN = 3)

Expand All @@ -190,3 +191,6 @@

/datum/alt_title/security_contractor
title = JOB_ALT_SECURITY_CONTRACTOR

/datum/alt_title/loss_prevention
title = JOB_ALT_LOSS_PREVENTION
Loading