Merge branch 'master' into weapon-removal

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

@@ -72,8 +72,13 @@ var/warrant_uid = 0
 	// The following actions will only be possible if the user has an ID with security access equipped. This is in line with modular computer framework's authentication methods,
 	// which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet
 	// to someone who is to be arrested, which allows them to change the stuff there.
+<<<<<<< HEAD
 	var/obj/item/card/id/I = usr.GetIdCard()
 	if(!istype(I) || !I.registered_name || !(access_security in I.access))
+=======
+	var/obj/item/weapon/card/id/I = usr.GetIdCard()
+	if(!istype(I) || !I.registered_name || !(access_security in I.GetAccess()))
+>>>>>>> master
 		to_chat(usr, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
 		return
 
@@ -136,7 +141,7 @@ var/warrant_uid = 0
 
 		if("editwarrantauth")
 			. = TRUE
-			if(!(access_hos in I.access)) // VOREStation edit begin
+			if(!(access_hos in I.GetAccess())) // VOREStation edit begin
 				to_chat(usr, "<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)"]"