cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/frames.dm
+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)