cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6037 from Crazylemon64/conscientious_objection

Browse Source 
You are now able to opt out of all role requests for a single round
This commit is contained in:
Fox McCloud
2017-01-06 12:45:00 -05:00
committed by GitHub
parent 0e514b42a2 168cfad2d7
commit cc8727f03b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/game.dm
+6 -1
View File
@@ -442,7 +442,7 @@ proc/pollCandidates(var/Question, var/be_special_type, var/antag_age_check = 0,
spawn(0)
G << 'sound/misc/notice2.ogg'//Alerting them to their consideration
switch(alert(G,Question,"Please answer in [poll_time/10] seconds!","Yes","No"))
switch(alert(G,Question,"Please answer in [poll_time/10] seconds!","Yes","No","Not This Round"))
if("Yes")
to_chat(G, "<span class='notice'>Choice registered: Yes.</span>")
if((world.time-time_passed)>poll_time)//If more than 30 game seconds passed.
@@ -453,6 +453,11 @@ proc/pollCandidates(var/Question, var/be_special_type, var/antag_age_check = 0,
if("No")
to_chat(G, "<span class='danger'>Choice registered: No.</span>")
return
if("Not This Round")
to_chat(G, "<span class='danger'>Choice registered: No.</span>")
to_chat(G, "<span class='notice'>You will no longer receive notifications for the role '[roletext]' for the rest of the round.</span>")
G.client.prefs.be_special -= be_special_type
return
else
return
sleep(poll_time)