Skip to content

Commit 3d205cb

Browse files
swaps these around, makes take a closer look work thru this
1 parent 25a3231 commit 3d205cb

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

code/game/objects/items.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ var/global/objects_thrown_when_explode = FALSE
247247

248248
if(usr.incapacitated())
249249
return TRUE
250+
if (href_list["lookitem"])
251+
usr.examination(src)
250252
if (!usr.dexterity_check())
251253
to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
252254
return TRUE
@@ -1369,7 +1371,7 @@ var/global/objects_thrown_when_explode = FALSE
13691371
return
13701372

13711373
for (var/atom/AM in view(user))
1372-
AM.on_see("[user] holds up [src].[ismob(AM) ? " <a HREF='?src=\ref[AM];lookitem=\ref[src]'>Take a closer look.</a>" : ""]",A=AM)
1374+
AM.on_see("[user] holds up [src]. <a HREF='?src=\ref[src];lookitem=\ref[AM]'>Take a closer look.</a>",A=src)
13731375

13741376
/mob/living/carbon/verb/showoff()
13751377
set name = "Show Held Item"

code/modules/clothing/suits/plate_carrier.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
/obj/item/clothing/suit/armor/plate_carrier/examine(mob/user)
5353
..()
5454
if(P)
55-
to_chat(user, "<span class = 'notice'>It has \a [P] attached to it. <a HREF='?src=\ref[user];lookitem=\ref[P]'>Take a closer look.</a></span>")
55+
to_chat(user, "<span class = 'notice'>It has \a [P] attached to it. <a HREF='?src=\ref[P];lookitem=\ref[user]'>Take a closer look.</a></span>")
5656

5757
/obj/item/clothing/suit/armor/plate_carrier/proc/handle_user_damage(kind, amount)
5858
if(!P)

code/modules/mob/mob.dm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,9 +1383,6 @@ Use this proc preferably at the end of an equipment loadout
13831383
var/t1 = text("window=[href_list["mach_close"]]")
13841384
unset_machine()
13851385
src << browse(null, t1)
1386-
else if (href_list["lookitem"])
1387-
var/obj/item/I = locate(href_list["lookitem"])
1388-
usr.examination(I)
13891386
else
13901387
return ..()
13911388
//if (href_list["joinresponseteam"])

code/modules/paperwork/paperbin.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
else
174174
to_chat(user, "<span class='info'>The paper on top has some bloody markings on it.</span>")
175175
else if(P.info)
176-
to_chat(user, "<span class='info'>You notice some writings on the top paper. <a HREF='?src=\ref[user];lookitem=\ref[P]'>Take a closer look.</a></span>")
176+
to_chat(user, "<span class='info'>You notice some writings on the top paper. <a HREF='?src=\ref[P];lookitem=\ref[user]'>Take a closer look.</a></span>")
177177
*/
178178
else
179179
to_chat(user, "<span class='info'>There are no papers in the bin.</span>")

code/modules/reagents/reagent_containers/glass/jar.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
..()
7878
if(held_item)
7979
to_chat(user, "<span class = 'info'>It has \a [held_item] floating within.</span>")
80-
to_chat(user, "<span class = 'info'><a HREF='?src=\ref[user];lookitem=\ref[held_item]'>Take a closer look.</a></span>")
80+
to_chat(user, "<span class = 'info'><a HREF='?src=\ref[held_item];lookitem=\ref[user]'>Take a closer look.</a></span>")
8181

8282
/obj/item/weapon/reagent_containers/glass/jar/recyclable(var/obj/machinery/r_n_d/fabricator/F)
8383
if(held_item)

0 commit comments

Comments
 (0)