From ea9a0cc094ce787eb867f4367b73355f1f248f09 Mon Sep 17 00:00:00 2001 From: MuckerMayhem <1161516+MuckerMayhem@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:01:05 +0300 Subject: [PATCH] [MIRROR] allow examining of items people are wearing --- code/game/objects/items.dm | 9 +++++++++ code/modules/clothing/_clothing.dm | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 296aef917200c..3511e07031eab 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -885,6 +885,8 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. var/ID = GetIdCard() if(ID) . += " \[Look at ID\]" + else + . += " \[?\]" /obj/item/proc/on_active_hand(mob/M) @@ -951,3 +953,10 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. /// Virtual for behavior to do after successful do_after if equip_delay is set /obj/item/proc/equip_delay_after(mob/user, slot, equip_flags) return + +/obj/item/OnTopic(href, href_list, datum/topic_state/state) + . = ..() + + if (href_list["examine"]) + examinate(usr, src) + return TOPIC_HANDLED diff --git a/code/modules/clothing/_clothing.dm b/code/modules/clothing/_clothing.dm index 8c92136887814..6dfad07833ae1 100644 --- a/code/modules/clothing/_clothing.dm +++ b/code/modules/clothing/_clothing.dm @@ -188,13 +188,15 @@ return STATUS_INTERACTIVE /obj/item/clothing/OnTopic(user, list/href_list, datum/topic_state/state) + . = ..() + if(href_list["list_ungabunga"]) var/list/visible = get_visible_accessories() if (length(visible)) var/list/display = list() for (var/obj/item/clothing/accessory/A in visible) if (!(A.accessory_flags & ACCESSORY_HIDDEN)) - display += "[icon2html(A, user)] \a [A]" + display += "[icon2html(A, user)] \a [A]\[?\]" to_chat(user, "Attached to \the [src] are [english_list(display)].") return TOPIC_HANDLED if(href_list["list_armor_damage"])