cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 00:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes wording and brings back secret. (#6431)

Browse Source 
I promise this time I won't be LMAO.
This commit is contained in:
Karolis
2019-05-12 11:04:39 +03:00
committed by Erki
parent 567c396d24
commit 3a23618aa4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/vote.dm
+1 -2
View File
@@ -243,8 +243,7 @@ var/datum/controller/subsystem/vote/SSvote
if(!M)
continue
AddChoice(F, capitalize(M.name), "[M.required_players]")
if(ROUNDTYPE_STR_SECRET in choices)
AddChoice(ROUNDTYPE_STR_SECRET, "Secret")
AddChoice(ROUNDTYPE_STR_SECRET, "Secret")
if(ROUNDTYPE_STR_MIXED_SECRET in choices)
AddChoice(ROUNDTYPE_STR_MIXED_SECRET, "Mixed Secret")
if("crew_transfer")
vueui/src/components/view/misc/voting.vue
+3 -3
View File
@@ -8,7 +8,7 @@
<th>Choices</th><th>Votes</th><th v-if="mode == 'gamemode'">Minimum Players</th>
</tr>
<tr v-for="(options, choice) in uichoices" :key="choice">
<td><vui-button :class="{on: choice == voted}" style="text-align:left;" :params="{action: 'vote', vote: choice}">{{options.name}}</vui-button></td><td>{{options.votes}}</td><td v-if="options.extra">{{options.extra}}</td>
<td style="text-align:left;"><vui-button :class="{on: choice == voted}" :params="{action: 'vote', vote: choice}">{{options.name}}</vui-button></td><td>{{options.votes}}</td><td v-if="options.extra">{{options.extra}}</td>
</tr>
</table>
<hr>
@@ -26,11 +26,11 @@
<li>
<vui-button :disabled="!isstaff && !allow_vote_restart" :params="{action: 'crew_transfer'}">Crew Transfer</vui-button>
<span v-if="(isstaff || allow_vote_restart) && is_code_red">(Disallowed, Code Red or above)</span>
<vui-button :class="{on: allow_vote_restart}" v-if="isstaff" :params="{action: 'toggle_restart'}">Toggle Restart</vui-button>
<vui-button :class="{on: allow_vote_restart}" v-if="isstaff" :params="{action: 'toggle_restart'}">Toggle Restart / Crew Transfer voting</vui-button>
</li>
<li>
<vui-button :disabled="!isstaff && !allow_vote_mode" :params="{action: 'gamemode'}">GameMode</vui-button>
<vui-button :class="{on: allow_vote_mode}" v-if="isstaff" :params="{action: 'toggle_gamemode'}">Toggle GameMode</vui-button>
<vui-button :class="{on: allow_vote_mode}" v-if="isstaff" :params="{action: 'toggle_gamemode'}">Toggle GameMode voting</vui-button>
</li>
<li>
<vui-button :disabled="!allow_extra_antags" :params="{action: 'add_antagonist'}">Add Antagonist Type</vui-button>