From f4af0b616e3a1663a64eea2ccea6900c2904834e Mon Sep 17 00:00:00 2001 From: Funce Date: Fri, 7 May 2021 14:12:08 +1200 Subject: [PATCH] Civil Disputes Officers get SOOC now (#5518) * Civil Disputes Officers get SOOC now * Couple of Other CDO Improvements --- modular_skyrat/modules/admin/code/sooc.dm | 2 +- .../sec_haul/code/junior_officer/junior_officer.dm | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modular_skyrat/modules/admin/code/sooc.dm b/modular_skyrat/modules/admin/code/sooc.dm index 016050087a9..8ed80d424cb 100644 --- a/modular_skyrat/modules/admin/code/sooc.dm +++ b/modular_skyrat/modules/admin/code/sooc.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name) if(!mob) return - var/static/list/job_lookup = list("Security Officer"=TRUE, "Warden"=TRUE, "Detective"=TRUE, "Head of Security"=TRUE, "Captain"=TRUE, "Blueshield"=TRUE, "Security Medic"=TRUE, "Security Sergeant"=TRUE) + var/static/list/job_lookup = list("Security Officer"=TRUE, "Warden"=TRUE, "Detective"=TRUE, "Head of Security"=TRUE, "Captain"=TRUE, "Blueshield"=TRUE, "Security Medic"=TRUE, "Security Sergeant"=TRUE, "Civil Disputes Officer"=TRUE) if(!holder) if(!mob.mind || !job_lookup[mob.mind.assigned_role]) to_chat(src, "You're not a security role!") diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm index 982592fd16e..7b47be9dd7f 100644 --- a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm +++ b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm @@ -22,9 +22,17 @@ display_order = JOB_DISPLAY_ORDER_JUNIOR_SECURITY_OFFICER bounty_types = CIV_JOB_SEC + departments = DEPARTMENT_SECURITY family_heirlooms = list(/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/head/beret/sec) + mail_goodies = list( + /obj/item/food/donut/caramel = 10, + /obj/item/food/donut/matcha = 10, + /obj/item/food/donut/blumpkin = 5, + /obj/item/clothing/mask/whistle = 5 + ) + /datum/outfit/job/junior_officer name = "Civil Disputes Officer" jobtype = /datum/job/junior_officer