mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-28 15:39:57 +01:00
Fixes papers and the slide projector (#21559)
Papers no longer have double text shown when examining them. The slide projector projections can now be examined again, and papers and photos can be looked at properly through it.
This commit is contained in:
@@ -69,7 +69,7 @@
|
||||
return
|
||||
if(name != initial(name))
|
||||
. += "It's titled '[name]'."
|
||||
if(distance <= 1)
|
||||
if(distance <= 1 || in_slide_projector(user))
|
||||
show_content(user)
|
||||
else
|
||||
. += SPAN_NOTICE("You have to go closer if you want to read it.")
|
||||
@@ -131,18 +131,6 @@
|
||||
if(new_text)
|
||||
free_space -= length(strip_html_properly(new_text))
|
||||
|
||||
/obj/item/paper/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
|
||||
. = ..()
|
||||
if (old_name && (icon_state == "paper_plane" || icon_state == "paper_swan"))
|
||||
. += SPAN_NOTICE("You're going to have to unfold it before you can read it.")
|
||||
return
|
||||
if(name != initial(name))
|
||||
. += "It's titled '[name]'."
|
||||
if(distance <= 1)
|
||||
show_content(user)
|
||||
else
|
||||
. += SPAN_NOTICE("You have to go closer if you want to read it.")
|
||||
|
||||
/obj/item/paper/proc/show_content(mob/user, forceshow)
|
||||
simple_asset_ensure_is_sent(user, /datum/asset/simple/paper)
|
||||
var/datum/browser/paper_win = new(user, name, null, 450, 500, null, TRUE)
|
||||
|
||||
@@ -47,7 +47,7 @@ GLOBAL_VAR_INIT(photo_count, 0)
|
||||
|
||||
/obj/item/photo/feedback_hints(mob/user, distance, is_adjacent)
|
||||
. += ..()
|
||||
if(distance <= 1)
|
||||
if(distance <= 1 || in_slide_projector(user))
|
||||
show(user)
|
||||
. += SPAN_NOTICE("[picture_desc]")
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user