shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum

Browse Source 
# Conflicts:
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/clothing/suits.dmi
This commit is contained in:
zerothebigboy
2021-03-19 14:30:05 -04:00
parent c64e7ee269 5e6122e554
commit 8456b3f709
72 changed files with 1768 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/game_mode.dm
+1 -1
View File
@@ -420,7 +420,7 @@
for(var/mob/dead/new_player/player in players)
if(player.client && player.ready == PLAYER_READY_TO_PLAY)
if(role in player.client.prefs.be_special)
if((role in player.client.prefs.be_special) && (ROLE_SYNDICATE in player.client.prefs.be_special))
if(!jobban_isbanned(player, ROLE_SYNDICATE) && !QDELETED(player) && !jobban_isbanned(player, role) && !QDELETED(player)) //Nodrak/Carn: Antag Job-bans
if(age_check(player.client)) //Must be older than the minimum age
candidates += player.mind // Get a list of all the people who want to be the antagonist for this round