Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme

code/modules/modular_computers/file_system/computer_file.dm

@@ -23,7 +23,7 @@ var/global/file_uid = 0
 	if(holder.holder2 && holder.holder2.active_program == src)
 		holder.holder2.kill_program(1)
 	holder = null
-	..()
+	return ..()
 
 // Returns independent copy of this file.
 /datum/computer_file/proc/clone(var/rename = 0)

code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm

@@ -90,7 +90,7 @@ var/warrant_uid = 0
 				W.fields["auth"] = "Unauthorized"
 				W.fields["arrestsearch"] = "arrest"
 			if(temp == "search")
-				W.fields["namewarrant"] = "No location given"
+				W.fields["namewarrant"] = "No suspect/location given" // VOREStation edit
 				W.fields["charges"] = "No reason given"
 				W.fields["auth"] = "Unauthorized"
 				W.fields["arrestsearch"] = "search"
@@ -135,7 +135,9 @@ var/warrant_uid = 0
 
 	if(href_list["editwarrantauth"])
 		. = 1
-
+		if(!(access_hos in I.access)) // VOREStation edit begin
+			to_chat(user, "<span class='warning'>You don't have the access to do this!</span>")
+			return // VOREStation edit end
 		activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
 
 	if(href_list["back"])