mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] Job rank and radio channel rework (#8965)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Co-authored-by: Kashargul <KashL@t-online.de> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
@@ -121,7 +121,7 @@
|
||||
to_chat(user, "<span class='notice'>\The [computer] flashes an \"RFID Error - Unable to scan ID\" warning.</span>")
|
||||
return 0
|
||||
|
||||
if(access_to_check in I.access)
|
||||
if(access_to_check in I.GetAccess())
|
||||
return 1
|
||||
else if(loud)
|
||||
to_chat(user, "<span class='notice'>\The [computer] flashes an \"Access Denied\" warning.</span>")
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
accesses.Add(list(list(
|
||||
"desc" = replacetext(get_access_desc(access), " ", " "),
|
||||
"ref" = access,
|
||||
"allowed" = (access in id_card.access) ? 1 : 0
|
||||
"allowed" = (access in id_card.GetAccess()) ? 1 : 0
|
||||
)))
|
||||
|
||||
regions.Add(list(list(
|
||||
@@ -109,4 +109,4 @@
|
||||
)))
|
||||
data["regions"] = regions
|
||||
|
||||
return data
|
||||
return data
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
|
||||
// High security - can only be operated when the user has an ID with access on them.
|
||||
var/obj/item/weapon/card/id/I = usr.GetIdCard()
|
||||
if(!istype(I) || !(access_network in I.access))
|
||||
if(!istype(I) || !(access_network in I.GetAccess()))
|
||||
return TRUE
|
||||
|
||||
switch(action)
|
||||
|
||||
@@ -73,7 +73,7 @@ var/warrant_uid = 0
|
||||
// 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.
|
||||
var/obj/item/weapon/card/id/I = usr.GetIdCard()
|
||||
if(!istype(I) || !I.registered_name || !(access_security in I.access))
|
||||
if(!istype(I) || !I.registered_name || !(access_security in I.GetAccess()))
|
||||
to_chat(usr, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
|
||||
return
|
||||
|
||||
@@ -136,7 +136,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)"]"
|
||||
|
||||
Reference in New Issue
Block a user