diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 9865ce38151..7a7fa7b76a3 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -93,6 +93,8 @@ new /obj/item/clothing/suit/toggle/lawyer/black(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/clothing/shoes/laceup(src) + new /obj/item/clothing/tie/lawyers_badge(src) + new /obj/item/clothing/tie/lawyers_badge(src) /obj/structure/closet/wardrobe/chaplain_black name = "chapel wardrobe" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index dbfec48dfb0..8b76f284132 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -367,3 +367,22 @@ icon_state = "talisman" item_color = "talisman" armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 20, bio = 20, rad = 5) //Faith is the best armor. + +////////////// +//OBJECTION!// +////////////// + +/obj/item/clothing/tie/lawyers_badge + name = "attorney's badge" + desc = "Fills you with the conviction of JUSTICE. Lawyers tend to want to show it to everyone they meet." + icon_state = "lawyerbadge" + item_color = "lawyerbadge" + +/obj/item/clothing/tie/attach(obj/item/clothing/under/U, user) + if(!..()) + return 0 + user.bubble_icon = "lawyer" + +/obj/item/clothing/tie/detach(obj/item/clothing/under/U, user) + ..() + user.bubble_icon = initial(user.bubble_icon) \ No newline at end of file diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index 6264c73d6ed..ef2eebf4d14 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -165,6 +165,8 @@ Lawyer shoes = /obj/item/clothing/shoes/laceup l_hand = /obj/item/weapon/storage/briefcase/lawyer l_pocket = /obj/item/device/laser_pointer + r_pocket = /obj/item/clothing/tie/lawyers_badge + /datum/outfit/job/lawyer/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() @@ -177,5 +179,3 @@ Lawyer if(J.lawyers>1) uniform = /obj/item/clothing/under/lawyer/purpsuit suit = /obj/item/clothing/suit/toggle/lawyer/purple - - H.bubble_icon = "lawyer" diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 967c466a5fd..e679b2112a8 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ