mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Cleans up references to assistant
Defines the USELESS_JOB value as "Visitor"
This commit is contained in:
@@ -29,3 +29,6 @@
|
|||||||
#define SHUTTLE_CRASHED 3 // Yup that can happen now
|
#define SHUTTLE_CRASHED 3 // Yup that can happen now
|
||||||
|
|
||||||
#define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience)
|
#define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience)
|
||||||
|
|
||||||
|
//Assistant/Visitor/Whatever
|
||||||
|
#define USELESS_JOB "Visitor"
|
||||||
@@ -499,7 +499,7 @@
|
|||||||
//HUMAN
|
//HUMAN
|
||||||
/mob/living/carbon/human/mind_initialize()
|
/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
|
//slime
|
||||||
/mob/living/simple_animal/slime/mind_initialize()
|
/mob/living/simple_animal/slime/mind_initialize()
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/decl/hierarchy/outfit/job/assistant
|
/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
|
id_type = /obj/item/weapon/card/id/assistant
|
||||||
|
|
||||||
/decl/hierarchy/outfit/job/assistant/visitor
|
/decl/hierarchy/outfit/job/assistant/visitor
|
||||||
@@ -11,7 +11,11 @@
|
|||||||
name = OUTFIT_JOB_NAME("Resident")
|
name = OUTFIT_JOB_NAME("Resident")
|
||||||
id_pda_assignment = "Resident"
|
id_pda_assignment = "Resident"
|
||||||
uniform = /obj/item/clothing/under/color/white
|
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
|
/decl/hierarchy/outfit/job/service
|
||||||
l_ear = /obj/item/device/radio/headset/headset_service
|
l_ear = /obj/item/device/radio/headset/headset_service
|
||||||
hierarchy_type = /decl/hierarchy/outfit/job/service
|
hierarchy_type = /decl/hierarchy/outfit/job/service
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ datum/objective/anti_revolution/demote
|
|||||||
|
|
||||||
if(!istype(I)) return 1
|
if(!istype(I)) return 1
|
||||||
|
|
||||||
if(I.assignment == "Assistant")
|
if(I.assignment == USELESS_JOB) //VOREStation Edit - Visitor not Assistant
|
||||||
return 1
|
return 1
|
||||||
else
|
else
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
economic_modifier = 2
|
economic_modifier = 2
|
||||||
access = list() //See /datum/job/assistant/get_access()
|
access = list() //See /datum/job/assistant/get_access()
|
||||||
minimal_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
|
alt_titles = list("Apprentice Engineer","Medical Intern","Lab Assistant","Security Cadet","Jr. Cargo Tech") //VOREStation Edit
|
||||||
//VOREStation Add
|
//VOREStation Add
|
||||||
/datum/job/intern/New()
|
/datum/job/intern/New()
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
// VOREStation Add
|
// VOREStation Add
|
||||||
/datum/job/assistant
|
/datum/job/assistant
|
||||||
title = "Visitor"
|
title = USELESS_JOB
|
||||||
flag = ASSISTANT
|
flag = ASSISTANT
|
||||||
department = "Civilian"
|
department = "Civilian"
|
||||||
department_flag = CIVILIAN
|
department_flag = CIVILIAN
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ var/global/datum/controller/occupations/job_master
|
|||||||
if(job.minimum_character_age && (player.client.prefs.age < job.minimum_character_age))
|
if(job.minimum_character_age && (player.client.prefs.age < job.minimum_character_age))
|
||||||
continue
|
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
|
continue
|
||||||
|
|
||||||
if(job.title in command_positions) //If you want a command position, select it!
|
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]")
|
Debug("AC1, Candidates: [assistant_candidates.len]")
|
||||||
for(var/mob/new_player/player in assistant_candidates)
|
for(var/mob/new_player/player in assistant_candidates)
|
||||||
Debug("AC1 pass, Player: [player]")
|
Debug("AC1 pass, Player: [player]")
|
||||||
AssignRole(player, "Assistant")
|
AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant
|
||||||
assistant_candidates -= player
|
assistant_candidates -= player
|
||||||
Debug("DO, AC1 end")
|
Debug("DO, AC1 end")
|
||||||
|
|
||||||
@@ -323,7 +323,7 @@ var/global/datum/controller/occupations/job_master
|
|||||||
for(var/mob/new_player/player in unassigned)
|
for(var/mob/new_player/player in unassigned)
|
||||||
if(player.client.prefs.alternate_option == BE_ASSISTANT)
|
if(player.client.prefs.alternate_option == BE_ASSISTANT)
|
||||||
Debug("AC2 Assistant located, Player: [player]")
|
Debug("AC2 Assistant located, Player: [player]")
|
||||||
AssignRole(player, "Assistant")
|
AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant
|
||||||
|
|
||||||
//For ones returning to lobby
|
//For ones returning to lobby
|
||||||
for(var/mob/new_player/player in unassigned)
|
for(var/mob/new_player/player in unassigned)
|
||||||
|
|||||||
@@ -104,7 +104,8 @@ var/list/civilian_positions = list(
|
|||||||
"Lawyer",
|
"Lawyer",
|
||||||
"Chaplain",
|
"Chaplain",
|
||||||
"Pilot", // VOREStation Edit - Moved Pilot from planetary -> civ
|
"Pilot", // VOREStation Edit - Moved Pilot from planetary -> civ
|
||||||
"Assistant"
|
USELESS_JOB, //VOREStation Edit - Visitor not Assistant
|
||||||
|
"Intern" //VOREStation Edit - Intern
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ var/list/job_whitelist = list()
|
|||||||
var/datum/job/job = job_master.GetJob(rank)
|
var/datum/job/job = job_master.GetJob(rank)
|
||||||
if(!job.whitelist_only)
|
if(!job.whitelist_only)
|
||||||
return 1
|
return 1
|
||||||
if(rank == "assistant" || rank == "Assistant")
|
if(rank == USELESS_JOB) //VOREStation Edit - Visitor not Assistant
|
||||||
return 1
|
return 1
|
||||||
if(check_rights(R_ADMIN, 0))
|
if(check_rights(R_ADMIN, 0))
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -353,8 +353,8 @@
|
|||||||
job_access_type = /datum/job/qm
|
job_access_type = /datum/job/qm
|
||||||
|
|
||||||
/obj/item/weapon/card/id/assistant
|
/obj/item/weapon/card/id/assistant
|
||||||
assignment = "Assistant"
|
assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant
|
||||||
rank = "Assistant"
|
rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant
|
||||||
job_access_type = /datum/job/assistant
|
job_access_type = /datum/job/assistant
|
||||||
|
|
||||||
/obj/item/weapon/card/id/civilian
|
/obj/item/weapon/card/id/civilian
|
||||||
|
|||||||
@@ -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")
|
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")
|
if(samejob == "Yes")
|
||||||
charjob = record_found.fields["real_rank"]
|
charjob = record_found.fields["real_rank"]
|
||||||
else if(samejob == "Assistant")
|
else if(samejob == USELESS_JOB) //VOREStation Edit - Visitor not Assistant
|
||||||
charjob = "Assistant"
|
charjob = USELESS_JOB //VOREStation Edit - Visitor not Assistant
|
||||||
else
|
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")
|
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")
|
if(records == "Cancel")
|
||||||
|
|||||||
@@ -202,7 +202,7 @@
|
|||||||
if(equip_preview_mob)
|
if(equip_preview_mob)
|
||||||
// Determine what job is marked as 'High' priority, and dress them up as such.
|
// Determine what job is marked as 'High' priority, and dress them up as such.
|
||||||
if(job_civilian_low & ASSISTANT)
|
if(job_civilian_low & ASSISTANT)
|
||||||
previewJob = job_master.GetJob("Assistant")
|
previewJob = job_master.GetJob(USELESS_JOB) //VOREStation Edit - Visitor not Assistant
|
||||||
else
|
else
|
||||||
for(var/datum/job/job in job_master.occupations)
|
for(var/datum/job/job in job_master.occupations)
|
||||||
var/job_flag
|
var/job_flag
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
if(mind)
|
if(mind)
|
||||||
if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer"))
|
if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer"))
|
||||||
gain = 100
|
gain = 100
|
||||||
if(mind.assigned_role == "Assistant")
|
if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant
|
||||||
gain = rand(0, 300)
|
gain = rand(0, 300)
|
||||||
investigate_log(I_SINGULO,"has been consumed by a singularity", I_SINGULO)
|
investigate_log(I_SINGULO,"has been consumed by a singularity", I_SINGULO)
|
||||||
gib()
|
gib()
|
||||||
|
|||||||
Reference in New Issue
Block a user