diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 74b91c3265..eabae56d7c 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -363,7 +363,7 @@ return list("Assistant", "Captain", "Blueshield", "Head of Personnel", "Bridge Officer", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Paramedic", - "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Prisoner") + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Prisoner") /proc/get_all_job_icons() //For all existing HUD icons return get_all_jobs() + list("Prisoner") diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 8754229074..1580c7605f 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index add0779140..87b900dfc8 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/modular_splurt/code/modules/jobs/job_types/peacekeeper.dm b/modular_splurt/code/modules/jobs/job_types/peacekeeper.dm index 8d5a499d16..e155e8839c 100644 --- a/modular_splurt/code/modules/jobs/job_types/peacekeeper.dm +++ b/modular_splurt/code/modules/jobs/job_types/peacekeeper.dm @@ -13,7 +13,7 @@ exp_type = EXP_TYPE_CREW considered_combat_role = FALSE alt_titles = list("Slutcurity Trainee", "Security Trainee", "Security Assistant", "Security Cadet", "Security Trainee", "Rookie") - custom_spawn_text = " Your job is to help Security and react to Minor crimes. Conflict De-escalation through WORDS is your top priority. Only use your taser as a last resort.You are NOT a Security Officer." + custom_spawn_text = " Your job is to help Security and react to minor crimes. Conflict de-escalation through WORDS is your top priority. Only use your taser as a last resort.You are NOT a Security Officer." outfit = /datum/outfit/job/peacekeeper plasma_outfit = /datum/outfit/plasmaman/peacekeeper @@ -33,7 +33,7 @@ name = "Peacekeeper" jobtype = /datum/job/peacekeeper - belt = /obj/item/gun/energy/e_gun/advtaser + belt = /obj/item/pda/security ears = /obj/item/radio/headset/headset_sec/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses uniform = /obj/item/clothing/under/rank/security/officer/peacekeeper @@ -41,9 +41,10 @@ head = /obj/item/clothing/head/helmet/blueshirt suit = /obj/item/clothing/suit/armor/vest/peacekeeper shoes = /obj/item/clothing/shoes/jackboots - r_pocket = /obj/item/storage/bag/security - l_pocket = /obj/item/pda/security - backpack_contents = list(/obj/item/storage/box/zipties, /obj/item/reagent_containers/spray/pepper, /obj/item/clothing/accessory/badge/deputy, /obj/item/assembly/flash/handheld, /obj/item/holosign_creator/security) + l_pocket = /obj/item/restraints/handcuffs + r_pocket = /obj/item/assembly/flash/handheld + suit_store = /obj/item/gun/energy/e_gun/advtaser + backpack_contents = list(/obj/item/reagent_containers/spray/pepper, /obj/item/clothing/accessory/badge/deputy, /obj/item/holosign_creator/security) backpack = /obj/item/storage/backpack/security/pk satchel = /obj/item/storage/backpack/satchel/sec/pk @@ -52,7 +53,7 @@ implants = list(/obj/item/implant/mindshield) -/datum/outfit/plasmaman/peacekeeper +/datum/outfit/plasmaman/peacekeeper // i dare not to touch whatever this is why does it have a fucking telescopic baton name = "Peacekeeper Plasmaman" head = /obj/item/clothing/head/helmet/space/plasmaman/security @@ -61,7 +62,7 @@ r_hand = /obj/item/melee/classic_baton/telescopic r_pocket = /obj/item/storage/bag/security l_pocket = /obj/item/assembly/flash/handheld - backpack_contents = list(/obj/item/storage/box/zipties, /obj/item/reagent_containers/peacehypo, /obj/item/reagent_containers/spray/pepper, /obj/item/clothing/accessory/badge/deputy) + backpack_contents = list(/obj/item/reagent_containers/spray/pepper, /obj/item/clothing/accessory/badge/deputy) box = /obj/item/storage/box/survival/security