diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index c00709c69b2..b35085ccce6 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -135,7 +135,7 @@ back = /obj/item/storage/backpack/satchel gloves = /obj/item/clothing/gloves/white shoes = /obj/item/clothing/shoes/laceup - l_ear = /obj/item/device/radio/headset/heads/hop + l_ear = /obj/item/device/radio/headset/ert/ccia glasses = /obj/item/clothing/glasses/sunglasses id = /obj/item/card/id @@ -335,6 +335,45 @@ id_access = "Death Commando" +/datum/outfit/admin/nt/fib + name = "FIB Agent" + + uniform = /obj/item/clothing/under/rank/fib + suit = /obj/item/clothing/suit/storage/fib + gloves = /obj/item/clothing/gloves/black + + l_pocket = /obj/item/reagent_containers/spray/pepper + r_pocket = /obj/item/device/taperecorder/cciaa + l_hand = /obj/item/storage/lockbox/cciaa/fib + + accessory = /obj/item/clothing/accessory/holster/hip + accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1) + + backpack_contents = list( + /obj/item/storage/box/engineer = 1, + /obj/item/device/flash = 1, + /obj/item/handcuffs = 1 + ) + +/datum/outfit/admin/nt/fib/guard + name = "FIB Escort" + + suit = /obj/item/clothing/suit/armor/vest/fib + belt =/obj/item/storage/belt/security + l_hand = null + belt_contents = list( + /obj/item/device/flash = 1, + /obj/item/melee/baton/loaded = 1, + /obj/item/handcuffs = 2, + /obj/item/ammo_magazine/c45m = 2 + ) + + backpack_contents = list( + /obj/item/storage/box/engineer = 1, + /obj/item/storage/box/zipties = 1, + /obj/item/clothing/head/helmet = 1 + ) + /datum/outfit/admin/pirate name = "Pirate" diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index dba13689534..d4586e28675 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -225,7 +225,7 @@ if(interviewee_id) to_chat(user,"The device beeps and flashes \"A interviewee has already been associated with this interview\".") return - + if(ishuman(user)) var/mob/living/carbon/human/H = user if(!H.character_id) @@ -277,3 +277,6 @@ storage_slots = 8 max_storage_space = 16 +/obj/item/storage/lockbox/cciaa/fib + name = "FIB agent briefcase" + desc = "A smart looking ID locked briefcase." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 232f08f342c..ad90be3439a 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -85,6 +85,12 @@ icon_state = "commissar_warden" item_state = "commissar_warden" +/obj/item/clothing/suit/armor/vest/fib + name = "\improper FIB armored vest" + desc = "An armored vest used by Federal Investigations Bureau agents during operations." + icon_state = "fib_armor" + item_state = "fib_armor" + /obj/item/clothing/suit/armor/hos name = "head of security's jacket" desc = "An armoured jacket with golden rank pips and livery." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 1b6c0ed79ff..b418c72ee02 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -625,6 +625,12 @@ icon_open = "sec_dep_jacket_open" icon_closed = "sec_dep_jacket" +/obj/item/clothing/suit/storage/fib + name = "\improper FIB agent jacket" + desc = "A jacket used by Federal Investigations Bureau agents while on the field." + icon_state = "fib_jacket" + item_state = "fib_jacket" + /obj/item/clothing/suit/cardigan name = "cardigan" desc = "A cozy, warm knit cardigan. Only slightly worse than a blanket." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index c80b83075e5..fa7328f772a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -99,6 +99,12 @@ worn_state = "centcom" displays_id = 0 +/obj/item/clothing/under/rank/fib + name = "\improper FIB agent uniform" + desc = "A formal uniform used by Federal Investigations Bureau agents." + icon_state = "fib_uniform" + worn_state = "fib_uniform" + /obj/item/clothing/under/ert name = "ERT tactical uniform" desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. It looks very tactical." diff --git a/code/modules/ghostroles/spawner/human/admin.dm b/code/modules/ghostroles/spawner/human/admin.dm index 51ed2738654..c187190ab07 100644 --- a/code/modules/ghostroles/spawner/human/admin.dm +++ b/code/modules/ghostroles/spawner/human/admin.dm @@ -146,6 +146,47 @@ mob_name_prefix = "Sent. " mob_name_pick_message = "Pick a callsign or last-name." +/datum/ghostspawner/human/admin/fib + short_name = "fib" + name = "FIB Agent" + desc = "Investigate issues related to crimes under the jurisdiction of the Federal Investigations Bureau." + + enabled = FALSE + landmark_name = "CCIAAgent" + req_perms = null + req_perms_edit = R_CCIAA + max_count = 1 + + outfit = /datum/outfit/admin/nt/fib + possible_species = list("Human") + possible_genders = list(MALE,FEMALE) + allow_appearance_change = APPEARANCE_PLASTICSURGERY + + assigned_role = "FIB Agent" + special_role = "FIB Agent" + respawn_flag = null + + mob_name = null + mob_name_prefix = "S/Agt. " + mob_name_pick_message = "Pick a name." + +/datum/ghostspawner/human/admin/fib/escort + short_name = "fibescort" + name = "FIB Escort" + desc = "Protect the agents of the Federal Investigations Bureau while on the field." + + landmark_name = "CCIAEscort" + + outfit = /datum/outfit/admin/nt/fib/guard + + assigned_role = "FIB Escort" + special_role = "FIB Escort" + respawn_flag = null + + mob_name = null + mob_name_prefix = "Agt. " + mob_name_pick_message = "Pick a name." + /client/proc/despawn() set name = "Despawn" set desc = "Your work is done. Leave this realm." diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 1994a42a5b6..771f6e800c3 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index b41dc8a3784..10ecd3a8bc0 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 914a6d95ec1..c1c0fe8a00c 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 6cde225d9bc..e415c5d751e 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ