From cc8e3019adb572d51138c1188940565c0d84e34e Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Tue, 11 Nov 2025 11:56:10 +0100 Subject: [PATCH] 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. --- code/game/objects/items/devices/slide_projector.dm | 1 + code/modules/paperwork/paper.dm | 14 +------------- code/modules/paperwork/photography.dm | 2 +- html/changelogs/PaperFix.yml | 7 +++++++ 4 files changed, 10 insertions(+), 14 deletions(-) create mode 100644 html/changelogs/PaperFix.yml diff --git a/code/game/objects/items/devices/slide_projector.dm b/code/game/objects/items/devices/slide_projector.dm index 119df031516..d7b47104739 100644 --- a/code/game/objects/items/devices/slide_projector.dm +++ b/code/game/objects/items/devices/slide_projector.dm @@ -145,6 +145,7 @@ anchored = TRUE simulated = FALSE plane = ABOVE_LIGHTING_PLANE + mouse_opacity = MOUSE_OPACITY_ICON alpha = 100 var/datum/weakref/source diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 4af1e13fe35..9a9fdd90412 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -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) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 096b8d7c7d5..3a2fe6df01a 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -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 diff --git a/html/changelogs/PaperFix.yml b/html/changelogs/PaperFix.yml new file mode 100644 index 00000000000..46e0c67d678 --- /dev/null +++ b/html/changelogs/PaperFix.yml @@ -0,0 +1,7 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Papers no longer show their message twice when examined." + - bugfix: "The slide projector projections can now be examined again."