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

Merge with dev-freeze.

Browse Source
This commit is contained in:
Zuhayr
2015-06-21 20:45:47 +09:30
parent 7473d18ecb 7f319f528a
commit 48cf00ca54
62 changed files with 706 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/voting.dm
View File

@@ -237,7 +237,7 @@ datum/controller/vote
return 0
for(var/antag_type in all_antag_types)
var/datum/antagonist/antag = all_antag_types[antag_type]
if(!(antag.id in additional_antag_types) && (antag.flags & ANTAG_VOTABLE))
if(!(antag.id in additional_antag_types) && antag.is_votable())
choices.Add(antag.role_text)
choices.Add("None")
if("custom")