cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 07:35:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into weapon-removal

Browse Source
This commit is contained in:
Guti
2024-09-18 18:07:43 +02:00
parent 409aaba802 55ac1c54f0
commit f4f5476121
482 changed files with 5086 additions and 35138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
+2 -2
View File
@@ -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
code/modules/modular_computers/file_system/programs/research/email_administration.dm
+5
View File
@@ -66,8 +66,13 @@
return TRUE
// High security - can only be operated when the user has an ID with access on them.
<<<<<<< HEAD
var/obj/item/card/id/I = usr.GetIdCard()
if(!istype(I) || !(access_network in I.access))
=======
var/obj/item/weapon/card/id/I = usr.GetIdCard()
if(!istype(I) || !(access_network in I.GetAccess()))
>>>>>>> master
return TRUE
switch(action)
code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
+6 -1
View File
@@ -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)"]"