From b593dc8371aac71941cf8e8914c217eaf0942abb Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:21:29 +1000 Subject: [PATCH 01/22] Adds a shiton of potential fluff alt-titles --- code/game/jobs/job/assistant_vr.dm | 20 ++++++-- code/game/jobs/job/captain_vr.dm | 31 ++++++++++-- code/game/jobs/job/civilian_vr.dm | 75 ++++++++++++++++++++++++++++ code/game/jobs/job/engineering_vr.dm | 30 ++++++++++- code/game/jobs/job/exploration_vr.dm | 38 +++++++------- code/game/jobs/job/medical_vr.dm | 46 ++++++++++++++++- code/game/jobs/job/offduty_vr.dm | 18 +++++++ code/game/jobs/job/science.dm | 1 - code/game/jobs/job/science_vr.dm | 51 ++++++++++++++++++- code/game/jobs/job/security_vr.dm | 27 +++++++++- 10 files changed, 304 insertions(+), 33 deletions(-) diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index e342da3ab31..8d10abdc8a5 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -72,11 +72,6 @@ title_blurb = "A Server helps out kitchen and diner staff with various tasks, primarily food delivery. A Server has no real authority." title_outfit = /decl/hierarchy/outfit/job/service/server - -////////////////////////////////// -// Visitor -////////////////////////////////// - /datum/job/intern/New() ..() if(config) @@ -89,11 +84,17 @@ else return list() + +////////////////////////////////// +// Visitor +////////////////////////////////// + /datum/job/assistant // Visitor title = USELESS_JOB supervisors = "nobody! You don't work here" job_description = "A Visitor is just there to visit the place. They have no real authority or responsibility." timeoff_factor = 0 + alt_titles = list("Guest" = /datum/alt_title/guest, "Traveler" = /datum/alt_title/traveler, "Drifter" = /datum/alt_title/drifter) /datum/job/assistant/New() ..() @@ -103,3 +104,12 @@ /datum/job/assistant/get_access() return list() + +/datum/alt_title/guest + title = "Guest" + +/datum/alt_title/traveler + title = "Traveler" + +/datum/alt_title/drifter + title = "Drifter" diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 4cf8da4183f..ba9c10a514d 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -2,6 +2,14 @@ disallow_jobhop = TRUE pto_type = PTO_CIVILIAN dept_time_required = 80 //Pending something more complicated + alt_titles = list("Overseer"= /datum/alt_title/overseer, "Executive Officer" = /datum/alt_title/executive_officer, "Chief Supervisor" = /datum/alt_title/chief_supervisor) + +/datum/alt_title/executive_officer + title = "Executive Officer" + +/datum/alt_title/chief_supervisor + title = "Chief Supervisor" + /datum/job/hop disallow_jobhop = TRUE @@ -10,8 +18,7 @@ departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET) dept_time_required = 60 - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, - "Deputy Director" = /datum/alt_title/deputy_director) + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager) access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, @@ -26,9 +33,23 @@ access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, access_hop, access_RC_announce, access_keycard_auth) -/datum/alt_title/deputy_director - title = "Deputy Director" +/datum/alt_title/deputy_manager + title = "Deputy Manager" + +/datum/alt_title/staff_manager + title = "Staff Manager" + /datum/job/secretary disallow_jobhop = TRUE - pto_type = PTO_CIVILIAN \ No newline at end of file + pto_type = PTO_CIVILIAN + alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Bridge Secretary" = /datum/alt_title/bridge_secretary, "Command Assistant" = /datum/alt_title/command_assistant) + +/datum/alt_title/command_liaison + title = "Command Liaison" + +/datum/alt_title/bridge_secretary + title = "Bridge Secretary" + +/datum/alt_title/command_assistant + title = "Command Assistant" \ No newline at end of file diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 4529c7c79ad..84f088dee5d 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -1,28 +1,78 @@ /datum/job/bartender pto_type = PTO_CIVILIAN + alt_titles = list("Barkeeper" = /datum/alt_title/barkeeper, "Barista" = /datum/alt_title/barista, "Mixologist" = /datum/alt_title/mixologist) + +/datum/alt_title/barkeeper + title = "Barkeeper" + +/datum/alt_title/mixologist + title = "Mixologist" + /datum/job/chef total_positions = 2 //IT TAKES A LOT TO MAKE A STEW spawn_positions = 2 //A PINCH OF SALT AND LAUGHTER, TOO pto_type = PTO_CIVILIAN + alt_titles = list("Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker) + +/datum/alt_title/kitchen_worker + title = "Kitchen Worker + title_blurb = "A Kitchen Worker has the same duties, though they may be less experienced."" + /datum/job/hydro spawn_positions = 2 pto_type = PTO_CIVILIAN + alt_titles = list("Gardener" = /datum/alt_title/gardener, "Hydroponicist" = /datum/alt_title/hydroponicist, "Farmer" = /datum/alt_title/farmer) + +/datum/alt_title/hydroponicist + title = "Hydroponicist" + +/datum/alt_title/farmer + title = "Farmer" + /datum/job/qm pto_type = PTO_CARGO dept_time_required = 20 + alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief, "Logistics Manager" = /datum/alt_title/logistics_manager) + +/datum/alt_title/logistics_manager + title = "Logistics Manager" + /datum/job/cargo_tech total_positions = 3 spawn_positions = 3 pto_type = PTO_CARGO + alt_titles = list("Supply Courier" = /datum/alt_title/supply_courier, "Cargo Loader" = /datum/alt_title/cargo_loader, "Disposals Sorter" = /datum/alt_title/disposal_sorter) + +/datum/alt_title/supply_courier + title = "Supply Courier" + title_blurb = "A Supply Courier is usually tasked with devlivering packages or cargo directly to whoever requires it." + +/datum/alt_title/cargo_loader + title = "Cargo Loader" + title_blurb = "A Cargo Loader is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle." + +/datum/alt_title/disposal_sorter + title = "Disposals Sorter" + title_blurb = "A Disposals Sorter is usually tasked with operating disposals delivery system, sorting the trash and tagging parcels for delivery." + /datum/job/mining total_positions = 4 spawn_positions = 4 pto_type = PTO_CARGO + alt_titles = list("Drill Technician" = /datum/alt_title/drill_tech, "Deep Space Miner" = /datum/alt_title/deep_space_miner, "Prospector" = /datum/alt_title/prospector) + +/datum/alt_title/deep_space_miner + title = "Deep Space Miner" + title_blurb = "A Deep Space Miner specializes primarily in mining operations in zero-g environments, mostly in asteroid and debris fields." + +/datum/alt_title/prospector + title = "Prospector" + /datum/job/janitor //Lots of janitor substations on station. total_positions = 3 @@ -36,6 +86,7 @@ /datum/alt_title/maid title = "Maid" + /datum/job/librarian total_positions = 2 spawn_positions = 2 @@ -50,12 +101,36 @@ title = "Professor" title_blurb = "The Professor uses the Library as a base of operations to share their vast knowledge with the crew." + /datum/job/lawyer disallow_jobhop = TRUE pto_type = PTO_CIVILIAN + alt_titles = list("Internal Affairs Liaison" = /datum/alt_title/ia_liaison, "Internal Affairs Informant" = /datum/alt_title/ia_informant, + "Internal Affairs Investigator" = /datum/alt_title/ia_investigator) + +/datum/alt_title/ia_liaison + title = "Internal Affairs Liaison" + +/datum/alt_title/ia_informant + title = "Internal Affairs Informant" + +/datum/alt_title/ia_investigator + title = "Internal Affairs Investigator" + /datum/job/chaplain pto_type = PTO_CIVILIAN + alt_titles = list("Missionary" = /datum/alt_title/missionary, "Preacher" = /datum/alt_title/preacher, "Counselor" = /datum/alt_title/counselor, "Guru" = /datum/alt_title/guru) + +/datum/alt_title/guru + title = "Guru" + title_blurb = "The Guru primarily tries to offer spiritual guidance to those who come seeking it." + +/datum/alt_title/missionary + title = "Missionary" + +/datum/alt_title/preacher + title = "Preacher" diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index e0f106ac804..ebf1449df8d 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -12,10 +12,38 @@ access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_heads, access_construction, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload) + alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Engineering Foreman" = /datum/alt_title/engineering_foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager) + +/datum/alt_title/head_engineer + title = "Head Engineer" + +/datum/alt_title/engineering_foreman + title = "Engineering Foreman" + +/datum/alt_title/maintenance_manager + title = "Maintenance Manager" + /datum/job/engineer pto_type = PTO_ENGINEERING + alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, "Engine Technician" = /datum/alt_title/engine_tech, "Electrician" = /datum/alt_title/electrician + "Construction Engineer" = /datum/alt_title/construction_engi) + +/datum/alt_title/construction_engi + title = "Construction Engineer" + title_blurb = "A Construction Engineer fulfills similar duties to other engineers, but usually occupies spare time with construction of extra facilities in dedicated areas or \ + as additions to station layout." + + /datum/job/atmos spawn_positions = 3 - pto_type = PTO_ENGINEERING \ No newline at end of file + pto_type = PTO_ENGINEERING + alt_titles = list("Atmospherics Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech) + +/datum/alt_title/atmos_maint + title = "Atmospherics Maintainer" + +/datum/alt_title/disposals_tech + title = "Disposals Technician" + title_blurb = "A Disposal Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." \ No newline at end of file diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index d555c531a2b..9d1de22d420 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -29,6 +29,8 @@ var/const/SAR =(1<<14) color = "#bab421" sorting_order = 2 // Same as cargo in importance. + + /datum/job/pathfinder title = "Pathfinder" flag = PATHFINDER @@ -50,10 +52,15 @@ var/const/SAR =(1<<14) minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway) outfit_type = /decl/hierarchy/outfit/job/pathfinder job_description = "The Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions." + alt_titles = list("Expedition Leader" = /datum/alt_title/expedition_leader) /datum/alt_title/pathfinder title = "Pathfinder" +/datum/alt_title/expedition_leader + title = "Expedition Leader" + + /datum/job/pilot title = "Pilot" flag = PILOT @@ -71,10 +78,16 @@ var/const/SAR =(1<<14) minimal_access = list(access_pilot) outfit_type = /decl/hierarchy/outfit/job/pilot job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System." + alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot) /datum/alt_title/pilot title = "Pilot" +/datum/alt_title/co_pilot + title = "Co-Pilot" + title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" + + /datum/job/explorer title = "Explorer" flag = EXPLORER @@ -91,10 +104,15 @@ var/const/SAR =(1<<14) minimal_access = list(access_explorer, access_external_airlocks, access_eva) outfit_type = /decl/hierarchy/outfit/job/explorer2 job_description = "An Explorer searches for interesting things, and returns them to the station." + alt_titles = list("Offsite Investigator" = /datum/alt_title/offsite_investigator) /datum/alt_title/explorer title = "Explorer" +/datum/alt_title/offsite_investigator + title = "Offsite Investigator" + + /datum/job/sar title = "Field Medic" flag = SAR @@ -112,24 +130,10 @@ var/const/SAR =(1<<14) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot) outfit_type = /decl/hierarchy/outfit/job/medical/sar job_description = "A Field medic works as the field doctor of expedition teams." + alt_titles = list("Expedition Doctor" = /datum/alt_title/expedition_doctor) /datum/alt_title/field_medic title = "Field Medic" -/datum/job/offduty_exploration - title = "Off-duty Explorer" - latejoin_only = TRUE - timeoff_factor = -1 - total_positions = -1 - faction = "Station" - departments = list(DEPARTMENT_OFFDUTY) - supervisors = "nobody! Enjoy your time off" - selection_color = "#999440" - access = list(access_maint_tunnels, access_external_airlocks) - minimal_access = list(access_maint_tunnels, access_external_airlocks) - outfit_type = /decl/hierarchy/outfit/job/assistant/explorer - job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." - pto_type = PTO_EXPLORATION - -/datum/alt_title/offduty_exp - title = "Off-duty Explorer" \ No newline at end of file +/datum/alt_title/expedition_doctor + title = "Expedition Doctor" \ No newline at end of file diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 72286ca8809..4fa2d844c6b 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -10,16 +10,60 @@ minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels) + alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medbay Manager" = /datum/alt_title/medbay_manager) + +/datum/alt_title/chief_physician + title = "Chief Physician" + +/datum/alt_title/medbay_manager + title = "Medbay Manager" + /datum/job/doctor spawn_positions = 5 pto_type = PTO_MEDICAL + alt_titles = list("Surgeon" = /datum/alt_title/surgeon, "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Virologist" = /datum/alt_title/virologist, + "Physician" = /datum/alt_title/physician) + +/datum/alt_title/physician + title = "Physician" + +/datum/alt_title/therapist + title = "Therapist" + /datum/job/chemist pto_type = PTO_MEDICAL + alt_titles = list("Pharmacist" = /datum/alt_title/pharmacist, "Pharmacologist" = /datum/alt_title/pharmacologist) + +/datum/alt_title/pharmacologist + title = "Pharmacologist" + title_blurb = "A Pharmacologist focuses on the chemical needs of the Medical Department, primarily specializing in producing more advanced forms of medicine." + /datum/job/psychiatrist pto_type = PTO_MEDICAL + alt_titles = list("Psychologist" = /datum/alt_title/psychologist, "Psychoanalyst" = /datum/alt_title/psychoanalyst, "Psychotherapist" = /datum/alt_title/psychotherapist) + +/datum/alt_title/psychoanalyst + title = "Psychoanalyst" + title_blurb = "A Psychoanalyst provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ + called upon to determine whatever ails the mentally unwell, frequently under Security supervision." + title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist + +/datum/alt_title/psychotherapist + title = "Psychotherapist" + title_blurb = "A Psychotherapist provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ + called upon to determine whatever ails the mentally unwell, frequently under Security supervision." + title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist + /datum/job/paramedic - pto_type = PTO_MEDICAL \ No newline at end of file + pto_type = PTO_MEDICAL + alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "First Responder" = /datum/alt_title/first_responder) + +/datum/alt_title/first_responder + title = "First Responder" + title_blurb = "A First Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ + own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." + title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt \ No newline at end of file diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index 416543956c5..7b7f6538938 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -109,3 +109,21 @@ /datum/alt_title/offduty_sec title = "Off-duty Officer" + +/datum/job/offduty_exploration + title = "Off-duty Explorer" + latejoin_only = TRUE + timeoff_factor = -1 + total_positions = -1 + faction = "Station" + departments = list(DEPARTMENT_OFFDUTY) + supervisors = "nobody! Enjoy your time off" + selection_color = "#999440" + access = list(access_maint_tunnels, access_external_airlocks) + minimal_access = list(access_maint_tunnels, access_external_airlocks) + outfit_type = /decl/hierarchy/outfit/job/assistant/explorer + job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." + pto_type = PTO_EXPLORATION + +/datum/alt_title/offduty_exp + title = "Off-duty Explorer" diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 2364486285f..79d1be6c3bf 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -23,7 +23,6 @@ access_tox_storage, access_teleporter, access_sec_doors, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_network) - alt_titles = list("Research Supervisor") minimum_character_age = 25 minimal_player_age = 14 diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 481a31438ef..a8176394dac 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -11,30 +11,73 @@ access_tox_storage, access_teleporter, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany) + alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager, "Head Scientist" = /datum/alt_title/head_scientist) + +/datum/alt_title/research_manager + title = "Research Manager" + +/datum/alt_title/head_scientist + title = "Head Scientist" + /datum/job/scientist spawn_positions = 5 pto_type = PTO_SCIENCE - alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Anomalist" = /datum/alt_title/anomalist, \ - "Phoron Researcher" = /datum/alt_title/phoron_research, "Circuit Designer" = /datum/alt_title/circuit_designer) + alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Xenopaleontologist" = /datum/alt_title/xenopaleontologist, \ + "Anomalist" = /datum/alt_title/anomalist, "Phoron Researcher" = /datum/alt_title/phoron_research, "Gas Physicist" = /datum/alt_title/gas_physicist, \ + "Circuit Designer" = /datum/alt_title/circuit_designer, "Circuit Programmer" = /datum/alt_title/circuit_programmer) access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_xenobotany) minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch) // Unchanged (for now?), mostly here for reference +/datum/alt_title/xenopaleontologist + title = "Xenopaleontologist" + title_blurb = "A Xenopaleontologist enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \ + locations, and as such a Xenopaleontologist should be prepared to handle hostile evironmental conditions." + +/datum/alt_title/xenopaleontologist + title = "Xenopaleontologist" + title_blurb = "A Xenopaleontologist enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \ + locations, and as such a Xenopaleontologist should be prepared to handle hostile evironmental conditions." + +/datum/alt_title/gas_physicist + title = "Gas Physicist" + title_blurb = "A Gas Physicist is a specialist in various practical applications of gasses, but currently focuses their attention on phoron, and has knowledge of its practical uses and dangers. \ + Many Gas Physicists are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \ + of working with the substance in that state." /datum/alt_title/circuit_designer title = "Circuit Designer" title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." +/datum/alt_title/circuit_programmer + title = "Circuit Programmer" + title_blurb = "A Circuit Programmer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ + They work to create various useful devices using the capabilities of integrated circuitry." + + /datum/job/xenobiologist spawn_positions = 3 pto_type = PTO_SCIENCE + alt_titles = list("Xenozoologist" = /datum/alt_title/xenozoologist, "Xenoanthropologist" = /datum/alt_title/xenoanthropologist) + +/datum/alt_title/xenozoologist + title = "Xenozoologist" + +/datum/alt_title/xenoanthropologist + title = "Xenoanthropologist" + title_blurb = "Xenoanthropologist still heavily focuses their study on alien lifeforms, but their specialty leans more towards fellow sapient beings than simple animals." + /datum/job/roboticist total_positions = 3 pto_type = PTO_SCIENCE + alt_titles = list("Assembly Technician" = /datum/alt_title/assembly_tech, "Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech) + +/datum/alt_title/assembly_tech + title = "Assembly Technician" ////////////////////////////////// // Xenobotanist @@ -59,3 +102,7 @@ outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist job_description = "A Xenobotanist grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \ are both safe and beneficial to the station, they may choose to introduce it to the rest of the crew." + alt_titles = list("Xenoflorist" = /datum/alt_title/xenoflorist) + +/datum/alt_title/xenoflorist + title = "Xenoflorist" diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 4f7604b9371..cb1a67526a0 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -11,15 +11,40 @@ access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_construction, access_heads, access_hos, access_RC_announce, access_keycard_auth, access_external_airlocks) + alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief, "Security Manager" = /datum/alt_title/security_manager) + +/datum/alt_title/security_manager + title = "Security Manager" + /datum/job/warden pto_type = PTO_SECURITY dept_time_required = 20 + alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent) + +/datum/alt_title/brig_sentry + title = "Brig Sentry" + +/datum/alt_title/armory_superintendent + title = "Armory Superintendent" + /datum/job/detective pto_type = PTO_SECURITY + alt_titles = list("Investigator" = /datum/alt_title/investigator, "Forensic Technician" = /datum/alt_title/forensic_tech) + +/datum/alt_title/investigator + title = "Investigator" + /datum/job/officer total_positions = 5 spawn_positions = 5 - pto_type = PTO_SECURITY \ No newline at end of file + pto_type = PTO_SECURITY + alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer) + +/datum/alt_title/patrol_officer + title = "Patrol Officer" + +/datum/alt_title/security_guard + title = "Security Guard" \ No newline at end of file From b2c970f043066313e93ee87f14f1768d476e6406 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:25:57 +1000 Subject: [PATCH 02/22] some extras in exploration jobs --- code/game/jobs/job/exploration_vr.dm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 9d1de22d420..8f138d9b1fb 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -52,13 +52,13 @@ var/const/SAR =(1<<14) minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway) outfit_type = /decl/hierarchy/outfit/job/pathfinder job_description = "The Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions." - alt_titles = list("Expedition Leader" = /datum/alt_title/expedition_leader) + alt_titles = list("Expedition Lead" = /datum/alt_title/expedition_lead, "Exploration Manager" = /datum/alt_title/exploration_manager) -/datum/alt_title/pathfinder - title = "Pathfinder" +/datum/alt_title/expedition_lead + title = "Expedition Lead" -/datum/alt_title/expedition_leader - title = "Expedition Leader" +/datum/alt_title/exploration_manager + title = "Exploration Manager" /datum/job/pilot @@ -80,9 +80,6 @@ var/const/SAR =(1<<14) job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System." alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot) -/datum/alt_title/pilot - title = "Pilot" - /datum/alt_title/co_pilot title = "Co-Pilot" title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" @@ -106,9 +103,6 @@ var/const/SAR =(1<<14) job_description = "An Explorer searches for interesting things, and returns them to the station." alt_titles = list("Offsite Investigator" = /datum/alt_title/offsite_investigator) -/datum/alt_title/explorer - title = "Explorer" - /datum/alt_title/offsite_investigator title = "Offsite Investigator" @@ -132,8 +126,5 @@ var/const/SAR =(1<<14) job_description = "A Field medic works as the field doctor of expedition teams." alt_titles = list("Expedition Doctor" = /datum/alt_title/expedition_doctor) -/datum/alt_title/field_medic - title = "Field Medic" - /datum/alt_title/expedition_doctor title = "Expedition Doctor" \ No newline at end of file From a54648dc856e7edf0ad513637b62065342c40b96 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:30:22 +1000 Subject: [PATCH 03/22] removes duplicate xenopaleontologist --- code/game/jobs/job/science_vr.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index a8176394dac..0a71842b84d 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -36,11 +36,6 @@ title_blurb = "A Xenopaleontologist enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \ locations, and as such a Xenopaleontologist should be prepared to handle hostile evironmental conditions." -/datum/alt_title/xenopaleontologist - title = "Xenopaleontologist" - title_blurb = "A Xenopaleontologist enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \ - locations, and as such a Xenopaleontologist should be prepared to handle hostile evironmental conditions." - /datum/alt_title/gas_physicist title = "Gas Physicist" title_blurb = "A Gas Physicist is a specialist in various practical applications of gasses, but currently focuses their attention on phoron, and has knowledge of its practical uses and dangers. \ From 33cf02ab026e91843a31830a22bd885521417ddc Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:42:09 +1000 Subject: [PATCH 04/22] Adds command intern alt-title --- code/game/jobs/job/captain_vr.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index ba9c10a514d..b7c7e9be81b 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -43,7 +43,8 @@ /datum/job/secretary disallow_jobhop = TRUE pto_type = PTO_CIVILIAN - alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Bridge Secretary" = /datum/alt_title/bridge_secretary, "Command Assistant" = /datum/alt_title/command_assistant) + alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Bridge Secretary" = /datum/alt_title/bridge_secretary, + "Command Assistant" = /datum/alt_title/command_assistant, "Command Intern" = /datum/alt_title/command_intern) /datum/alt_title/command_liaison title = "Command Liaison" @@ -52,4 +53,7 @@ title = "Bridge Secretary" /datum/alt_title/command_assistant - title = "Command Assistant" \ No newline at end of file + title = "Command Assistant" + +/datum/alt_title/command_intern + title = "Command Intern" \ No newline at end of file From 0c9db330088fc131acf015e65a96bc5117f03be6 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:43:14 +1000 Subject: [PATCH 05/22] Fixes typos and errors preventing compile --- code/game/jobs/job/civilian_vr.dm | 4 ++-- code/game/jobs/job/engineering_vr.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 84f088dee5d..53aa5ca4fa6 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -16,8 +16,8 @@ alt_titles = list("Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker) /datum/alt_title/kitchen_worker - title = "Kitchen Worker - title_blurb = "A Kitchen Worker has the same duties, though they may be less experienced."" + title = "Kitchen Worker" + title_blurb = "A Kitchen Worker has the same duties, though they may be less experienced." /datum/job/hydro diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index ebf1449df8d..36fb956c8f2 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -26,8 +26,8 @@ /datum/job/engineer pto_type = PTO_ENGINEERING - alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, "Engine Technician" = /datum/alt_title/engine_tech, "Electrician" = /datum/alt_title/electrician - "Construction Engineer" = /datum/alt_title/construction_engi) + alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, "Engine Technician" = /datum/alt_title/engine_tech, + "Electrician" = /datum/alt_title/electrician, "Construction Engineer" = /datum/alt_title/construction_engi) /datum/alt_title/construction_engi title = "Construction Engineer" From 9563cf23b484aa7d148fd14ff8b5949080b564ac Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:46:43 +1000 Subject: [PATCH 06/22] Missing 's' --- code/game/jobs/job/engineering_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 36fb956c8f2..3cc7918ea10 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -46,4 +46,4 @@ /datum/alt_title/disposals_tech title = "Disposals Technician" - title_blurb = "A Disposal Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." \ No newline at end of file + title_blurb = "A Disposals Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." \ No newline at end of file From f5ded42ca83d7fe654173741c6b3bca3fe4594e8 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:53:36 +1000 Subject: [PATCH 07/22] Adds Talon alt-titles too --- code/game/jobs/job/special_vr.dm | 10 ++-------- maps/tether/tether_jobs.dm | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index 5c1a027061a..ec8e01d8fee 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -78,15 +78,12 @@ selection_color = "#515151" economic_modifier = 1 job_description = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!" - alt_titles = list("Clown" = /datum/alt_title/clown, "Jester" = /datum/alt_title/jester) + alt_titles = list("Jester" = /datum/alt_title/jester) whitelist_only = 1 latejoin_only = 1 outfit_type = /decl/hierarchy/outfit/job/clown pto_type = PTO_CIVILIAN -/datum/alt_title/clown - title = "Clown" - /datum/alt_title/jester title = "Jester" @@ -108,15 +105,12 @@ selection_color = "#515151" economic_modifier = 1 job_description = "A Mime is there to entertain the crew and keep high morale using unbelievable performances and acting skills!" - alt_titles = list("Mime" = /datum/alt_title/mime, "Interpretive Dancer" = /datum/alt_title/interpretive_dancer) + alt_titles = list("Interpretive Dancer" = /datum/alt_title/interpretive_dancer) whitelist_only = 1 latejoin_only = 1 outfit_type = /decl/hierarchy/outfit/job/mime pto_type = PTO_CIVILIAN -/datum/alt_title/mime - title = "Mime" - /datum/alt_title/interpretive_dancer title = "Interpretive Dancer" diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index f7f03758d60..bfd08fc8f9a 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -29,6 +29,7 @@ access = list(access_talon) minimal_access = list(access_talon) + /datum/job/talon_doctor title = "Talon Doctor" flag = TALDOC @@ -48,6 +49,11 @@ pto_type = null access = list(access_talon) minimal_access = list(access_talon) + alt_titles = list("Talon Medic" = /datum/alt_title/talon_medic) + +/datum/alt_title/talon_medic + title = "Talon Medic" + /datum/job/talon_engineer title = "Talon Engineer" @@ -68,6 +74,11 @@ pto_type = null access = list(access_talon) minimal_access = list(access_talon) + alt_titles = list("Talon Technician" = /datum/alt_title/talon_tech) + +/datum/alt_title/talon_tech + title = "Talon Technician" + /datum/job/talon_pilot title = "Talon Pilot" @@ -89,6 +100,7 @@ access = list(access_talon) minimal_access = list(access_talon) + /datum/job/talon_guard title = "Talon Guard" flag = TALSEC @@ -108,6 +120,11 @@ pto_type = null access = list(access_talon) minimal_access = list(access_talon) + alt_titles = list("Talon Security" = /datum/alt_title/talon_security) + +/datum/alt_title/talon_security + title = "Talon Security" + /decl/hierarchy/outfit/job/talon_captain name = OUTFIT_JOB_NAME("Talon Captain") From ae751d304a08b8d81102c428f489ca775e2beccb Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 29 Aug 2020 21:56:01 +1000 Subject: [PATCH 08/22] ALL talon jobs. Why do my files don't save properly. --- maps/tether/tether_jobs.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index bfd08fc8f9a..a737f96bd06 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -28,7 +28,10 @@ pto_type = null access = list(access_talon) minimal_access = list(access_talon) + alt_titles = list("Talon Commander" = /datum/alt_title/talon_commander) +/datum/alt_title/talon_commander + title = "Talon Commander" /datum/job/talon_doctor title = "Talon Doctor" @@ -99,6 +102,10 @@ pto_type = null access = list(access_talon) minimal_access = list(access_talon) + alt_titles = list("Talon Helmsman" = /datum/alt_title/talon_helmsman) + +/datum/alt_title/talon_helmsman + title = "Talon Helmsman" /datum/job/talon_guard From 1a38b63c5277205de759f2ceeb7f384714da5229 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 30 Aug 2020 08:12:22 +1000 Subject: [PATCH 09/22] Early feedback changes + even more alt-titles --- code/game/jobs/job/civilian_vr.dm | 62 ++++++++++++++++++++++------ code/game/jobs/job/exploration_vr.dm | 14 +++++-- code/game/jobs/job/medical_vr.dm | 18 ++++---- code/game/jobs/job/security_vr.dm | 13 ++++-- code/game/jobs/job/special_vr.dm | 6 +-- 5 files changed, 84 insertions(+), 29 deletions(-) diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 53aa5ca4fa6..ab2bc7fc7c1 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -13,7 +13,10 @@ total_positions = 2 //IT TAKES A LOT TO MAKE A STEW spawn_positions = 2 //A PINCH OF SALT AND LAUGHTER, TOO pto_type = PTO_CIVILIAN - alt_titles = list("Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker) + alt_titles = list("Sous-chef" = /datum/alt_title/souschef,"Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker) + +/datum/alt_title/souschef + title = "Sous-chef" /datum/alt_title/kitchen_worker title = "Kitchen Worker" @@ -23,11 +26,14 @@ /datum/job/hydro spawn_positions = 2 pto_type = PTO_CIVILIAN - alt_titles = list("Gardener" = /datum/alt_title/gardener, "Hydroponicist" = /datum/alt_title/hydroponicist, "Farmer" = /datum/alt_title/farmer) + alt_titles = list("Gardener" = /datum/alt_title/gardener, "Hydroponicist" = /datum/alt_title/hydroponicist, "Cultivator" = /datum/alt_title/cultivator, "Farmer" = /datum/alt_title/farmer) /datum/alt_title/hydroponicist title = "Hydroponicist" +/datum/alt_title/cultivator + title = "Cultivator" + /datum/alt_title/farmer title = "Farmer" @@ -64,7 +70,7 @@ total_positions = 4 spawn_positions = 4 pto_type = PTO_CARGO - alt_titles = list("Drill Technician" = /datum/alt_title/drill_tech, "Deep Space Miner" = /datum/alt_title/deep_space_miner, "Prospector" = /datum/alt_title/prospector) + alt_titles = list("Deep Space Miner" = /datum/alt_title/deep_space_miner, "Drill Technician" = /datum/alt_title/drill_tech, "Prospector" = /datum/alt_title/prospector) /datum/alt_title/deep_space_miner title = "Deep Space Miner" @@ -77,8 +83,9 @@ /datum/job/janitor //Lots of janitor substations on station. total_positions = 3 spawn_positions = 3 - alt_titles = list("Custodian" = /datum/alt_title/custodian, "Sanitation Technician" = /datum/alt_title/sanitation_tech, "Maid" = /datum/alt_title/maid) pto_type = PTO_CIVILIAN + alt_titles = list("Custodian" = /datum/alt_title/custodian, "Sanitation Technician" = /datum/alt_title/sanitation_tech, + "Maid" = /datum/alt_title/maid, "Garbage Collector" = /datum/alt_title/garbage_collector) /datum/alt_title/sanitation_tech title = "Sanitation Technician" @@ -86,17 +93,30 @@ /datum/alt_title/maid title = "Maid" +/datum/alt_title/garbage_collector + title = "Garbage Collector" + title_blurb = "A Garbage Collector keeps the station clean, though focuses moreso on collecting larger trash, with wet cleaning being secondary task." + /datum/job/librarian total_positions = 2 spawn_positions = 2 - alt_titles = list("Journalist" = /datum/alt_title/journalist, "Writer" = /datum/alt_title/writer, "Historian" = /datum/alt_title/historian, "Professor" = /datum/alt_title/professor) + alt_titles = list("Journalist" = /datum/alt_title/journalist, "Reporter" = , "Writer" = /datum/alt_title/writer, + "Historian" = /datum/alt_title/historian, "Archivist" = /datum/alt_title/archivist, "Professor" = /datum/alt_title/professor) pto_type = PTO_CIVILIAN +/datum/alt_title/reporter + title = "Reporter" + title_blurb = "The Reporter uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera." + /datum/alt_title/historian title = "Historian" title_blurb = "The Historian uses the Library as a base of operation to record any important events occuring on station." +/datum/alt_title/archivist + title = "Archivist" + title_blurb = "The Archivist uses the Library as a base of operation to record any important events occuring on station." + /datum/alt_title/professor title = "Professor" title_blurb = "The Professor uses the Library as a base of operations to share their vast knowledge with the crew." @@ -105,14 +125,14 @@ /datum/job/lawyer disallow_jobhop = TRUE pto_type = PTO_CIVILIAN - alt_titles = list("Internal Affairs Liaison" = /datum/alt_title/ia_liaison, "Internal Affairs Informant" = /datum/alt_title/ia_informant, + alt_titles = list("Internal Affairs Liaison" = /datum/alt_title/ia_liaison, "Internal Affairs Delegate" = /datum/alt_title/ia_delegate, "Internal Affairs Investigator" = /datum/alt_title/ia_investigator) /datum/alt_title/ia_liaison title = "Internal Affairs Liaison" -/datum/alt_title/ia_informant - title = "Internal Affairs Informant" +/datum/alt_title/ia_delegate + title = "Internal Affairs Delegate" /datum/alt_title/ia_investigator title = "Internal Affairs Investigator" @@ -154,17 +174,35 @@ outfit_type = /decl/hierarchy/outfit/job/assistant job_description = "An entertainer does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic." - alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand) + 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, + "Comedian" = /datum/alt_title/comedian) // Entertainer Alt Titles +/datum/alt_title/actor + title = "Actor" + title_blurb = "An Actor is someone who acts out a role! Whatever sort of character it is, get into it and impress people with power of comedy and tragedy!" + /datum/alt_title/performer title = "Performer" - title_blurb = "A Performer is someone who performs! Acting, dancing, wrestling, etc!" + title_blurb = "A Performer is someone who performs! Whatever sort of performance will come to your mind, the world's a stage!" /datum/alt_title/musician title = "Musician" - title_blurb = "A Musician is someone who makes music! Singing, playing instruments, slam poetry, it's your call!" + title_blurb = "A Musician is someone who makes music with a wide variety of musical instruments!" /datum/alt_title/stagehand title = "Stagehand" - title_blurb = "A Stagehand typically performs everything the rest of the entertainers don't. Operate lights, shutters, windows, or narrate through your voicebox!" \ No newline at end of file + title_blurb = "A Stagehand typically performs everything the rest of the entertainers don't. Operate lights, shutters, windows, or narrate through your voicebox!" + +/datum/alt_title/dancer + title = "Dancer" + title_blurb = "A Dancer is someone who impresses people through power of their own body! From waltz to breakdance, as long as crowd as cheering!" + +/datum/alt_title/singer + title = "Singer" + title_blurb = "A Singer is someone with gift of melodious voice! Impress people with your vocal range!" + +/datum/alt_title/comedian + title = "Comedian" + title_blurb = "A Comedian will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!" \ No newline at end of file diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 8f138d9b1fb..62ec4b8922f 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -78,12 +78,15 @@ var/const/SAR =(1<<14) minimal_access = list(access_pilot) outfit_type = /decl/hierarchy/outfit/job/pilot job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System." - alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot) + alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator) /datum/alt_title/co_pilot title = "Co-Pilot" title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" +/datum/alt_title/navigator + title = "Navigator" + /datum/job/explorer title = "Explorer" @@ -101,10 +104,13 @@ var/const/SAR =(1<<14) minimal_access = list(access_explorer, access_external_airlocks, access_eva) outfit_type = /decl/hierarchy/outfit/job/explorer2 job_description = "An Explorer searches for interesting things, and returns them to the station." - alt_titles = list("Offsite Investigator" = /datum/alt_title/offsite_investigator) + alt_titles = list("Surveyor" = /datum/alt_title/surveyor, "Offsite Scout" = /datum/alt_title/offsite_scout) -/datum/alt_title/offsite_investigator - title = "Offsite Investigator" +/datum/alt_title/surveyor + title = "Surveyor" + +/datum/alt_title/offsite_scout + title = "Offsite Scout" /datum/job/sar diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 4fa2d844c6b..fdbe3178fac 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -10,26 +10,30 @@ minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels) - alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medbay Manager" = /datum/alt_title/medbay_manager) + alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, "Healthcare Manager" = /datum/alt_title/healthcare_manager) /datum/alt_title/chief_physician title = "Chief Physician" -/datum/alt_title/medbay_manager - title = "Medbay Manager" +/datum/alt_title/medical_director + title = "Medical Director" + +/datum/alt_title/healthcare_manager + title = "Healthcare Manager" /datum/job/doctor spawn_positions = 5 pto_type = PTO_MEDICAL - alt_titles = list("Surgeon" = /datum/alt_title/surgeon, "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Virologist" = /datum/alt_title/virologist, - "Physician" = /datum/alt_title/physician) + alt_titles = list("Physician" = /datum/alt_title/physician, "Medical Practitioner" = /datum/alt_title/medical_practitioner, "Surgeon" = /datum/alt_title/surgeon, + "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Virologist" = /datum/alt_title/virologist) + /datum/alt_title/physician title = "Physician" -/datum/alt_title/therapist - title = "Therapist" +/datum/alt_title/medical_practitioner + title = "Medical Practitioner" /datum/job/chemist diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index cb1a67526a0..e9b9017d9af 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -31,20 +31,27 @@ /datum/job/detective pto_type = PTO_SECURITY - alt_titles = list("Investigator" = /datum/alt_title/investigator, "Forensic Technician" = /datum/alt_title/forensic_tech) + alt_titles = list("Investigator" = /datum/alt_title/investigator, "Security Inspector" = /datum/alt_title/security_inspector, "Forensic Technician" = /datum/alt_title/forensic_tech) /datum/alt_title/investigator title = "Investigator" +/datum/alt_title/security_inspector + title = "Security Inspector" + /datum/job/officer total_positions = 5 spawn_positions = 5 pto_type = PTO_SECURITY - alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer) + alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, + "Security Deputy" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer) /datum/alt_title/patrol_officer title = "Patrol Officer" /datum/alt_title/security_guard - title = "Security Guard" \ No newline at end of file + title = "Security Guard" + +/datum/alt_title/security_deputy + title = "Security Deputy" \ No newline at end of file diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index ec8e01d8fee..e5e7947ce89 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -105,14 +105,14 @@ selection_color = "#515151" economic_modifier = 1 job_description = "A Mime is there to entertain the crew and keep high morale using unbelievable performances and acting skills!" - alt_titles = list("Interpretive Dancer" = /datum/alt_title/interpretive_dancer) + alt_titles = list("Poseur" = /datum/alt_title/poseur) whitelist_only = 1 latejoin_only = 1 outfit_type = /decl/hierarchy/outfit/job/mime pto_type = PTO_CIVILIAN -/datum/alt_title/interpretive_dancer - title = "Interpretive Dancer" +/datum/alt_title/poseur + title = "Poseur" /datum/job/mime/get_access() if(config.assistant_maint) From a5c3fff223b6c4c83bed9a764f207b9a9669a0af Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 30 Aug 2020 08:17:01 +1000 Subject: [PATCH 10/22] Few typos --- code/game/jobs/job/civilian_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index ab2bc7fc7c1..76f66ac182f 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -101,7 +101,7 @@ /datum/job/librarian total_positions = 2 spawn_positions = 2 - alt_titles = list("Journalist" = /datum/alt_title/journalist, "Reporter" = , "Writer" = /datum/alt_title/writer, + alt_titles = list("Journalist" = /datum/alt_title/journalist, "Reporter" = /datum/alt_title/reporter, "Writer" = /datum/alt_title/writer, "Historian" = /datum/alt_title/historian, "Archivist" = /datum/alt_title/archivist, "Professor" = /datum/alt_title/professor) pto_type = PTO_CIVILIAN @@ -174,7 +174,7 @@ outfit_type = /decl/hierarchy/outfit/job/assistant job_description = "An entertainer does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic." - alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand + 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, "Comedian" = /datum/alt_title/comedian) From 6b816fd0cefb9dc1f6093b04864981664032578c Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 30 Aug 2020 16:19:41 +1000 Subject: [PATCH 11/22] More feedback changes and additions --- code/game/jobs/job/assistant_vr.dm | 5 +---- code/game/jobs/job/civilian_vr.dm | 12 ++++++++++-- code/game/jobs/job/exploration_vr.dm | 6 +++--- code/game/jobs/job/medical_vr.dm | 8 ++++---- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index 8d10abdc8a5..bcf11841097 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -94,7 +94,7 @@ supervisors = "nobody! You don't work here" job_description = "A Visitor is just there to visit the place. They have no real authority or responsibility." timeoff_factor = 0 - alt_titles = list("Guest" = /datum/alt_title/guest, "Traveler" = /datum/alt_title/traveler, "Drifter" = /datum/alt_title/drifter) + alt_titles = list("Guest" = /datum/alt_title/guest, "Traveler" = /datum/alt_title/traveler) /datum/job/assistant/New() ..() @@ -110,6 +110,3 @@ /datum/alt_title/traveler title = "Traveler" - -/datum/alt_title/drifter - title = "Drifter" diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 76f66ac182f..af957a5226b 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -1,10 +1,13 @@ /datum/job/bartender pto_type = PTO_CIVILIAN - alt_titles = list("Barkeeper" = /datum/alt_title/barkeeper, "Barista" = /datum/alt_title/barista, "Mixologist" = /datum/alt_title/mixologist) + alt_titles = list("Barkeeper" = /datum/alt_title/barkeeper, "Barmaid" = /datum/alt_title/barmaid, "Barista" = /datum/alt_title/barista, "Mixologist" = /datum/alt_title/mixologist) /datum/alt_title/barkeeper title = "Barkeeper" +/datum/alt_title/barmaid + title = "Barmaid" + /datum/alt_title/mixologist title = "Mixologist" @@ -51,7 +54,8 @@ total_positions = 3 spawn_positions = 3 pto_type = PTO_CARGO - alt_titles = list("Supply Courier" = /datum/alt_title/supply_courier, "Cargo Loader" = /datum/alt_title/cargo_loader, "Disposals Sorter" = /datum/alt_title/disposal_sorter) + alt_titles = list("Cargo Loader" = /datum/alt_title/cargo_loader, "Cargo Handler" = /datum/alt_title/cargo_handler, "Supply Courier" = /datum/alt_title/supply_courier, + "Disposals Sorter" = /datum/alt_title/disposal_sorter) /datum/alt_title/supply_courier title = "Supply Courier" @@ -61,6 +65,10 @@ title = "Cargo Loader" title_blurb = "A Cargo Loader is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle." +/datum/alt_title/cargo_handler + title = "Cargo Handler" + title_blurb = "A Cargo Loader is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle." + /datum/alt_title/disposal_sorter title = "Disposals Sorter" title_blurb = "A Disposals Sorter is usually tasked with operating disposals delivery system, sorting the trash and tagging parcels for delivery." diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 62ec4b8922f..4be3c1d7358 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -130,7 +130,7 @@ var/const/SAR =(1<<14) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot) outfit_type = /decl/hierarchy/outfit/job/medical/sar job_description = "A Field medic works as the field doctor of expedition teams." - alt_titles = list("Expedition Doctor" = /datum/alt_title/expedition_doctor) + alt_titles = list("Expedition Medic" = /datum/alt_title/expedition_medic) -/datum/alt_title/expedition_doctor - title = "Expedition Doctor" \ No newline at end of file +/datum/alt_title/expedition_medic + title = "Expedition Medic" \ No newline at end of file diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index fdbe3178fac..09497391697 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -64,10 +64,10 @@ /datum/job/paramedic pto_type = PTO_MEDICAL - alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "First Responder" = /datum/alt_title/first_responder) + alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder) -/datum/alt_title/first_responder - title = "First Responder" - title_blurb = "A First Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ +/datum/alt_title/medical_responder + title = "Medical Responder" + title_blurb = "A Medical Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt \ No newline at end of file From 1e41068a3271eb198a5e39ca52697a16488d12ad Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 31 Aug 2020 05:28:47 +1000 Subject: [PATCH 12/22] Update 3 --- code/game/jobs/job/captain_vr.dm | 12 ++++++++---- code/game/jobs/job/civilian_vr.dm | 11 ++++++++++- code/game/jobs/job/engineering_vr.dm | 6 +++--- code/game/jobs/job/science_vr.dm | 6 +++++- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index b7c7e9be81b..d786b27a3b1 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -2,10 +2,10 @@ disallow_jobhop = TRUE pto_type = PTO_CIVILIAN dept_time_required = 80 //Pending something more complicated - alt_titles = list("Overseer"= /datum/alt_title/overseer, "Executive Officer" = /datum/alt_title/executive_officer, "Chief Supervisor" = /datum/alt_title/chief_supervisor) + alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor) -/datum/alt_title/executive_officer - title = "Executive Officer" +/datum/alt_title/facility_director + title = "Facility Director" /datum/alt_title/chief_supervisor title = "Chief Supervisor" @@ -18,7 +18,8 @@ departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET) dept_time_required = 60 - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager) + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager + "Facility Steward" = /datum/alt_title/facility_steward) access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, @@ -39,6 +40,9 @@ /datum/alt_title/staff_manager title = "Staff Manager" +/datum/alt_title/facility_steward + title = "Facility Steward" + /datum/job/secretary disallow_jobhop = TRUE diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index af957a5226b..040872d3d67 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -110,7 +110,8 @@ total_positions = 2 spawn_positions = 2 alt_titles = list("Journalist" = /datum/alt_title/journalist, "Reporter" = /datum/alt_title/reporter, "Writer" = /datum/alt_title/writer, - "Historian" = /datum/alt_title/historian, "Archivist" = /datum/alt_title/archivist, "Professor" = /datum/alt_title/professor) + "Historian" = /datum/alt_title/historian, "Archivist" = /datum/alt_title/archivist, "Professor" = /datum/alt_title/professor, + "Academic" = /datum/alt_title/academic, "Philosopher" = /datum/alt_title/philosopher) pto_type = PTO_CIVILIAN /datum/alt_title/reporter @@ -129,6 +130,14 @@ title = "Professor" title_blurb = "The Professor uses the Library as a base of operations to share their vast knowledge with the crew." +/datum/alt_title/academic + title = "Academic" + title_blurb = "The Academic uses the Library as a base of operations to share their vast knowledge with the crew." + +/datum/alt_title/philosopher + title = "Philosopher" + title_blurb = "The Philosopher uses the Library as a base of operation to ruminate on nature of life and other great questions, and share their opinions with the crew." + /datum/job/lawyer disallow_jobhop = TRUE diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 3cc7918ea10..8799aa39058 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -12,13 +12,13 @@ access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_heads, access_construction, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload) - alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Engineering Foreman" = /datum/alt_title/engineering_foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager) + alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager) /datum/alt_title/head_engineer title = "Head Engineer" -/datum/alt_title/engineering_foreman - title = "Engineering Foreman" +/datum/alt_title/foreman + title = "Foreman" /datum/alt_title/maintenance_manager title = "Maintenance Manager" diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 0a71842b84d..ecad80b713f 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -11,11 +11,15 @@ access_tox_storage, access_teleporter, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany) - alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager, "Head Scientist" = /datum/alt_title/head_scientist) + alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager, + "Head of Development" = /datum/alt_title/head_of_development,"Head Scientist" = /datum/alt_title/head_scientist) /datum/alt_title/research_manager title = "Research Manager" +/datum/alt_title/head_of_development + title = "Head of Development" + /datum/alt_title/head_scientist title = "Head Scientist" From f514283a66dca1e8e1a0bc5d77e8ff777b5535ed Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 31 Aug 2020 06:37:03 +1000 Subject: [PATCH 13/22] commas are hard --- code/game/jobs/job/captain_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index d786b27a3b1..d2b830ad7ba 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -18,7 +18,7 @@ departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET) dept_time_required = 60 - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, "Facility Steward" = /datum/alt_title/facility_steward) access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, From def3b7a25098cd24325bc776f6c38356afadad77 Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 1 Sep 2020 07:11:01 +1000 Subject: [PATCH 14/22] Update 4 additions --- code/game/jobs/job/civilian_vr.dm | 15 ++++++++++++--- code/game/jobs/job/special_vr.dm | 5 ++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 040872d3d67..3d74916fabe 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -29,7 +29,8 @@ /datum/job/hydro spawn_positions = 2 pto_type = PTO_CIVILIAN - alt_titles = list("Gardener" = /datum/alt_title/gardener, "Hydroponicist" = /datum/alt_title/hydroponicist, "Cultivator" = /datum/alt_title/cultivator, "Farmer" = /datum/alt_title/farmer) + alt_titles = list("Hydroponicist" = /datum/alt_title/hydroponicist, "Cultivator" = /datum/alt_title/cultivator, "Farmer" = /datum/alt_title/farmer, + "Gardener" = /datum/alt_title/gardener, "Florist" = /datum/alt_title/florsit) /datum/alt_title/hydroponicist title = "Hydroponicist" @@ -40,6 +41,10 @@ /datum/alt_title/farmer title = "Farmer" +/datum/alt_title/florsit + title = "Florist" + title_blurb = "A Florist may be less professional than their counterparts, and are more likely to tend to the public gardens if they aren't needed elsewhere." + /datum/job/qm pto_type = PTO_CARGO @@ -193,7 +198,7 @@ job_description = "An entertainer does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic." 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, - "Comedian" = /datum/alt_title/comedian) + "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian) // Entertainer Alt Titles /datum/alt_title/actor @@ -222,4 +227,8 @@ /datum/alt_title/comedian title = "Comedian" - title_blurb = "A Comedian will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!" \ No newline at end of file + title_blurb = "A Comedian will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!" + +/datum/alt_title/tragedian + title = "Tragedian" + title_blurb = "A Tragedian will focus on making people think about life and world around them! Life is a tragedy, and who's better to convey its emotions than you?" \ No newline at end of file diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index e5e7947ce89..d2de3db85c0 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -78,15 +78,18 @@ selection_color = "#515151" economic_modifier = 1 job_description = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!" - alt_titles = list("Jester" = /datum/alt_title/jester) whitelist_only = 1 latejoin_only = 1 outfit_type = /decl/hierarchy/outfit/job/clown pto_type = PTO_CIVILIAN + alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool) /datum/alt_title/jester title = "Jester" +/datum/alt_title/fool + title = "Fool" + /datum/job/clown/get_access() if(config.assistant_maint) return list(access_maint_tunnels, access_entertainment) From d9540e71ce2667c550494f4889c324b1a1b035a4 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 6 Sep 2020 05:23:52 +1000 Subject: [PATCH 15/22] Adds Magician --- code/game/jobs/job/civilian_vr.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 3d74916fabe..beb4f477f89 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -198,7 +198,7 @@ job_description = "An entertainer does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic." 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, - "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian) + "Magician" = /datum/alt_title/magician, "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian) // Entertainer Alt Titles /datum/alt_title/actor @@ -225,6 +225,10 @@ title = "Singer" title_blurb = "A Singer is someone with gift of melodious voice! Impress people with your vocal range!" +/datum/alt_title/magician + title = "Magician" + title_blurb = "A Magician is someone who awes those around them with impossible! Show off your repertoire of magic tricks, while keeping the secret hidden!" + /datum/alt_title/comedian title = "Comedian" title_blurb = "A Comedian will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!" From d45abb32756e1192ba3b20e8f616a69a431a9758 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 28 Sep 2020 09:58:35 +1000 Subject: [PATCH 16/22] Renames Lab Assistant into Research Intern --- code/game/jobs/job/assistant_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index bcf11841097..4b594a66ec7 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -19,7 +19,7 @@ alt_titles = list("Intern" = /datum/alt_title/intern, "Apprentice Engineer" = /datum/alt_title/intern_eng, "Medical Intern" = /datum/alt_title/intern_med, - "Lab Assistant" = /datum/alt_title/intern_sci, + "Research Intern" = /datum/alt_title/intern_sci, "Security Cadet" = /datum/alt_title/intern_sec, "Jr. Cargo Tech" = /datum/alt_title/intern_crg, "Jr. Explorer" = /datum/alt_title/intern_exp, @@ -44,9 +44,9 @@ title_outfit = /decl/hierarchy/outfit/job/assistant/medic /datum/alt_title/intern_sci - title = "Lab Assistant" - title_blurb = "A Lab Assistant attempts to provide whatever the Research department needs. They are not proper Scientists, and are \ - often in training to become a Scientist. A Lab Assistant has no real authority." + title = "Research Intern" + title_blurb = "A Research Intern attempts to provide whatever the Research department needs. They are not proper Scientists, and are \ + often in training to become a Scientist. A Research Intern has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/scientist /datum/alt_title/intern_sec From 9c9d59952900be43062aeff7c574a14bfe5de8fc Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 28 Sep 2020 10:00:43 +1000 Subject: [PATCH 17/22] Makes Lab Assistant a Scientist alt-title --- code/game/jobs/job/science_vr.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index ecad80b713f..0356656446b 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -27,7 +27,7 @@ /datum/job/scientist spawn_positions = 5 pto_type = PTO_SCIENCE - alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Xenopaleontologist" = /datum/alt_title/xenopaleontologist, \ + alt_titles = list("Lab Assistant" = /datum/alt_title/lab_assistant, "Xenoarchaeologist" = /datum/alt_title/xenoarch, "Xenopaleontologist" = /datum/alt_title/xenopaleontologist, \ "Anomalist" = /datum/alt_title/anomalist, "Phoron Researcher" = /datum/alt_title/phoron_research, "Gas Physicist" = /datum/alt_title/gas_physicist, \ "Circuit Designer" = /datum/alt_title/circuit_designer, "Circuit Programmer" = /datum/alt_title/circuit_programmer) @@ -35,6 +35,11 @@ access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_xenobotany) minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch) // Unchanged (for now?), mostly here for reference +/datum/alt_title/lab_assistant + title = "Lab Assistant" + title_blurb = "A Lab Assistant is a lower-level member of research staff, whose main purpose is to help scientists with their specialized work in more menial fashion, while also \ + learning the specializations in process." + /datum/alt_title/xenopaleontologist title = "Xenopaleontologist" title_blurb = "A Xenopaleontologist enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \ From 4a0dd9606cfc6557f6769175f3665443cc2c3eec Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 28 Sep 2020 10:12:16 +1000 Subject: [PATCH 18/22] Fixes wrong alt-title mentioned in description of Apprentice Engineer --- code/game/jobs/job/assistant_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index 4b594a66ec7..f2fac2e72bf 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -34,7 +34,7 @@ /datum/alt_title/intern_eng title = "Apprentice Engineer" title_blurb = "An Apprentice Engineer attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \ - often in training to become an Engineer. A Technical Assistant has no real authority." + often in training to become an Engineer. An Apprentice Engineer has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/engineer /datum/alt_title/intern_med From 8de60524ddc25dba3c7b09d69c8f863cd9227273 Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 1 Oct 2020 04:43:47 +1000 Subject: [PATCH 19/22] Removes redundant alt-titles from offduty too --- code/game/jobs/job/offduty_vr.dm | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index 7b7f6538938..02ccb789462 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -17,9 +17,6 @@ job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_CIVILIAN -/datum/alt_title/offduty_civ - title = "Off-duty Worker" - /datum/job/offduty_cargo title = "Off-duty Cargo" latejoin_only = TRUE @@ -35,9 +32,6 @@ job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_CARGO -/datum/alt_title/offduty_crg - title = "Off-duty Cargo" - /datum/job/offduty_engineering title = "Off-duty Engineer" latejoin_only = TRUE @@ -53,9 +47,6 @@ job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_ENGINEERING -/datum/alt_title/offduty_eng - title = "Off-duty Engineer" - /datum/job/offduty_medical title = "Off-duty Medic" latejoin_only = TRUE @@ -71,9 +62,6 @@ job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_MEDICAL -/datum/alt_title/offduty_med - title = "Off-duty Medic" - /datum/job/offduty_science title = "Off-duty Scientist" latejoin_only = TRUE @@ -89,9 +77,6 @@ job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_SCIENCE -/datum/alt_title/offduty_sci - title = "Off-duty Scientist" - /datum/job/offduty_security title = "Off-duty Officer" latejoin_only = TRUE @@ -107,9 +92,6 @@ job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_SECURITY -/datum/alt_title/offduty_sec - title = "Off-duty Officer" - /datum/job/offduty_exploration title = "Off-duty Explorer" latejoin_only = TRUE @@ -124,6 +106,3 @@ outfit_type = /decl/hierarchy/outfit/job/assistant/explorer job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_EXPLORATION - -/datum/alt_title/offduty_exp - title = "Off-duty Explorer" From c9cc27afdd321d0d764581d2011665f26774f848 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Thu, 1 Oct 2020 06:15:30 +1000 Subject: [PATCH 20/22] Conmflict Resomnlution --- code/game/jobs/job/offduty_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index 5078e56eb3c..9a1b5ce954f 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -112,3 +112,4 @@ outfit_type = /decl/hierarchy/outfit/job/assistant/explorer job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off." pto_type = PTO_EXPLORATION + economic_modifier = 5 From 99b4eab1d1b042bb3e8fc7e2a14ce3a2c871f947 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 14 Oct 2020 18:42:42 +1000 Subject: [PATCH 21/22] Added Orderly --- code/game/jobs/job/medical_vr.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 09497391697..f3185759afe 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -26,7 +26,8 @@ spawn_positions = 5 pto_type = PTO_MEDICAL alt_titles = list("Physician" = /datum/alt_title/physician, "Medical Practitioner" = /datum/alt_title/medical_practitioner, "Surgeon" = /datum/alt_title/surgeon, - "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Virologist" = /datum/alt_title/virologist) + "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Orderly" = /datum/alt_title/orderly + "Virologist" = /datum/alt_title/virologist) /datum/alt_title/physician @@ -35,6 +36,12 @@ /datum/alt_title/medical_practitioner title = "Medical Practitioner" +/datum/alt_title/orderly + title = "Orderly" + title_blurb = "An Orderly acts as Medbay's general helping hand, assisting any doctor that might need some form of help, as well as handling manual \ + and dirty labor around the department." + title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse + /datum/job/chemist pto_type = PTO_MEDICAL From cb9a30cb9f17dece39bb10dce099cab6b7927608 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 14 Oct 2020 18:43:04 +1000 Subject: [PATCH 22/22] Comma --- code/game/jobs/job/medical_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index f3185759afe..2679137cf0f 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -26,7 +26,7 @@ spawn_positions = 5 pto_type = PTO_MEDICAL alt_titles = list("Physician" = /datum/alt_title/physician, "Medical Practitioner" = /datum/alt_title/medical_practitioner, "Surgeon" = /datum/alt_title/surgeon, - "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Orderly" = /datum/alt_title/orderly + "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Orderly" = /datum/alt_title/orderly, "Virologist" = /datum/alt_title/virologist)