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

Merge remote-tracking branch 'upstream/dev' into APC

Browse Source
This commit is contained in:
PsiOmega
2014-11-19 14:40:18 +01:00
parent cad3c76986 088c86f692
commit c45f77f247
94 changed files with 819 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/voting.dm
View File

@@ -290,9 +290,9 @@ datum/controller/vote
var/admin = 0
var/trialmin = 0
if(C.holder)
admin = 1
if(C.holder.rights & R_ADMIN)
trialmin = 1
admin = 1
trialmin = 1 // don't know why we use both of these it's really weird, but I'm 2 lasy to refactor this all to use just admin.
voting |= C
. = "<html><head><title>Voting Panel</title></head><body>"