diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 171c618f7a..7fac6fb7e3 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -592,16 +592,14 @@
A.blood_overlay = I
/obj/item/proc/showoff(mob/user)
- user.custom_emote(message = "[user] holds up [src]")
-
-/obj/item/weapon/grab/showoff(mob/user)
- user.custom_emote(message = "[user] nods at [affecting]")
+ for (var/mob/M in view(user))
+ M.show_message("[user] holds up [src]. Take a closer look.",1)
/mob/living/carbon/verb/showoff()
- set name = "Show item"
+ set name = "Show Held Item"
set category = "Object"
var/obj/item/I = get_active_hand()
- if(I && I.abstract)
+ if(I && !I.abstract)
I.showoff(src)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 74cab64505..7c760a5f47 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -776,6 +776,14 @@
if(istype(usr,/mob/living/silicon/robot))
var/mob/living/silicon/robot/U = usr
R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
+
+ if (href_list["lookitem"])
+ var/obj/item/I = locate(href_list["lookitem"])
+ I.examine()
+
+ if (href_list["lookmob"])
+ var/mob/M = locate(href_list["lookmob"])
+ M.examine()
..()
return