diff --git a/modular_ss220/jobs/_jobs.dm b/modular_ss220/jobs/_jobs.dm index 486c0fe25233..f0c4f75d5394 100644 --- a/modular_ss220/jobs/_jobs.dm +++ b/modular_ss220/jobs/_jobs.dm @@ -1,7 +1,7 @@ /datum/modpack/jobs name = "Работы" desc = "Новые джобки и изменения старых" - author = "furior, PhantomRU" + author = "furior, PhantomRU, BR54FF" /datum/modpack/jobs/initialize() . = ..() diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme index 52d6ceb3d615..ff33dadd35b0 100644 --- a/modular_ss220/jobs/_jobs.dme +++ b/modular_ss220/jobs/_jobs.dme @@ -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" diff --git a/modular_ss220/jobs/code/job/engineering_jobs.dm b/modular_ss220/jobs/code/job/engineering_jobs.dm index 8d81610a67e0..d5c1a7a0e92a 100644 --- a/modular_ss220/jobs/code/job/engineering_jobs.dm +++ b/modular_ss220/jobs/code/job/engineering_jobs.dm @@ -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")) diff --git a/modular_ss220/jobs/code/job/medical_jobs.dm b/modular_ss220/jobs/code/job/medical_jobs.dm index 35e9ccdb1b4b..a813e74dc409 100644 --- a/modular_ss220/jobs/code/job/medical_jobs.dm +++ b/modular_ss220/jobs/code/job/medical_jobs.dm @@ -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)) @@ -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") diff --git a/modular_ss220/jobs/code/job/science_jobs.dm b/modular_ss220/jobs/code/job/science_jobs.dm index f76e57d5f8e0..3a240033ecd8 100644 --- a/modular_ss220/jobs/code/job/science_jobs.dm +++ b/modular_ss220/jobs/code/job/science_jobs.dm @@ -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") diff --git a/modular_ss220/jobs/code/job/security_jobs.dm b/modular_ss220/jobs/code/job/security_jobs.dm index 7f4e5f1d02e1..6f0335a9d533 100644 --- a/modular_ss220/jobs/code/job/security_jobs.dm +++ b/modular_ss220/jobs/code/job/security_jobs.dm @@ -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) . = ..() @@ -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)) diff --git a/modular_ss220/jobs/code/job/service_jobs.dm b/modular_ss220/jobs/code/job/service_jobs.dm index 0b288d97325d..7abb3a15f617 100644 --- a/modular_ss220/jobs/code/job/service_jobs.dm +++ b/modular_ss220/jobs/code/job/service_jobs.dm @@ -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() . = ..() diff --git a/modular_ss220/jobs/code/job/silicon_jobs.dm b/modular_ss220/jobs/code/job/silicon_jobs.dm new file mode 100644 index 000000000000..7aba14bd83a9 --- /dev/null +++ b/modular_ss220/jobs/code/job/silicon_jobs.dm @@ -0,0 +1,6 @@ +/datum/job/ai + alt_titles = list("Automated Overseer", "Station Intelligence") + +/datum/job/cyborg/New() + . = ..() + alt_titles |= list("Android") diff --git a/modular_ss220/jobs/code/job/supervisor.dm b/modular_ss220/jobs/code/job/supervisor.dm new file mode 100644 index 000000000000..307b3f70d817 --- /dev/null +++ b/modular_ss220/jobs/code/job/supervisor.dm @@ -0,0 +1,5 @@ +/datum/job/blueshield + alt_titles = list("Command Bodyguard", "Executive Protection Agent") + +/datum/job/judge + alt_titles = list("Judge")