From 296bd114fc10393cb3726405f34f09b94e54f327 Mon Sep 17 00:00:00 2001 From: Vladisvell Date: Mon, 30 Oct 2023 14:23:40 +0500 Subject: [PATCH 1/4] bugfix: added new security sub-professions to crew monitor vision --- code/game/jobs/jobs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 70daf80d5db..aa5d0bcf9d9 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -53,6 +53,8 @@ GLOBAL_LIST_INIT(security_positions, list( "Security Officer", "Brig Physician", "Security Pod Pilot", + "Security Trainer", + "Patrol Officer", "Magistrate" )) From f0ed86bae3bb93166cb5a58944695a66404faa43 Mon Sep 17 00:00:00 2001 From: Vladisvell Date: Mon, 30 Oct 2023 14:57:41 +0500 Subject: [PATCH 2/4] added security medic --- code/game/jobs/jobs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index aa5d0bcf9d9..e0074460acc 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -55,6 +55,7 @@ GLOBAL_LIST_INIT(security_positions, list( "Security Pod Pilot", "Security Trainer", "Patrol Officer", + "Security Medic", "Magistrate" )) From 1ba77ee9299519972f6cfcbcca0bbd7901113e0b Mon Sep 17 00:00:00 2001 From: Vladisvell Date: Mon, 30 Oct 2023 16:19:28 +0500 Subject: [PATCH 3/4] added Forensic Technician --- code/game/jobs/jobs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index e0074460acc..c85609640b9 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -50,6 +50,7 @@ GLOBAL_LIST_INIT(security_positions, list( "Head of Security", "Warden", "Detective", + "Forensic Technician" "Security Officer", "Brig Physician", "Security Pod Pilot", From 109db2884d00e59ac9618dda2293ee4d3f7262f8 Mon Sep 17 00:00:00 2001 From: Vladisvell Date: Mon, 30 Oct 2023 16:55:26 +0500 Subject: [PATCH 4/4] well, let's see the rank, actually, instead of assignment --- code/datums/cache/crew.dm | 4 ++-- code/game/jobs/jobs.dm | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/datums/cache/crew.dm b/code/datums/cache/crew.dm index 38aebe027f5..b0e8f6d97be 100644 --- a/code/datums/cache/crew.dm +++ b/code/datums/cache/crew.dm @@ -48,8 +48,8 @@ GLOBAL_DATUM_INIT(crew_repository, /datum/repository/crew, new()) crewmemberData["name"] = H.get_authentification_name(if_no_id="Unknown") crewmemberData["rank"] = H.get_authentification_rank(if_no_id="Unknown", if_no_job="No Job") crewmemberData["assignment"] = H.get_assignment(if_no_id="Unknown", if_no_job="No Job") - crewmemberData["is_command"] = (crewmemberData["assignment"] in bold_jobs) - crewmemberData["is_security"] = (crewmemberData["assignment"] in security_jobs_list) + crewmemberData["is_command"] = (crewmemberData["rank"] in bold_jobs) + crewmemberData["is_security"] = (crewmemberData["rank"] in security_jobs_list) if(C.sensor_mode >= SUIT_SENSOR_BINARY) crewmemberData["dead"] = H.stat == DEAD diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index c85609640b9..70daf80d5db 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -50,13 +50,9 @@ GLOBAL_LIST_INIT(security_positions, list( "Head of Security", "Warden", "Detective", - "Forensic Technician" "Security Officer", "Brig Physician", "Security Pod Pilot", - "Security Trainer", - "Patrol Officer", - "Security Medic", "Magistrate" ))