From 17723b7df679b225c66a210f94da81c06de2e735 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 31 Jan 2018 00:21:38 -0500 Subject: [PATCH] Cleans up references to assistant Defines the USELESS_JOB value as "Visitor" --- code/__defines/misc_vr.dm | 3 +++ code/datums/mind.dm | 2 +- code/datums/outfits/jobs/civilian.dm | 8 ++++++-- code/game/gamemodes/objective.dm | 2 +- code/game/jobs/job/assistant.dm | 4 ++-- code/game/jobs/job_controller.dm | 6 +++--- code/game/jobs/jobs.dm | 3 ++- code/game/jobs/whitelist_vr.dm | 2 +- code/game/objects/items/weapons/id cards/station_ids.dm | 4 ++-- code/modules/admin/verbs/randomverbs.dm | 4 ++-- code/modules/mob/new_player/preferences_setup.dm | 2 +- code/modules/power/singularity/act.dm | 2 +- 12 files changed, 25 insertions(+), 17 deletions(-) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index ed6d8e8031..f8da0d70ce 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -29,3 +29,6 @@ #define SHUTTLE_CRASHED 3 // Yup that can happen now #define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience) + +//Assistant/Visitor/Whatever +#define USELESS_JOB "Visitor" \ No newline at end of file diff --git a/code/datums/mind.dm b/code/datums/mind.dm index feef09b45e..3f4397df6b 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -499,7 +499,7 @@ //HUMAN /mob/living/carbon/human/mind_initialize() ..() - if(!mind.assigned_role) mind.assigned_role = "Assistant" //defualt + if(!mind.assigned_role) mind.assigned_role = USELESS_JOB //defualt //VOREStation Edit - Visitor not Assistant //slime /mob/living/simple_animal/slime/mind_initialize() diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index afbd7278e0..f3237249b1 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -1,5 +1,5 @@ /decl/hierarchy/outfit/job/assistant - name = OUTFIT_JOB_NAME("Assistant") + name = OUTFIT_JOB_NAME(USELESS_JOB) //VOREStation Edit - Visitor not Assistant id_type = /obj/item/weapon/card/id/assistant /decl/hierarchy/outfit/job/assistant/visitor @@ -11,7 +11,11 @@ name = OUTFIT_JOB_NAME("Resident") id_pda_assignment = "Resident" uniform = /obj/item/clothing/under/color/white - +//VOREStation Add - Interns +/decl/hierarchy/outfit/job/assistant/intern + name = OUTFIT_JOB_NAME("Intern") + id_type = /obj/item/weapon/card/id/civilian +//VOREStation Add End - Interns /decl/hierarchy/outfit/job/service l_ear = /obj/item/device/radio/headset/headset_service hierarchy_type = /decl/hierarchy/outfit/job/service diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 850f061250..7237669a77 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -149,7 +149,7 @@ datum/objective/anti_revolution/demote if(!istype(I)) return 1 - if(I.assignment == "Assistant") + if(I.assignment == USELESS_JOB) //VOREStation Edit - Visitor not Assistant return 1 else return 0 diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index f53d44764f..d558d7b14e 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -12,7 +12,7 @@ economic_modifier = 2 access = list() //See /datum/job/assistant/get_access() minimal_access = list() //See /datum/job/assistant/get_access() - outfit_type = /decl/hierarchy/outfit/job/assistant + outfit_type = /decl/hierarchy/outfit/job/assistant/intern alt_titles = list("Apprentice Engineer","Medical Intern","Lab Assistant","Security Cadet","Jr. Cargo Tech") //VOREStation Edit //VOREStation Add /datum/job/intern/New() @@ -24,7 +24,7 @@ // VOREStation Add /datum/job/assistant - title = "Visitor" + title = USELESS_JOB flag = ASSISTANT department = "Civilian" department_flag = CIVILIAN diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index dc947d82fa..d6b9b7aeb4 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -117,7 +117,7 @@ var/global/datum/controller/occupations/job_master if(job.minimum_character_age && (player.client.prefs.age < job.minimum_character_age)) continue - if(istype(job, GetJob("Assistant"))) // We don't want to give him assistant, that's boring! + if(istype(job, GetJob(USELESS_JOB))) // We don't want to give him assistant, that's boring! //VOREStation Edit - Visitor not Assistant continue if(job.title in command_positions) //If you want a command position, select it! @@ -242,7 +242,7 @@ var/global/datum/controller/occupations/job_master Debug("AC1, Candidates: [assistant_candidates.len]") for(var/mob/new_player/player in assistant_candidates) Debug("AC1 pass, Player: [player]") - AssignRole(player, "Assistant") + AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant assistant_candidates -= player Debug("DO, AC1 end") @@ -323,7 +323,7 @@ var/global/datum/controller/occupations/job_master for(var/mob/new_player/player in unassigned) if(player.client.prefs.alternate_option == BE_ASSISTANT) Debug("AC2 Assistant located, Player: [player]") - AssignRole(player, "Assistant") + AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant //For ones returning to lobby for(var/mob/new_player/player in unassigned) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 11e1d7b2f3..667d351a9d 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -104,7 +104,8 @@ var/list/civilian_positions = list( "Lawyer", "Chaplain", "Pilot", // VOREStation Edit - Moved Pilot from planetary -> civ - "Assistant" + USELESS_JOB, //VOREStation Edit - Visitor not Assistant + "Intern" //VOREStation Edit - Intern ) diff --git a/code/game/jobs/whitelist_vr.dm b/code/game/jobs/whitelist_vr.dm index 0fce896808..058a9c0dc1 100644 --- a/code/game/jobs/whitelist_vr.dm +++ b/code/game/jobs/whitelist_vr.dm @@ -15,7 +15,7 @@ var/list/job_whitelist = list() var/datum/job/job = job_master.GetJob(rank) if(!job.whitelist_only) return 1 - if(rank == "assistant" || rank == "Assistant") + if(rank == USELESS_JOB) //VOREStation Edit - Visitor not Assistant return 1 if(check_rights(R_ADMIN, 0)) return 1 diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index e0975361eb..4c1e4b9aaf 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -353,8 +353,8 @@ job_access_type = /datum/job/qm /obj/item/weapon/card/id/assistant - assignment = "Assistant" - rank = "Assistant" + assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant + rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant job_access_type = /datum/job/assistant /obj/item/weapon/card/id/civilian diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 961dbdcdfb..42153e9682 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -392,8 +392,8 @@ Traitors and the like can also be revived with the previous role mostly intact. var/samejob = alert(src,"Found [picked_client.prefs.real_name] in data core. They were [record_found.fields["real_rank"]] this round. Assign same job? They will not be re-added to the manifest/records, either way.","Previously spawned","Yes","Assistant","No") if(samejob == "Yes") charjob = record_found.fields["real_rank"] - else if(samejob == "Assistant") - charjob = "Assistant" + else if(samejob == USELESS_JOB) //VOREStation Edit - Visitor not Assistant + charjob = USELESS_JOB //VOREStation Edit - Visitor not Assistant else records = alert(src,"No data core entry detected. Would you like add them to the manifest, and sec/med/HR records?","Records","Yes","No","Cancel") if(records == "Cancel") diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 1e8cc9f6b0..d7908f437c 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -202,7 +202,7 @@ if(equip_preview_mob) // Determine what job is marked as 'High' priority, and dress them up as such. if(job_civilian_low & ASSISTANT) - previewJob = job_master.GetJob("Assistant") + previewJob = job_master.GetJob(USELESS_JOB) //VOREStation Edit - Visitor not Assistant else for(var/datum/job/job in job_master.occupations) var/job_flag diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 95affc46f1..e65a65e7c4 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -19,7 +19,7 @@ if(mind) if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer")) gain = 100 - if(mind.assigned_role == "Assistant") + if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant gain = rand(0, 300) investigate_log(I_SINGULO,"has been consumed by a singularity", I_SINGULO) gib()