diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 538680dd7fa..5b9c5e56e03 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -16,7 +16,9 @@ if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(H), slot_back) if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/captain(H), slot_w_uniform) + var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) + U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U) + H.equip_to_slot_or_del(U, slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 252adba8414..a4c5903135f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -204,7 +204,7 @@ BLIND // can't see anything ..() /obj/item/clothing/under/verb/removetie() - set name = "Remove Tie" + set name = "Remove Accessory" set category = "Object" set src in usr if(!istype(usr, /mob/living)) return diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index ea0eab9e88b..edefc013e2b 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -6,7 +6,7 @@ item_state = "" //no inhands color = "bluetie" flags = FPRINT | TABLEPASS - slot_flags = SLOT_ICLOTHING | SLOT_HEAD + slot_flags = 0 w_class = 2.0 /obj/item/clothing/tie/blue @@ -79,6 +79,7 @@ /obj/item/clothing/tie/medal/bronze_heart name = "bronze heart medal" desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." + icon_state = "bronze_heart" /obj/item/clothing/tie/medal/nobel_science name = "nobel sciences award" diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 0a476956e38..c6625026b9a 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 2ea63b61e9c..9d7b6aeaa71 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ