diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 2b607043b9b..0407b301223 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -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 @@ -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" //___________________________________________________________ @@ -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" @@ -340,6 +344,7 @@ #define JOB_ALT_JUNIOR_BRIGPHYS "Junior Brig Physician" #define JOB_ALT_DETENTION_HEALTH_OFFICER "Detention Health Officer" // CHOMPAdd End + //___________________________________________________________ diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm index f25f6ac08ac..c9e5cabc3c1 100644 --- a/code/datums/outfits/jobs/civilian_vr.dm +++ b/code/datums/outfits/jobs/civilian_vr.dm @@ -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 diff --git a/code/game/jobs/job/cargo.dm b/code/game/jobs/job/cargo.dm index 039395082de..71c29482e59 100644 --- a/code/game/jobs/job/cargo.dm +++ b/code/game/jobs/job/cargo.dm @@ -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 @@ -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 ////////////////////////////////// diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 54a8a04ed95..39081fea365 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -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 @@ -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 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 649816cab83..a119a5842d4 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -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) @@ -190,3 +191,6 @@ /datum/alt_title/security_contractor title = JOB_ALT_SECURITY_CONTRACTOR + +/datum/alt_title/loss_prevention + title = JOB_ALT_LOSS_PREVENTION