cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution, compile fixes with outdated glass paths/map.

Browse Source
This commit is contained in:
Zuhayr
2014-11-19 23:17:25 +10:30
parent 31e6c4a207 76aa84ee6e
commit cec617a414
33 changed files with 1715 additions and 1723 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>"