Refactors the examine proc to return a list of strings (#12280)

This commit is contained in:
farie82
2019-09-25 22:05:01 -07:00
committed by variableundefined
parent 40a4cd1b75
commit 0e8ddb2afe
210 changed files with 808 additions and 830 deletions
+3 -2
View File
@@ -38,8 +38,9 @@
toppaper = locate(/obj/item/paper_bundle) in src
/obj/item/clipboard/examine(mob/user)
if(..(user, 1) && toppaper)
toppaper.examine(user)
. = ..()
if(in_range(user, src) && toppaper)
. += toppaper.examine(user)
obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing)
if(placing)
+6 -6
View File
@@ -137,10 +137,10 @@
playsound(PF.loc, usesound, 100, 1)
/obj/item/picture_frame/examine(mob/user, var/distance = -1, var/infix = "", var/suffix = "")
..()
/obj/item/picture_frame/examine(mob/user, var/infix = "", var/suffix = "")
. = ..()
if(displayed)
displayed.examine(user, distance, infix, suffix)
. += displayed.examine(user, infix, suffix)
/obj/item/picture_frame/attack_self(mob/user)
if(displayed)
@@ -245,11 +245,11 @@
else
return ..()
/obj/structure/sign/picture_frame/examine(mob/user, var/distance = -1, var/infix = "", var/suffix = "")
/obj/structure/sign/picture_frame/examine(mob/user, var/infix = "", var/suffix = "")
if(frame)
frame.examine(user, distance, infix, suffix)
. += frame.examine(user, infix, suffix)
else
..()
. = ..()
/obj/structure/sign/picture_frame/attack_hand(mob/user)
if(frame)
+3 -2
View File
@@ -60,13 +60,14 @@
icon_state = "paper"
/obj/item/paper/examine(mob/user)
. = ..()
if(user.is_literate())
if(in_range(user, src) || istype(user, /mob/dead/observer))
show_content(user)
else
to_chat(user, "<span class='notice'>You have to go closer if you want to read it.</span>")
. += "<span class='notice'>You have to go closer if you want to read it.</span>"
else
to_chat(user, "<span class='notice'>You don't know how to read.</span>")
. += "<span class='notice'>You don't know how to read.</span>"
/obj/item/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
+4 -3
View File
@@ -100,10 +100,11 @@
to_chat(user, "<span class='warning'>You must hold \the [P] steady to burn \the [src].</span>")
/obj/item/paper_bundle/examine(mob/user)
if(..(user, 1))
src.show_content(user)
. = ..()
if(in_range(user, src))
show_content(user)
else
to_chat(user, "<span class='notice'>It is too far away.</span>")
. += "<span class='notice'>It is too far away.</span>"
/obj/item/paper_bundle/proc/show_content(mob/user as mob)
var/dat
+4 -3
View File
@@ -100,11 +100,12 @@
/obj/item/paper_bin/examine(mob/user)
if(..(user, 1))
. = ..()
if(in_range(user, src))
if(amount)
to_chat(usr, "<span class='notice'>There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.</span>")
. += "<span class='notice'>There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.</span>"
else
to_chat(usr, "<span class='notice'>There are no papers in the bin.</span>")
. += "<span class='notice'>There are no papers in the bin.</span>"
/obj/item/paper_bin/update_icon()
+6 -4
View File
@@ -74,10 +74,11 @@
to_chat(user, "<span class='warning'>You must hold \the [P] steady to burn \the [src].</span>")
/obj/item/photo/examine(mob/user)
if(..(user, 1) || isobserver(user))
. = ..()
if(in_range(user, src) || isobserver(user))
show(user)
else
to_chat(user, "<span class='notice'>It is too far away.</span>")
. += "<span class='notice'>It is too far away.</span>"
/obj/item/photo/proc/show(mob/user as mob)
usr << browse_rsc(img, "tmp_photo.png")
@@ -539,8 +540,9 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
to_chat(user, "You switch the camera [on ? "on" : "off"].")
/obj/item/videocam/examine(mob/user)
if(..(user, 1))
to_chat(user, "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active.")
. = ..()
if(in_range(user, src))
. += "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active."
/obj/item/videocam/hear_talk(mob/M as mob, list/message_pieces)
var/msg = multilingual_to_message(message_pieces)