From c3647a13bfe7dc67c9b5bce41a76a4c1225aa07d Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Sun, 3 Mar 2024 14:53:44 -0300 Subject: [PATCH] NT Recruiter: Tweaks and replacing gender with DOB (#24132) * NT Recruiter: Tweaks and replacing gender with DOB * extra comma * adjusting numbers and clown tip * tgui conflict * rebuild --- .../computer/arcade_games/recruiter.dm | 35 ++++++++++--------- tgui/packages/tgui/interfaces/NTRecruiter.js | 16 +++++---- tgui/public/tgui.bundle.js | 2 +- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/code/game/machinery/computer/arcade_games/recruiter.dm b/code/game/machinery/computer/arcade_games/recruiter.dm index 5e64517a629..717d798d02f 100644 --- a/code/game/machinery/computer/arcade_games/recruiter.dm +++ b/code/game/machinery/computer/arcade_games/recruiter.dm @@ -20,7 +20,7 @@ light_color = LIGHT_COLOR_WHITE circuit = /obj/item/circuitboard/arcade/recruiter var/candidate_name - var/candidate_gender + var/candidate_birth var/age var/datum/species/cand_species var/planet_of_origin @@ -53,9 +53,9 @@ "Awarded the medal of service for outstanding work in botany", "Hacked into the Head of Personnel's office to save Ian", "Has proven knowledge of SOP, but no working experience", "Has worked at Mr Changs", "Spent 2 years as a freelance journalist", "Known as a hero for keeping stations clean during attacks", - "Worked as a bureaucrat for SolGov", "Worked in Donk Corporation's R&D department", + "Worked as a bureaucrat for SolGov", "Worked in Donk Corporation's toy R&D department", "Did work for USSP as an translator", "Took care of Toxins, Xenobiology, Robotics and R&D as a single worker in the Research department", - "Served for 4 years as a soldier of the Prospero Order", "Traveled through various systems as a businessman", + "Did maintenance on multiple cybernetic limbs over Biotech Solutions", "Traveled through various systems as a businessman", "Worked as a waiter for one year", "Has previous experience as a cameraman", "Spent years of their life being a janitor at Clown College", "Was given numerous good reviews for delivering cargo requests on time", "Helped old people cross the holostreet", "Has proven ability to read", "Served 4 years in NT navy", @@ -68,7 +68,9 @@ "Has received several commendations due to visually appealing kitchen remodelings", "Is known to report any petty Space Law or SOP breakage to the relevant authorities", "As Chef, adapted their menus in order to appeal all stationed species", "Was part of the \"Pump Purgers\", famous for the streak of 102 shifts with no Supermatter Explosions", - "Virologist; took it upon themselves to distribute a vaccine to the crew", "Conducted experiments that generated high profits but many casualties") + "Virologist; took it upon themselves to distribute a vaccine to the crew", "Conducted experiments that generated high profits but many casualties", + "Did multiple cargo transport jobs for the Port Royal Inc", "Been a test pilot for the new Einstein Engines Inc prototype engines", + "Manufactured multiple energy guns at Shellguard Munitions", "Spent years cleaning Aussec Armory guns") var/list/incorrect_records = list("Caught littering on the NSS Cyberiad", "Scientist involved in the ###### incident", "Rescued four assistants from a plasma fire, but left behind the station blueprints", @@ -105,24 +107,25 @@ else cand_species = pick(hirable_species) - candidate_gender = pick(MALE, FEMALE, NEUTER) // Gender - - if(candidate_gender == NEUTER && initial(cand_species.has_gender)) // If the species has a gender it cannot be neuter! - good_candidate = FALSE - if(prob(PROB_CANDIDATE_ERRORS)) // Age age = pick(initial(cand_species.max_age) + rand(20, 100), (initial(cand_species.min_age) - rand(1, 7))) // Its either too young or too old for the job good_candidate = FALSE else age = rand(initial(cand_species.min_age), initial(cand_species.max_age)) + if(prob(PROB_CANDIDATE_ERRORS)) // Date of birth + candidate_birth = "[rand(1, 12)]/[GLOB.game_year - age + pick(-400, -300, -200, -100, 50, 100, 150)]" // The age doesn't match with the date of birth + good_candidate = FALSE + else + candidate_birth = "[rand(1, 12)]/[GLOB.game_year - age]" + if(prob(PROB_CANDIDATE_ERRORS)) // Name // Lets pick all species with a naming scheme and remove the selected one so we can have a mismatch var/datum/species/wrong_species = pick((hirable_species + /datum/species/monkey + /datum/species/golem - cand_species)) - candidate_name = random_name(candidate_gender, initial(wrong_species.name)) + candidate_name = random_name(species = initial(wrong_species.name)) good_candidate = FALSE else - candidate_name = random_name(candidate_gender, initial(cand_species.name)) + candidate_name = random_name(species = initial(cand_species.name)) if(prob(PROB_CANDIDATE_ERRORS)) // Planet planet_of_origin = pick(incorrect_planets) @@ -150,31 +153,31 @@ switch(unique_candidate) if(UNIQUE_STEVE) // Steve is special candidate_name = "Steve" - candidate_gender = MALE age = "30" + candidate_birth = "12/[GLOB.game_year - 30]" cand_species = /datum/species/human planet_of_origin = "Unknown" job_requested = "Central Command Intern" employment_records = "Experience in pressing buttons" if(UNIQUE_MIME) // Only hire mimes that don't fill their employment application candidate_name = "..." - candidate_gender = "..." + candidate_birth = "..." age = "..." planet_of_origin = "..." job_requested = "Mime" employment_records = "..." if(UNIQUE_CEO_CHILD) // Hes the son of the CEO, what do you expect? candidate_name = "Johnny Nanotrasen, Jr." - candidate_gender = MALE age = "12" + candidate_birth = "1/[GLOB.game_year - 12]" cand_species = /datum/species/human planet_of_origin = "Unknown" job_requested = "Captain" employment_records = "Whatever" if(UNIQUE_VIGILANTE) // For some reason vigilantes do get inside NT stations, let them slip in candidate_name = "Owlman" - candidate_gender = MALE age = "38" + candidate_birth = "6/[GLOB.game_year - 38]" cand_species = /datum/species/human planet_of_origin = "Unknown" job_requested = "Assistant" @@ -204,7 +207,7 @@ "gamestatus" = game_status, "cand_name" = candidate_name, - "cand_gender" = capitalize(candidate_gender), + "cand_birth" = candidate_birth, "cand_age" = age, "cand_species" = initial(cand_species.name), "cand_planet" = planet_of_origin, diff --git a/tgui/packages/tgui/interfaces/NTRecruiter.js b/tgui/packages/tgui/interfaces/NTRecruiter.js index 9ff6a44446b..eeab78b429c 100644 --- a/tgui/packages/tgui/interfaces/NTRecruiter.js +++ b/tgui/packages/tgui/interfaces/NTRecruiter.js @@ -7,7 +7,7 @@ export const NTRecruiter = (props, context) => { const { gamestatus, cand_name, - cand_gender, + cand_birth, cand_age, cand_species, cand_planet, @@ -125,6 +125,10 @@ export const NTRecruiter = (props, context) => { Keep your eyes open for incompatible naming schemes, no company wants a Vox named Joe! + + For some unknown reason clowns are never denied by the + company, no matter what. + @@ -153,14 +157,14 @@ export const NTRecruiter = (props, context) => { {cand_name} - - {cand_gender} + + {cand_species} {cand_age} - - {cand_species} + + {cand_birth} {cand_planet} @@ -237,7 +241,7 @@ export const NTRecruiter = (props, context) => {