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

Merge pull request #10126 from Squirgenheimer/skipantagfix2

Browse Source 
moves Global Antag Candidacy var to client level, adds check to autotraitor and blob game modes
This commit is contained in:
variableundefined
2018-11-06 17:31:51 +08:00
committed by GitHub
parent d44ed7f06b 4b29a45263
commit 4a3658132c
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client defines.dm
+1
View File
@@ -12,6 +12,7 @@
//OTHER//
/////////
var/datum/preferences/prefs = null
var/skip_antag = FALSE //TRUE when a player declines to be included for the selection process of game mode antagonists.
var/move_delay = 1
var/moving = null
var/adminobs = null
code/modules/mob/new_player/new_player.dm
+7 -8
View File
@@ -1,6 +1,5 @@
/mob/new_player
var/ready = 0
var/skip_antag = 0 //For declining an antag roll this round.
var/spawning = 0 //Referenced when you want to delete the new_player later on in the code.
var/totalPlayers = 0 //Player counts for the Lobby tab
var/totalPlayersReady = 0
@@ -65,16 +64,16 @@
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
if(!ready) output += "<p><a href='byond://?src=[UID()];ready=1'>Declare Ready</A></p>"
else output += "<p><b>You are ready</b> (<a href='byond://?src=[UID()];ready=2'>Cancel</A>)</p>"
var/list/antags = client.prefs.be_special
if(antags && antags.len)
if(!skip_antag) output += "<p><a href='byond://?src=[UID()];skip_antag=1'>Global Antag Candidacy</A>"
else output += "<p><a href='byond://?src=[UID()];skip_antag=2'>Global Antag Candidacy</A>"
output += "<br /><small>You are <b>[skip_antag ? "ineligible" : "eligible"]</b> for all antag roles.</small></p>"
else
output += "<p><a href='byond://?src=[UID()];manifest=1'>View the Crew Manifest</A></p>"
output += "<p><a href='byond://?src=[UID()];late_join=1'>Join Game!</A></p>"
var/list/antags = client.prefs.be_special
if(antags && antags.len)
if(!client.skip_antag) output += "<p><a href='byond://?src=[UID()];skip_antag=1'>Global Antag Candidacy</A>"
else output += "<p><a href='byond://?src=[UID()];skip_antag=2'>Global Antag Candidacy</A>"
output += "<br /><small>You are <b>[client.skip_antag ? "ineligible" : "eligible"]</b> for all antag roles.</small></p>"
output += "<p><a href='byond://?src=[UID()];observe=1'>Observe</A></p>"
if(GLOB.join_tos)
@@ -172,7 +171,7 @@
new_player_panel_proc()
if(href_list["skip_antag"])
skip_antag = !skip_antag
client.skip_antag = !client.skip_antag
new_player_panel_proc()
if(href_list["refresh"])