diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm index 9e8d8f6624a..00c18156efa 100644 --- a/code/datums/outfits/event/outfit_nanotrasen.dm +++ b/code/datums/outfits/event/outfit_nanotrasen.dm @@ -192,17 +192,17 @@ id_access = "Death Commando" -/datum/outfit/admin/nt/fib - name = "FIB Agent" +/datum/outfit/admin/nt/bssb + name = "BSSB Agent" - uniform = /obj/item/clothing/under/rank/fib - suit = /obj/item/clothing/suit/storage/toggle/fib + uniform = /obj/item/clothing/under/rank/bssb + suit = /obj/item/clothing/suit/storage/toggle/bssb 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 - id = /obj/item/card/id/ccia/fib + l_hand = /obj/item/storage/lockbox/cciaa/bssb + id = /obj/item/card/id/ccia/bssb accessory = /obj/item/clothing/accessory/holster/hip accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1) @@ -213,14 +213,28 @@ /obj/item/handcuffs = 1 ) - id_icon = "fib" + id_icon = "bssb" id_access = "CCIA Agent" -/datum/outfit/admin/nt/fib/guard - name = "FIB Escort" +/datum/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - suit = /obj/item/clothing/suit/armor/vest/fib - belt =/obj/item/storage/belt/security + if(H?.wear_suit) + var/obj/item/clothing/accessory/badge/bssb/senior/badge = new(src) + var/obj/item/clothing/U = H.wear_suit + U.attach_accessory(null, badge) + +/datum/outfit/admin/nt/bssb/guard + name = "BSSB Escort" + + suit = /obj/item/clothing/suit/storage/toggle/bssb/armor + belt = /obj/item/storage/belt/security + + shoes = /obj/item/clothing/shoes/jackboots + species_shoes = list( + SPECIES_UNATHI = /obj/item/clothing/shoes/jackboots/toeless, + SPECIES_TAJARA = /obj/item/clothing/shoes/tajara/jackboots, + SPECIES_TAJARA_MSAI = /obj/item/clothing/shoes/tajara/jackboots + ) r_pocket = null l_hand = null belt_contents = list( @@ -233,10 +247,16 @@ backpack_contents = list( /obj/item/storage/box/survival/engineer = 1, /obj/item/storage/box/zipties = 1, + /obj/item/gun/energy/gun = 1, /obj/item/clothing/head/helmet = 1 ) - id_access = "CCIA Agent" +/datum/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + + if(H?.wear_suit) + var/obj/item/clothing/accessory/badge/bssb/badge = new(src) + var/obj/item/clothing/U = H.wear_suit + U.attach_accessory(null, badge) /datum/outfit/admin/nt/odindoc name = "NTCC Odin Medical Specialist" diff --git a/code/datums/outfits/event/outfit_scc.dm b/code/datums/outfits/event/outfit_scc.dm index 03637de2fed..735149bd901 100644 --- a/code/datums/outfits/event/outfit_scc.dm +++ b/code/datums/outfits/event/outfit_scc.dm @@ -36,6 +36,7 @@ head = /obj/item/clothing/head/helmet/merc/scc uniform = /obj/item/clothing/under/tactical suit = /obj/item/clothing/suit/armor/carrier/heavy/scc + l_ear = /obj/item/device/radio/headset/ert/ccia/alt shoes = /obj/item/clothing/shoes/jackboots wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/security diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 1558130b66a..9944870cb1e 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -235,7 +235,6 @@ /obj/item/clothing/accessory/overalls/random, /obj/item/clothing/suit/captunic/capjacket, /obj/item/clothing/suit/ianshirt, - /obj/item/clothing/suit/storage/toggle/fib, /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/suit/storage/hooded/wintercoat/red, diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ca26ef8b815..f6d8a552fbf 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -731,6 +731,11 @@ icon_state = "com_headset" ks2type = /obj/item/device/encryptionkey/ert +/obj/item/device/radio/headset/ert/alt + name = "emergency response team bowman headset" + icon_state = "com_headset_alt" + item_state = "headset_alt" + /obj/item/device/radio/headset/legion name = "Tau Ceti Foreign Legion radio headset" desc = "The headset used by NanoTrasen sanctioned response forces." diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index b8d15aa8f25..c1f11b262bb 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -463,10 +463,10 @@ var/const/NO_EMAG_ACT = -50 var/blind_add_text = "Done with prejudice and professionalism, you mean business." return ..(user, add_text, blind_add_text) -/obj/item/card/id/ccia/fib - name = "\improper Federal Investigations Bureau identification card" - desc = "An ID straight from the Federal Investigations Bureau." - icon_state = "fib" +/obj/item/card/id/ccia/bssb + name = "\improper Biesel Security Services Bureau identification card" + desc = "An ID straight from the Biesel Security Services Bureau." + icon_state = "bssb" /obj/item/card/id/ert name = "\improper NanoTrasen Emergency Response Team identification card" diff --git a/code/modules/cciaa/cciaa_items.dm b/code/modules/cciaa/cciaa_items.dm index cefe1631747..25351873c6c 100644 --- a/code/modules/cciaa/cciaa_items.dm +++ b/code/modules/cciaa/cciaa_items.dm @@ -341,6 +341,11 @@ name = "central command internal affairs radio headset" ks2type = /obj/item/device/encryptionkey/ccia +/obj/item/device/radio/headset/ert/ccia/alt + name = "central command internal affairs bowman headset" + icon_state = "com_headset_alt" + item_state = "headset_alt" + /obj/item/device/encryptionkey/ccia name = "\improper CCIA radio encryption key" channels = list("Response Team" = 1, "Science" = 0, "Command" = 1, "Medical" = 0, "Engineering" = 0, "Security" = 0, "Operations" = 0, "Service" = 0) @@ -351,10 +356,10 @@ /obj/item/storage/lockbox/cciaa req_access = list(access_cent_ccia) name = "CCIA agent briefcase" - desc = "A smart looking briefcase with a NT logo on the side" + desc = "A smart looking briefcase with an SCC logo on the side" storage_slots = 8 max_storage_space = 16 -/obj/item/storage/lockbox/cciaa/fib - name = "FIB agent briefcase" - desc = "A smart looking ID locked briefcase." \ No newline at end of file +/obj/item/storage/lockbox/cciaa/bssb + name = "BSSB 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 b7403c7aa7b..ff6b3cb84de 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -77,12 +77,6 @@ bomb = ARMOR_BOMB_PADDED ) -/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/storage/toggle/armor/hos name = "armored trenchcoat" desc = "A trenchcoat lined with a protective alloy and some slick leather." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 80034c820b8..954adf29003 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -572,11 +572,26 @@ icon = 'icons/obj/item/clothing/suit/storage/toggle/corp_dep_jackets.dmi' contained_sprite = TRUE -/obj/item/clothing/suit/storage/toggle/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/storage/toggle/bssb + name = "\improper BSSB agent jacket" + desc = "A jacket used by Biesel Security Services Bureau agents while on the field." + icon_state = "bssb_jacket" + item_state = "bssb_jacket" + icon = 'icons/clothing/suits/coats/bssb_jacket.dmi' + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/toggle/bssb/armor + name = "\improper BSSB agent armored jacket" + desc = "A jacket used by Biesel Security Services Bureau agents while on the field. This one has armored lining." + icon_state = "bssb_jacket_armored" + item_state = "bssb_jacket_armored" + armor = list( + melee = ARMOR_MELEE_KNIVES, + bullet = ARMOR_BALLISTIC_SMALL, + laser = ARMOR_LASER_SMALL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED + ) // Cardigans. diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 5b8476dff5c..7fda7adf06d 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -178,6 +178,22 @@ overlay_state = "goldbadge" slot_flags = SLOT_TIE +/obj/item/clothing/accessory/badge/bssb + name = "\improper BSSB agent's badge" + desc = "A silver badge, set in purple leather, denoting the wearer as an agent of the Biesel Security Services Bureau." + desc_extended = "The overseeing authority of the domestic agencies that operate within the Republic of Biesel. In reality, the Biesel Security Services Bureau has become incredibly important to the enforcement of the Republic's laws. The BSSB was founded with the goal of monitoring the planetary policing forces within the Republic of Biesel and stepping in when needed. Most of the BSSB was sponsored by NanoTrasen, with even its headquarters having been constructed by the megacorporation. The agency quickly found its footing within the Republic and found itself being labelled as Biesel's most skilled law enforcement agency despite the accusation of bribery on behalf of NanoTrasen. Today, the BSSB has become an easily recognisable organization with several action movies and novels produced within the Republic of Biesel making it a centrepiece of the Republic's image. It is headed by Director Clarrise Lyon." + icon_state = "badge_round_bssb" + overlay_state = "badge_round_bssb" + slot_flags = SLOT_TIE + contained_sprite = TRUE + icon = 'icons/clothing/accessories/bssb_badge.dmi' + +/obj/item/clothing/accessory/badge/bssb/senior + name = "\improper BSSB senior agent's badge" + desc = "A golden badge, set in purple leather, denoting the wearer as a senior agent of the Biesel Security Services Bureau." + icon_state = "badge_round_bssb_sen" + overlay_state = "badge_round_bssb_sen" + /obj/item/clothing/accessory/badge/sol_visa name = "\improper ASSN visa recommendation slip" desc = "A compact piece of legal paperwork that can replace the enormous amounts of documents required to obtain a Sol Alliance visa." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a21a42e7eb2..baf92563d88 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -71,11 +71,11 @@ 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/rank/bssb + name = "\improper BSSB agent uniform" + desc = "A formal uniform used by Biesel Security Services Bureau agents." + icon_state = "bssb_uniform" + worn_state = "bssb_uniform" /obj/item/clothing/under/rank/scc name = "Stellar Corporate Conglomerate agent uniform" diff --git a/code/modules/ghostroles/spawner/human/admin/ccia.dm b/code/modules/ghostroles/spawner/human/admin/ccia.dm index de1a2083d64..da604ebdf8d 100644 --- a/code/modules/ghostroles/spawner/human/admin/ccia.dm +++ b/code/modules/ghostroles/spawner/human/admin/ccia.dm @@ -11,7 +11,7 @@ landmark_name = "CCIAAgent" req_perms = R_CCIAA - possible_species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) allow_appearance_change = APPEARANCE_PLASTICSURGERY respawn_flag = null @@ -58,10 +58,6 @@ outfit = /datum/outfit/admin/scc - //take this block of code out once CCIA moves over to SCC proper - enabled = FALSE - req_perms_edit = R_ADMIN - assigned_role = "SCC Agent" special_role = "SCC Agent" @@ -80,7 +76,7 @@ enabled = FALSE req_perms = null - req_perms_edit = R_ADMIN // change this to R_CCIAA when CCIA moves to SCC + req_perms_edit = R_CCIAA max_count = 1 assigned_role = "SCC Bodyguard" @@ -89,28 +85,28 @@ mob_name_prefix = "Spc. " mob_name_pick_message = "Pick a name." -/datum/ghostspawner/human/admin/corporate/fib - short_name = "fib" - name = "FIB Agent" - desc = "Investigate issues related to crimes under the jurisdiction of the Federal Investigations Bureau." +/datum/ghostspawner/human/admin/corporate/bssb + short_name = "bssb" + name = "BSSB Agent" + desc = "Investigate issues related to crimes under the jurisdiction of the Biesel Security Services Bureau." - outfit = /datum/outfit/admin/nt/fib - possible_species = list(SPECIES_HUMAN) + outfit = /datum/outfit/admin/nt/bssb - assigned_role = "FIB Agent" - special_role = "FIB Agent" + assigned_role = "BSSB Agent" + special_role = "BSSB Agent" mob_name_prefix = "S/Agt. " mob_name_pick_message = "Pick a name." -/datum/ghostspawner/human/admin/corporate/fib/escort - short_name = "fibescort" - name = "FIB Escort" - desc = "Protect the agents of the Federal Investigations Bureau while on the field." +/datum/ghostspawner/human/admin/corporate/bssb/escort + short_name = "bssbescort" + name = "BSSB Escort" + desc = "Protect the agents of the Biesel Security Services Bureau while on the field." landmark_name = "CCIAEscort" - outfit = /datum/outfit/admin/nt/fib/guard + outfit = /datum/outfit/admin/nt/bssb/guard + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_UNATHI, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) enabled = FALSE @@ -118,8 +114,8 @@ req_perms_edit = R_CCIAA max_count = 1 - assigned_role = "FIB Escort" - special_role = "FIB Escort" + assigned_role = "BSSB Escort" + special_role = "BSSB Escort" mob_name_prefix = "Agt. " mob_name_pick_message = "Pick a name." diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm index 6565558cfbd..3730b70f20c 100644 --- a/code/modules/ghostroles/spawner/human/emergencypod.dm +++ b/code/modules/ghostroles/spawner/human/emergencypod.dm @@ -59,7 +59,7 @@ possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) else if(t == "fib") welcome_message = "You are a stranded Federal Investigation Bureau Agent!
What was supposed to be a standard investigation turned into a nightmare when the vessel you were supposed to board opened fire! You just managed to reach an escape pod before your own ship was turned into smoldering rubble. You really need some coffee." - outfit = /datum/outfit/admin/pod/fib + outfit = /datum/outfit/admin/pod/bssb possible_species = list(SPECIES_HUMAN,SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) else @@ -341,10 +341,10 @@ /datum/outfit/admin/pod/scc/get_id_rank() return "Stellar Corporate Conglomerate Functionary" -/datum/outfit/admin/pod/fib - name = "RescuePod - FIB" // Doctor Pavel, I'm FIB. +/datum/outfit/admin/pod/bssb + name = "RescuePod - BSSB" // Doctor Pavel, I'm FIB. - uniform = /obj/item/clothing/under/rank/fib + uniform = /obj/item/clothing/under/rank/bssb shoes = /obj/item/clothing/shoes/laceup gloves = /obj/item/clothing/gloves/black l_pocket = /obj/item/reagent_containers/spray/pepper @@ -354,7 +354,7 @@ back = /obj/item/storage/backpack/satchel/leather backpack_contents = list( /obj/item/device/camera = 1, - /obj/item/clothing/suit/storage/toggle/fib = 1, + /obj/item/clothing/suit/storage/toggle/bssb = 1, /obj/item/handcuffs = 1, /obj/item/device/oxycandle = 1, /obj/item/airbubble = 1, @@ -363,10 +363,10 @@ -/datum/outfit/admin/pod/fib/get_id_assignment() +/datum/outfit/admin/pod/bssb/get_id_assignment() return "Federal Investigation Bureau Agent" -/datum/outfit/admin/pod/fib/get_id_rank() +/datum/outfit/admin/pod/bssb/get_id_rank() return "Federal Investigation Bureau Agent" diff --git a/html/changelogs/GeneralCamo - CCIA.yml b/html/changelogs/GeneralCamo - CCIA.yml new file mode 100644 index 00000000000..2aa6b566f7e --- /dev/null +++ b/html/changelogs/GeneralCamo - CCIA.yml @@ -0,0 +1,44 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: GeneralCamo, whitewolftamer + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - admin: "Added the SCC CCIA ghost spawners for CCIA staff." + - tweak: "Renamed the FIB to the BSSB." + - rscdel: "Removed most instances of public access to BSSB gear. This is CCIA gear and CCIA should not be easy to impersonate." + - tweak: "Modified the sprites for the BSSB jackets, and turned them into contained sprites. Sprites by whitewolftamer." diff --git a/icons/clothing/accessories/bssb_badge.dmi b/icons/clothing/accessories/bssb_badge.dmi new file mode 100644 index 00000000000..628e4c02e86 Binary files /dev/null and b/icons/clothing/accessories/bssb_badge.dmi differ diff --git a/icons/clothing/suits/coats/bssb_jacket.dmi b/icons/clothing/suits/coats/bssb_jacket.dmi new file mode 100644 index 00000000000..9371a0f628a Binary files /dev/null and b/icons/clothing/suits/coats/bssb_jacket.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 770f19de867..40a7522d11e 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index dcafd097b73..c109b2e97ee 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 5e0f08e92ef..2668378ca5c 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 27ef53eab5e..1244cdcf0f3 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -20174,30 +20174,30 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, @@ -26200,10 +26200,10 @@ layer = 2.99; pixel_y = 6 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, /obj/effect/floor_decal/corner/blue/full{ diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm index 1b8e8e2cd57..d9c85bd4e12 100644 --- a/maps/event/generic_dock/generic_dock-1.dmm +++ b/maps/event/generic_dock/generic_dock-1.dmm @@ -8413,30 +8413,30 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, @@ -11401,10 +11401,10 @@ layer = 2.99; pixel_y = 6 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, /obj/effect/floor_decal/corner/blue/full{ diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index 3eae556fbb0..e4e54d7f55e 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -1364,10 +1364,10 @@ layer = 2.99; pixel_y = 6 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, /obj/effect/floor_decal/corner/blue/full{ @@ -8141,30 +8141,30 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index e92117d9e86..5572238beb6 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -1470,10 +1470,10 @@ layer = 2.99; pixel_y = 6 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, -/obj/item/storage/lockbox/cciaa/fib{ +/obj/item/storage/lockbox/cciaa/bssb{ pixel_y = -1 }, /obj/effect/floor_decal/corner/blue/full{ @@ -1488,30 +1488,30 @@ dir = 5 }, /obj/structure/table/rack, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/storage/toggle/fib{ +/obj/item/clothing/suit/storage/toggle/bssb{ layer = 2.99; pixel_x = 6; pixel_y = 2 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 }, -/obj/item/clothing/suit/armor/vest/fib{ +/obj/item/clothing/suit/storage/toggle/bssb/armor{ pixel_x = -6; pixel_y = -3 },