This commit is contained in:
Ghommie
2019-11-19 18:00:56 +01:00
parent a52e292cc8
commit dd101ef221
113 changed files with 519 additions and 552 deletions
+3 -3
View File
@@ -43,7 +43,7 @@
/obj/item/camera/examine(mob/user)
. = ..()
to_chat(user, "<span class='notice'>Alt-click to change its focusing, allowing you to set how big of an area it will capture.</span>")
. += "<span class='notice'>Alt-click to change its focusing, allowing you to set how big of an area it will capture.</span>"
/obj/item/camera/AltClick(mob/user)
if(!user.canUseTopic(src, BE_CLOSE))
@@ -81,8 +81,8 @@
..()
/obj/item/camera/examine(mob/user)
..()
to_chat(user, "It has [pictures_left] photos left.")
. = ..()
. += "It has [pictures_left] photos left."
//user can be atom or mob
/obj/item/camera/proc/can_target(atom/target, mob/user, prox_flag)
+4 -4
View File
@@ -40,8 +40,8 @@
/obj/item/wallframe/picture/examine(mob/user)
if(user.is_holding(src) && displayed)
displayed.show(user)
else
..()
return list()
return ..()
/obj/item/wallframe/picture/update_icon()
cut_overlays()
@@ -109,8 +109,8 @@
/obj/structure/sign/picture_frame/examine(mob/user)
if(in_range(src, user) && framed)
framed.show(user)
else
..()
return list()
return ..()
/obj/structure/sign/picture_frame/attackby(obj/item/I, mob/user, params)
if(can_decon && (istype(I, /obj/item/screwdriver) || istype(I, /obj/item/wrench)))
+2 -3
View File
@@ -62,12 +62,11 @@
..()
/obj/item/photo/examine(mob/user)
..()
. = ..()
if(in_range(src, user))
show(user)
else
to_chat(user, "<span class='warning'>You need to get closer to get a good look at this photo!</span>")
. += "<span class='warning'>You need to get closer to get a good look at this photo!</span>"
/obj/item/photo/proc/show(mob/user)
if(!istype(picture) || !picture.picture_image)