Merge pull request #5806 from Markolie/cameraconsoleupdate

Camera console update
This commit is contained in:
Crazy Lemon
2016-12-29 01:18:21 -08:00
committed by GitHub
7 changed files with 176 additions and 162 deletions
+2 -2
View File
@@ -631,11 +631,11 @@
data["can_launch"] = !shuttle_master.supply.canMove()
return data
/obj/machinery/computer/supplycomp/proc/is_authorized(user)
/obj/machinery/computer/supplycomp/proc/is_authorized(mob/user)
if(allowed(user))
return 1
if(isobserver(user) && check_rights(R_ADMIN, 0))
if(user.can_admin_interact())
return 1
return 0