cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +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/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)