cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds examine boxes. (#18370)

Browse Source 
* Adds examine boxes.

* lint

* what kind of dreams did you dream?

* unlimited

* midgardsormr

* sdsd

* fixes

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2024-02-11 21:58:20 +00:00
committed by GitHub
co-authored by Matt Atlas
parent d57c5e7c43
commit 4423d03f2f
296 changed files with 1317 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/folders.dm
+2 -2
View File
@@ -165,9 +165,9 @@
else
icon_state = "envelope[contents.len > 0]"
/obj/item/folder/envelope/examine(mob/user)
/obj/item/folder/envelope/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
to_chat(user, "The seal is [sealed ? "intact" : "broken"].")
. += "The seal is [sealed ? "intact" : "broken"]."
/obj/item/folder/envelope/proc/sealcheck(user)
var/ripperoni = alert("Are you sure you want to break the seal on \the [src]?", "Confirmation","Yes", "No")
code/modules/paperwork/paper.dm
+4 -4
View File
@@ -100,17 +100,17 @@
if(new_text)
free_space -= length(strip_html_properly(new_text))
/obj/item/paper/examine(mob/user, distance, is_adjacent)
/obj/item/paper/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if (old_name && (icon_state == "paper_plane" || icon_state == "paper_swan"))
to_chat(user, SPAN_NOTICE("You're going to have to unfold it before you can read it."))
. += SPAN_NOTICE("You're going to have to unfold it before you can read it.")
return
if(name != initial(name))
to_chat(user,"It's titled '[name]'.")
. += "It's titled '[name]'."
if(distance <= 1)
show_content(user)
else
to_chat(user, SPAN_NOTICE("You have to go closer if you want to read it."))
. += 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)
code/modules/paperwork/paper_bundle.dm
+2 -3
View File
@@ -91,13 +91,12 @@
else
to_chat(user, "<span class='warning'>You must hold \the [P] steady to burn \the [src].</span>")
/obj/item/paper_bundle/examine(mob/user, distance, is_adjacent)
/obj/item/paper_bundle/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(is_adjacent)
src.show_content(user)
else
to_chat(user, "<span class='notice'>It is too far away.</span>")
return
. += "<span class='notice'>It is too far away.</span>"
/obj/item/paper_bundle/proc/show_content(mob/user as mob)
var/dat
code/modules/paperwork/paperbin.dm
+3 -11
View File
@@ -84,22 +84,14 @@
to_chat(user, "<span class='notice'>You put [i] in [src].</span>")
papers.Add(i)
amount++
/* if(istype(O, /obj/item/paper_pack)) WIP written in.
var/obj/item/paper_bundle/j = O
amount += j.amount
to_chat(user, "<span class='notice'>You add paper from [j] into [src].</span>")
user.drop_from_inventory(j,get_turf(src))
qdel(j)
*/
/obj/item/paper_bin/examine(mob/user, distance, is_adjacent)
/obj/item/paper_bin/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(is_adjacent)
if(amount)
to_chat(user, "<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(user, "<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()
code/modules/paperwork/photography.dm
+5 -6
View File
@@ -58,14 +58,13 @@ var/global/photo_count = 0
scribble = txt
..()
/obj/item/photo/examine(mob/user, distance, is_adjacent)
/obj/item/photo/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(distance <= 1)
show(user)
to_chat(user, "<span class='notice'>[picture_desc]</span>")
. += "<span class='notice'>[picture_desc]</span>"
else
to_chat(user, "<span class='notice'>You are too far away to discern its contents.</span>")
. += "<span class='notice'>You are too far away to discern its contents.</span>"
/obj/item/photo/proc/show(mob/user as mob)
send_rsc(user, img, "tmp_photo_[id].png")
@@ -150,10 +149,10 @@ var/global/photo_count = 0
var/icon_off = "camera_off"
var/size = 3
/obj/item/device/camera/examine(mob/user, distance, is_adjacent)
/obj/item/device/camera/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
. = ..()
if(is_adjacent)
to_chat(user, SPAN_NOTICE("It has <b>[pictures_left]</b> photos left."))
. += SPAN_NOTICE("It has <b>[pictures_left]</b> photos left.")
/obj/item/device/camera/verb/change_size()
set name = "Set Photo Focus"