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

moves skip_antag to client level, adds checks for it in autotraitor.dm and blob.dm

Browse Source
This commit is contained in:
Squirgenheimer
2018-11-05 02:02:40 -05:00
parent 7cb02e80f4
commit 5d1ac25a64
5 changed files with 16 additions and 15 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 //Decline to be selected as a game mode antagonist.
var/move_delay = 1
var/moving = null
var/adminobs = null
code/modules/mob/new_player/new_player.dm
+3 -4
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
@@ -68,9 +67,9 @@
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>"
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>[skip_antag ? "ineligible" : "eligible"]</b> for all antag roles.</small></p>"
output += "<br /><small>You are <b>[client.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>"
@@ -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"])