From d77d33bfd6b339c4740afd8778c06acb81f42c75 Mon Sep 17 00:00:00 2001 From: Adri Date: Wed, 23 Feb 2022 08:46:50 +0100 Subject: [PATCH] Makes the spawning message more beginner-friendly, removes unused line (#17419) --- code/controllers/subsystem/jobs.dm | 27 +++++++++++++++------------ code/controllers/subsystem/ticker.dm | 17 ++++------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index b7173485304..e0c201e8730 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -422,27 +422,30 @@ SUBSYSTEM_DEF(jobs) CreateMoneyAccount(H, rank, job) - to_chat(H, "You are the [alt_title ? alt_title : rank].") - to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") - to_chat(H, "For more information on how the station works, see Standard Operating Procedure (SOP)") + to_chat(H, "


----------------") + to_chat(H, "
Your role on the station is: [alt_title ? alt_title : rank].
") + to_chat(H, "
You answer directly to [job.supervisors]. Special circumstances may change this.
") + to_chat(H, "
For more information on how the station works, see Standard Operating Procedure (SOP).
") if(job.is_service) - to_chat(H, "As a member of Service, make sure to read up on your Department SOP") + to_chat(H, "
As a member of Service, make sure to read up on your Department SOP.
") if(job.is_supply) - to_chat(H, "As a member of Supply, make sure to read up on your Department SOP") + to_chat(H, "
As a member of Supply, make sure to read up on your Department SOP.
") if(job.is_command) - to_chat(H, "As an important member of Command, read up on your Department SOP") + to_chat(H, "
As an important member of Command, read up on your Department SOP.
") if(job.is_legal) - to_chat(H, "Your job requires complete knowledge of Space Law and Legal Standard Operating Procedure") + to_chat(H, "
Your job requires complete knowledge of Space Law and Legal Standard Operating Procedure.
") if(job.is_engineering) - to_chat(H, "As a member of Engineering, make sure to read up on your Department SOP") + to_chat(H, "
As a member of Engineering, make sure to read up on your Department SOP.
") if(job.is_medical) - to_chat(H, "As a member of Medbay, make sure to read up on your Department SOP") + to_chat(H, "
As a member of Medbay, make sure to read up on your Department SOP.
") if(job.is_science) - to_chat(H, "As a member of Science, make sure to read up on your Department SOP") + to_chat(H, "
As a member of Science, make sure to read up on your Department SOP.
") if(job.is_security) - to_chat(H, "As a member of Security, you are to know Space Law, Legal Standard Operating Procedure, as well as your Department SOP") + to_chat(H, "
As a member of Security, you are to know Space Law, Legal Standard Operating Procedure, as well as your Department SOP.
") if(job.req_admin_notify) - to_chat(H, "You are playing a job that is important for the game progression. If you have to disconnect, please go to cryo and inform command. If you are unable to do so, please notify the admins via adminhelp.") + to_chat(H, "
You are playing a job that is important for the game progression. If you have to disconnect, please go to cryo and inform command. If you are unable to do so, please notify the admins via adminhelp.
") + to_chat(H, "
If you need help, check the wiki or use Mentorhelp(F1)!
") + to_chat(H, "
----------------

") return H /datum/controller/subsystem/jobs/proc/EquipRank(mob/living/carbon/human/H, rank, joined_late = 0) // Equip and put them in an area diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 5cc89322a39..30f804868e1 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -407,20 +407,11 @@ SUBSYSTEM_DEF(ticker) qdel(player) /datum/controller/subsystem/ticker/proc/equip_characters() - var/captainless = TRUE for(var/mob/living/carbon/human/player in GLOB.player_list) - if(player && player.mind && player.mind.assigned_role) - if(player.mind.assigned_role == "Captain") - captainless = FALSE - if(player.mind.assigned_role != player.mind.special_role) - SSjobs.AssignRank(player, player.mind.assigned_role, FALSE) - SSjobs.EquipRank(player, player.mind.assigned_role, FALSE) - equip_cuis(player) - - if(captainless) - for(var/mob/M in GLOB.player_list) - if(!isnewplayer(M)) - to_chat(M, "Captainship not forced on anyone.") + if(player && player.mind && player.mind.assigned_role && player.mind.assigned_role != player.mind.special_role) + SSjobs.AssignRank(player, player.mind.assigned_role, FALSE) + SSjobs.EquipRank(player, player.mind.assigned_role, FALSE) + equip_cuis(player) /datum/controller/subsystem/ticker/proc/equip_cuis(mob/living/carbon/human/H) if(!H.client)