Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>

code/modules/paperwork/paper.dm

@@ -141,12 +141,11 @@
 	free_space -= length(strip_html_properly(new_text))
 
 /obj/item/weapon/paper/examine(mob/user)
-	..()
+	. = ..()
 	if(in_range(user, src) || istype(user, /mob/observer/dead))
 		show_content(usr)
 	else
-		to_chat(user, "<span class='notice'>You have to go closer if you want to read it.</span>")
-	return
+		. += "<span class='notice'>You have to go closer if you want to read it.</span>"
 
 /obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow=0)
 	if(!(istype(user, /mob/living/carbon/human) || istype(user, /mob/observer/dead) || istype(user, /mob/living/silicon)) && !forceshow)

code/modules/paperwork/paper_bundle.dm

@@ -96,11 +96,11 @@
 				to_chat(user, "<font color='red'>You must hold \the [P] steady to burn \the [src].</font>")
 
 /obj/item/weapon/paper_bundle/examine(mob/user)
-	if(..(user, 1))
-		src.show_content(user)
+	. = ..()
+	if(Adjacent(user))
+		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/weapon/paper_bundle/proc/show_content(mob/user as mob)
 	var/dat

code/modules/paperwork/paperbin.dm

@@ -94,13 +94,12 @@
 
 
 /obj/item/weapon/paper_bin/examine(mob/user)
-	if(get_dist(src, user) <= 1)
+	. = ..()
+	if(Adjacent(user))
 		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>")
-	return
-
+			. += "<span class='notice'>There are no papers in the bin.</span>"
 
 /obj/item/weapon/paper_bin/update_icon()
 	if(amount < 1)

code/modules/paperwork/pen.dm

@@ -26,6 +26,9 @@
 	drop_sound = 'sound/items/drop/accessory.ogg'
 
 /obj/item/weapon/pen/attack_self(var/mob/user)
+	if(!user.checkClickCooldown())
+		return
+	user.setClickCooldown(1 SECOND)
 	to_chat(user, "<span class='notice'>Click.</span>")
 	playsound(loc, 'sound/items/penclick.ogg', 50, 1)
 

code/modules/paperwork/photocopier.dm

@@ -26,8 +26,9 @@
 	RefreshParts()
 
 /obj/machinery/photocopier/examine(mob/user as mob)
-	if(..(user, 1))
-		to_chat(user, "The screen shows there's [toner ? "[toner]" : "no"] toner left in the printer.")
+	. = ..()
+	if(Adjacent(user))
+		. += "The screen shows there's [toner ? "[toner]" : "no"] toner left in the printer."
 
 /obj/machinery/photocopier/attack_ai(mob/user as mob)
 	return attack_hand(user)

code/modules/paperwork/photography.dm

@@ -51,11 +51,12 @@ var/global/photo_count = 0
 	..()
 
 /obj/item/weapon/photo/examine(mob/user)
+	//This is one time we're not going to call parent, because photos are 'secret' unless you're close enough.
 	if(in_range(user, src))
 		show(user)
-		to_chat(user,desc)
+		return list(desc)
 	else
-		to_chat(user, "<span class='notice'>It is too far away.</span>")
+		return list("<span class='notice'>It is too far away to examine.</span>")
 
 /obj/item/weapon/photo/proc/show(mob/user as mob)
 	user << browse_rsc(img, "tmp_photo_[id].png")