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.

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

Add: More alternative titles for jobs #1010

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion modular_ss220/jobs/_jobs.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/modpack/jobs
name = "Работы"
desc = "Новые джобки и изменения старых"
author = "furior, PhantomRU"
author = "furior, PhantomRU, BR54FF"

/datum/modpack/jobs/initialize()
. = ..()
Expand Down
2 changes: 2 additions & 0 deletions modular_ss220/jobs/_jobs.dme
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "code/job/science_jobs.dm"
#include "code/job/security_jobs.dm"
#include "code/job/service_jobs.dm"
#include "code/job/silicon_jobs.dm"
#include "code/job/supervisor.dm"
#include "code/objects/mail.dm"
#include "code/objects/job_objects.dm"
#include "code/objects/engineering_job_objects.dm"
Expand Down
3 changes: 3 additions & 0 deletions modular_ss220/jobs/code/job/engineering_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@
/datum/job/atmos
exp_map = list(EXP_TYPE_ENGINEERING = (300 + NOVICE_JOB_MINUTES))

/datum/job/atmos/New()
. = ..()
LAZYOR(alt_titles, list("Disposals Technician", "Firefighter"))

Check failure on line 69 in modular_ss220/jobs/code/job/engineering_jobs.dm

View workflow job for this annotation

GitHub Actions / Run Linters

Check Grep

modular_ss220/jobs/code/job/engineering_jobs.dm:69: Space indentation detected, please use tab indentation.
4 changes: 3 additions & 1 deletion modular_ss220/jobs/code/job/medical_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@

/datum/job/coroner
exp_map = list(EXP_TYPE_MEDICAL = (180 + NOVICE_JOB_MINUTES))
alt_titles = list("Forensic Pathologist", "Funeral Director", "Medical Examiner", "Mortician")

/datum/job/chemist
exp_map = list(EXP_TYPE_MEDICAL = (300 + NOVICE_JOB_MINUTES))

/datum/job/geneticist
exp_map = list(EXP_TYPE_MEDICAL = (300 + NOVICE_JOB_MINUTES))
alt_titles = list("Genetics Researcher")

/datum/job/virologist
exp_map = list(EXP_TYPE_MEDICAL = (300 + NOVICE_JOB_MINUTES))
Expand All @@ -71,4 +73,4 @@

/datum/job/paramedic
exp_map = list(EXP_TYPE_MEDICAL = (180 + NOVICE_JOB_MINUTES))

alt_titles = list("Field Medic", "Emergency Medical Technician", "First Responder", "Trauma Team Responder")
3 changes: 3 additions & 0 deletions modular_ss220/jobs/code/job/science_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@
/datum/job/roboticist
exp_map = list(EXP_TYPE_SCIENCE = (300 + NOVICE_JOB_MINUTES))

/datum/job/roboticist/New()
. = ..()
alt_titles |= list("Ripperdoc", "Cyberneticist")
5 changes: 4 additions & 1 deletion modular_ss220/jobs/code/job/security_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
head = /obj/item/clothing/head/beret/sec

/datum/job/officer
alt_titles = list("Security Trainer", "Junior Security Officer")
alt_titles = list("Security Trainer", "Junior Security Officer", "Security Peacekeeper", "Security Operative", "Security Agent")

/datum/outfit/job/officer/pre_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
Expand All @@ -59,5 +59,8 @@
/datum/job/warden
exp_map = list(EXP_TYPE_SECURITY = (900 + NOVICE_CADET_JOB_MINUTES))

/datum/job/warden
alt_titles = list("Supervisor", "Brig Overwatch", "Prison Administrator")

/datum/job/hos
exp_map = list(EXP_TYPE_SECURITY = (1200 + NOVICE_CADET_JOB_MINUTES))
19 changes: 19 additions & 0 deletions modular_ss220/jobs/code/job/service_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,25 @@
suit = /obj/item/clothing/suit/chef/red
belt = /obj/item/storage/belt/chef/apron/red

/datum/job/bartender
alt_titles = list("Barista", "Barkeeper")

/datum/job/hydro/New()
. = ..()
alt_titles |= list("Florist", "Gardener", "Herbalist")

/datum/job/clown
alt_titles = list("Joker", "Comedian", "Jester")

/datum/job/mime
alt_titles = list("Pantomimist")

/datum/job/explorer
alt_titles = list("Expeditor", "Exploration Member", "Exploration Engineer", "Exploration Medic")

/datum/job/mining/New()
. = ..()
alt_titles |= list("Prospector", "Geologist")

/datum/job/cargo_tech/New()
. = ..()
Expand Down
6 changes: 6 additions & 0 deletions modular_ss220/jobs/code/job/silicon_jobs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/datum/job/ai
alt_titles = list("Automated Overseer", "Station Intelligence")

/datum/job/cyborg/New()
. = ..()
alt_titles |= list("Android")
5 changes: 5 additions & 0 deletions modular_ss220/jobs/code/job/supervisor.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/datum/job/blueshield
alt_titles = list("Command Bodyguard", "Executive Protection Agent")

/datum/job/judge
alt_titles = list("Judge")
Loading