From ba7b9f46a61d33a1641420f654418228e041631b Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 1 Sep 2023 07:43:55 +1000 Subject: [PATCH] Adds Entrepreneur job, as well as new Entertainer alt-title --- code/datums/outfits/jobs/civilian_vr.dm | 3 + code/game/jobs/job/civilian_vr.dm | 103 +++++++++++++++++- code/game/jobs/jobs.dm | 19 ++-- .../objects/effects/job_start_landmarks.dm | 2 + .../items/weapons/id cards/id_stacks_vr.dm | 4 + icons/mob/hud_jobs_vr.dmi | Bin 4452 -> 4459 bytes maps/groundbase/gb-z1.dmm | 19 ++-- maps/stellar_delight/stellar_delight2.dmm | 47 ++++---- maps/tether/tether-01-surface1.dmm | 65 ++++++----- 9 files changed, 197 insertions(+), 65 deletions(-) diff --git a/code/datums/outfits/jobs/civilian_vr.dm b/code/datums/outfits/jobs/civilian_vr.dm index 3acfffdfd15..c4d0cb37d47 100644 --- a/code/datums/outfits/jobs/civilian_vr.dm +++ b/code/datums/outfits/jobs/civilian_vr.dm @@ -19,3 +19,6 @@ /decl/hierarchy/outfit/job/assistant/entertainer id_type = /obj/item/weapon/card/id/civilian/entertainer + +/decl/hierarchy/outfit/job/assistant/entrepreneur + id_type = /obj/item/weapon/card/id/civilian/entrepreneur diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index c4aa64cfb48..e9f105637ed 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -259,7 +259,7 @@ alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand, "Actor" = /datum/alt_title/actor, "Dancer" = /datum/alt_title/dancer, "Singer" = /datum/alt_title/singer, "Magician" = /datum/alt_title/magician, "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian, - "Artist" = /datum/alt_title/artist, "Fitness Instructor" = /datum/alt_title/fitnessinstructor) + "Artist" = /datum/alt_title/artist, "Game Master" = /datum/alt_title/game_master) // Entertainer Alt Titles /datum/alt_title/actor @@ -302,6 +302,105 @@ title = "Artist" title_blurb = "An Artist's calling is to create beautiful arts! Whatever form may they take, create and have people astonished with your creativity." -/datum/alt_title/fitnessinstructor +/datum/alt_title/game_master + title = "Game Master" + title_blurb = "A Game Master provides recreation for the crew by hosting variety of games. From cards to roleplaying to something more personalized." + +////////////////////////////////// +// Entrepreneur +////////////////////////////////// + +/datum/job/entrepreneur + title = "Entrepreneur" + flag = ENTREPRENEUR + departments = list(DEPARTMENT_CIVILIAN) + department_flag = CIVILIAN + faction = "Station" + total_positions = 4 + spawn_positions = 4 + supervisors = "the Head of Personnel" + selection_color = "#515151" + access = list() + minimal_access = list() + pto_type = PTO_CIVILIAN + + outfit_type = /decl/hierarchy/outfit/job/assistant/entrepreneur + job_description = "An entrepreneur is basically a visitor that obtained special permission to offer personal services to people on station. \ + They will offer people these services and, potentially, even demand payment!" + alt_titles = list("Lawyer" = /datum/alt_title/lawyer, "Private Eye" = /datum/alt_title/private_eye, "Bodyguard" = /datum/alt_title/bodyguard, + "Personal Physician" = /datum/alt_title/personal_physician, "Dentist" = /datum/alt_title/dentist, "Fitness Instructor" = /datum/alt_title/fitness_instructor, + "Yoga Teacher" = /datum/alt_title/yoga_teacher, "Masseuse" = /datum/alt_title/masseuse, "Tradesperson" = /datum/alt_title/tradesperson, + "Streamer" = /datum/alt_title/streamer, "Influencer" = /datum/alt_title/influencer, "Paranormal Investigator" = /datum/alt_title/paranormal_investigator, + "Personal Secretary" = /datum/alt_title/personal_secretary, "Stylist" = /datum/alt_title/stylist, "Fisher" = /datum/alt_title/fisher, + "Fortune Teller" = /datum/alt_title/fortune_teller, "Spirit Healer" = /datum/alt_title/spirit_healer) + +/datum/alt_title/lawyer + title = "Lawyer" + title_blurb = "A Lawyer is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen." + +/datum/alt_title/private_eye + title = "Private Eye" + title_blurb = "A Private Eye is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to." + +/datum/alt_title/bodyguard + title = "Bodyguard" + title_blurb = "A Bodyguard offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough." + +/datum/alt_title/personal_physician + title = "Personal Physician" + title_blurb = "A Personal Physicial is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be." + +/datum/alt_title/dentist + title = "Dentist" + title_blurb = "A Dentist is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will." + +/datum/alt_title/fitness_instructor title = "Fitness Instructor" title_blurb = "A Fitness Instructor dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help." + +/datum/alt_title/yoga_teacher + title = "Yoga Teacher" + title_blurb = "A Yoga Teacher is similar to fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony." + +/datum/alt_title/masseuse + title = "Masseuse" + title_blurb = "A Masseuse is master of physical therapy and working others' bodies with their hands." + +/datum/alt_title/tradesperson + title = "Tradesperson" + title_blurb = "A Tradesperson is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..." + +/datum/alt_title/streamer + title = "Streamer" + title_blurb = "A Streamer is here to entertain. Not the crew! Their audience across exonet!" + +/datum/alt_title/influencer + title = "Influencer" + title_blurb = "An Influencer has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head." + +/datum/alt_title/paranormal_investigator + title = "Paranormal Investigator" + title_blurb = "A Paranormal Investigator looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!" + +/datum/alt_title/personal_secretary + title = "Personal Secretary" + title_blurb = "A Personal Secretary offers services of general assistance. Although it's doubtful anyone will ever actually need those." + +/datum/alt_title/stylist + title = "Stylist" + title_blurb = "A Stylist offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards." + +/datum/alt_title/fisher + title = "Fisher" + title_blurb = "A Fisher is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!" + +/datum/alt_title/fortune_teller + title = "Fortune Teller" + title_blurb = "A Fortune Teller peers into the future, and offers these visions to others. Occasionally those visions may even come true!" + +/datum/alt_title/spirit_healer + title = "Spirit Healer" + title_blurb = "A Spirit Healer offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?" + + + diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 8dfa4fe5afb..104930f9c54 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -11,9 +11,9 @@ var/const/ENGINEER =(1<<6) var/const/ATMOSTECH =(1<<7) var/const/AI =(1<<8) var/const/CYBORG =(1<<9) -var/const/CLOWN =(1<<13) //VOREStation Add -var/const/MIME =(1<<14) //VOREStation Add -var/const/INTERN =(1<<15) //VOREStation Add +var/const/CLOWN =(1<<13) +var/const/MIME =(1<<14) +var/const/INTERN =(1<<15) var/const/MEDSCI =(1<<1) @@ -28,10 +28,10 @@ var/const/PSYCHIATRIST =(1<<7) var/const/ROBOTICIST =(1<<8) var/const/XENOBIOLOGIST =(1<<9) var/const/PARAMEDIC =(1<<10) -var/const/PATHFINDER =(1<<11) //VOREStation Add -var/const/EXPLORER =(1<<12) //VOREStation Add -var/const/SAR =(1<<13) //VOREStation Add -var/const/XENOBOTANIST =(1<<14) //VOREStation Add +var/const/PATHFINDER =(1<<11) +var/const/EXPLORER =(1<<12) +var/const/SAR =(1<<13) +var/const/XENOBOTANIST =(1<<14) var/const/CIVILIAN =(1<<2) @@ -48,8 +48,9 @@ var/const/LAWYER =(1<<9) var/const/CHAPLAIN =(1<<10) var/const/ASSISTANT =(1<<11) var/const/BRIDGE =(1<<12) -var/const/PILOT =(1<<13) //VOREStation Add -var/const/ENTERTAINER =(1<<14) //VOREStation Add +var/const/PILOT =(1<<13) +var/const/ENTERTAINER =(1<<14) +var/const/ENTREPRENEUR =(1<<15) //VOREStation Add var/const/TALON =(1<<3) diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 73d0bd39d81..93abb2bc0d0 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -64,6 +64,8 @@ name = "Clown" /obj/effect/landmark/start/entertainer name = "Entertainer" +/obj/effect/landmark/start/entrepreneur + name = "Entrepreneur" /obj/effect/landmark/start/intern name = "Intern" /obj/effect/landmark/start/iaa diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm index 159041e5717..e91d92ae44e 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm @@ -191,6 +191,10 @@ name = "Entertainer's ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-brown") +/obj/item/weapon/card/id/civilian/entrepreneur + name = "Entrepreneur's ID" + initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-gold") + /obj/item/weapon/card/id/civilian/clown name = "Clown's ID" initial_sprite_stack = list("base-stamp", "top-rainbow", "stamp-n") diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi index ca0df7de06e450757641bf449ab6aeafeed56004..8d55dfc6006a97bc60ebb5db1b0b844645228c50 100644 GIT binary patch delta 3304 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 HMq>XBBi(f- diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 268688936ab..42b5094855c 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -3392,9 +3392,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "hv" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, +/obj/effect/landmark/start/entrepreneur, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "hw" = ( @@ -6529,6 +6527,13 @@ /obj/effect/landmark/start/bartender, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) +"of" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/apparel) "og" = ( /obj/effect/landmark/start/miner, /obj/structure/cable/yellow{ @@ -33003,7 +33008,7 @@ vi Yx hr pi -Pb +hv vP ye CD @@ -33287,7 +33292,7 @@ Ba mL hr zT -hv +of sg BS Pb @@ -33429,7 +33434,7 @@ hr hr hr bL -Pb +hv rG BS zj @@ -33713,7 +33718,7 @@ qE qE dk Vb -Pb +hv ll ye CD diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index be8004e3e97..f0cc76843f7 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -3785,6 +3785,13 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portfore) +"hP" = ( +/obj/structure/bed/chair/bay/comfy/brown{ + dir = 1 + }, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/carpet, +/area/crew_quarters/recreation_area) "hQ" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/surgery, @@ -3866,6 +3873,15 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) +"ia" = ( +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -32; + pixel_y = -32 + }, +/obj/structure/table/bench/steel, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "ib" = ( /obj/machinery/power/grounding_rod, /obj/structure/cable/yellow{ @@ -3880,6 +3896,11 @@ /obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) +"id" = ( +/obj/structure/table/bench/steel, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "ie" = ( /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck2/portsolars) @@ -14219,7 +14240,7 @@ input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; - sensors = list("burn_chamber"="Burn Chamber"); + sensors = list("burn_chamber" = "Burn Chamber"); throwpass = 1 }, /turf/simulated/floor, @@ -14755,7 +14776,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("dist_main_meter"="Surface - Distribution Loop","scrub_main_meter"="Surface - Scrubbers Loop","mair_main_meter"="Surface - Mixed Air Tank","dist_aux_meter"="Station - Distribution Loop","scrub_aux_meter"="Station - Scrubbers Loop","mair_aux_meter"="Station - Mixed Air Tank","mair_mining_meter"="Mining Outpost - Mixed Air Tank") + sensors = list("dist_main_meter" = "Surface - Distribution Loop", "scrub_main_meter" = "Surface - Scrubbers Loop", "mair_main_meter" = "Surface - Mixed Air Tank", "dist_aux_meter" = "Station - Distribution Loop", "scrub_aux_meter" = "Station - Scrubbers Loop", "mair_aux_meter" = "Station - Mixed Air Tank", "mair_mining_meter" = "Mining Outpost - Mixed Air Tank") }, /obj/machinery/power/apc/angled{ dir = 1 @@ -18491,7 +18512,7 @@ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup=7) + starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) }, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) @@ -19423,14 +19444,6 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) -"QJ" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32; - pixel_y = -32 - }, -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "QK" = ( /obj/machinery/atmospherics/omni/mixer{ name = "Air Mixer"; @@ -19662,10 +19675,6 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) -"Ri" = ( -/obj/structure/table/bench/steel, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "Rj" = ( /obj/effect/floor_decal/milspec/color/blue/half{ dir = 4 @@ -32383,7 +32392,7 @@ De QZ Ho aE -QJ +ia WR nt Rq @@ -33092,7 +33101,7 @@ Dl UX UX UX -vS +hP mt mt mt @@ -33660,7 +33669,7 @@ Dl UX UX UX -vS +hP mt mt mt @@ -34229,7 +34238,7 @@ cC iO mt lO -Ri +id sH nt Rq diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index ede3e273c84..74a37e5453d 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -17307,6 +17307,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) +"aCc" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/grey/border, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "aCd" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -18213,6 +18219,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/hallway) +"aDK" = ( +/obj/structure/bed/chair/comfy/black, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "aDL" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18286,6 +18304,13 @@ /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/locker/laundry_arrival) +"aDT" = ( +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/grey/border, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "aDU" = ( /obj/machinery/disposal/deliveryChute{ dir = 1 @@ -18718,6 +18743,14 @@ "aEM" = ( /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) +"aEN" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/grey/border, +/obj/machinery/light/small, +/obj/structure/table/bench/standard, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "aEO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -31132,13 +31165,6 @@ /obj/structure/table/bench/standard, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"bcM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/grey/border, -/obj/machinery/light/small, -/obj/structure/table/bench/standard, -/turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) "bcN" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -37957,12 +37983,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"sch" = ( -/obj/structure/table/bench/standard, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/grey/border, -/turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) "svZ" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -38670,17 +38690,6 @@ "uiK" = ( /turf/simulated/wall, /area/tether/surfacebase/security/weaponsrange) -"uke" = ( -/obj/structure/bed/chair/comfy/black, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/grey/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) "uku" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 10 @@ -55461,7 +55470,7 @@ aSX aTG aSo arm -bcT +aCc aVf aUs aUu @@ -55471,7 +55480,7 @@ aWZ bcj bcF gzO -bcM +aEN aUm aUm aUm @@ -56318,7 +56327,7 @@ aUP rnt aUP aUP -sch +aDT gQH baU baU @@ -56456,7 +56465,7 @@ aah aUm lei wVm -uke +aDK jAq glu bcJ