From ba02b2094dea84155717e207cf60dcc53cbbee77 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 4 Mar 2021 02:03:09 +0100 Subject: [PATCH] [MIRROR] Minor typo and comment fixes follow-up for ID card rework (#3830) * Minor typo and comment fixes follow-up for ID card rework (#57318) * Minor typo and comment fixes follow-up for ID card rework Co-authored-by: Timberpoes --- code/game/objects/items/cards_ids.dm | 3 +++ code/modules/jobs/job_types/head_of_personnel.dm | 4 ++-- code/modules/mob/living/simple_animal/bot/bot.dm | 4 +++- code/modules/shuttle/arrivals.dm | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index ee52abb8b6b..752631014a6 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -359,6 +359,9 @@ * This proc directly modifies the lists passed in as args. It expects these lists to be instantiated. * There is no return value. * Arguments: + * * accesses - List of accesses you want to stort into basic_access_list and wildcard_access_list. Should not be null. + * * basic_access_list - Mandatory argument. The proc modifies the list passed in this argument and adds accesses the trim supports to it. + * * wildcard_access_list - Mandatory argument. The proc modifies the list passed in this argument and adds accesses the trim does not support to it. */ /obj/item/card/id/proc/build_access_lists(list/accesses, list/basic_access_list, list/wildcard_access_list) if(!length(accesses) || isnull(basic_access_list) || isnull(wildcard_access_list)) diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 21e8a52baa3..14f5e6570b6 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -63,8 +63,8 @@

The Basics

Card Trim - This is the job assigned to the card. The card's trim decides what Basic accesses the card can hold. Basic accesses cost nothing! Grey ID cards cannot hold Head of Staff or Captain trims. Silver ID cards can hold Head of Staff trims but not Captain trims and are in a box in the Head of Personnel's office and orderable from cargo. Gold ID cards can hold all access. The only guaranteed Gold ID card is the Captain's Spare, held in a golden safe on the bridge with access codes given to the station's highest ranking officer. All other gold ID cards are carried exclusively by Captains.

Wildcards - These are any additional accesses a card has that are not part of the card's trim. Lower quality ID cards have fewer wildcards and the wildcards they do have are of lower rarity.

-

Job Changes - To change a job, you need to go to the PDA & ID Painter that's in every Head of Personnel office. This can be used to apply a new trim to an ID card, but this will wipe all that card's accesses in the process. You then take this ID card to any modular computer with the Plexus Access Management app and when logged in with the appropriate Head of Staff or ID Console access can then select from Templates to quick-fill accesses or apply them manually.

-

Firing Staff - Terminating a staff member's employment with wipe any trim from their card, remove all access and instantly set them as demoted.

+

Job Changes - To change a job, you need to go to the PDA & ID Painter that's in every Head of Personnel office. This can be used to apply a new trim to an ID card, but this will wipe all that card's accesses in the process. You then take this ID card to any modular computer with the Plexagon Access Management app and when logged in with the appropriate Head of Staff or ID Console access can then select from Templates to quick-fill accesses or apply them manually.

+

Firing Staff - Terminating a staff member's employment will wipe any trim from their card, remove all access and instantly set them as demoted.

Changing Jobs - Step by Step

  1. Grab an appropriate ID card. Head of Staff jobs require a silver ID card. Captain requires a gold ID card.
  2. diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 66d54555ace..2376e53d871 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -996,7 +996,9 @@ Pass a positive integer as an argument to override a bot's default speed. . = ..() if(!. || !client) return FALSE - access_card.add_access(player_access) + // If we have any bonys player accesses, add them to our internal ID card. + if(length(player_access)) + access_card.add_access(player_access) diag_hud_set_botmode() /mob/living/simple_animal/bot/Logout() diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 2da7802598b..52572a59f26 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -200,7 +200,6 @@ * Arguments: * * mob - The arriving mob. * * rank - The job of the arriving mob. - * * announce_acting_captain - Bool. If TRUE, the arriving mob is also an acting captain. */ /obj/docking_port/mobile/arrivals/proc/QueueAnnounce(mob, rank) if(mode != SHUTTLE_CALL)