cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-15 12:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6818 from Neerti/event_manager_fix_electric_boogaloo

Browse Source 
Fully Implements R_EVENT for Event Managers
This commit is contained in:
Atermonera
2020-03-12 12:01:07 -07:00
committed by GitHub
parent 3314d865bd 780ffca53d
commit 0021a3b025
30 changed files with 179 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/modular_computers/computers/modular_computer/interaction.dm
View File

@@ -100,7 +100,7 @@
/obj/item/modular_computer/attack_ghost(var/mob/observer/ghost/user)
if(enabled)
ui_interact(user)
else if(check_rights(R_ADMIN, 0, user))
else if(check_rights(R_ADMIN|R_EVENT, 0, user))
var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No")
if(response == "Yes")
turn_on(user)

2
code/modules/modular_computers/file_system/program.dm
View File

@@ -97,7 +97,7 @@
return 1
// Admin override - allows operation of any computer as aghosted admin, as if you had any required access.
if(istype(user, /mob/observer/dead) && check_rights(R_ADMIN, 0, user))
if(istype(user, /mob/observer/dead) && check_rights(R_ADMIN|R_EVENT, 0, user))
return 1
if(!istype(user))