cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Prevent players who get booted back to the lobby on shiftstart from getting broken antag status on latejoin (#6055)

Browse Source 
* Prevent players who get booted back to the lobby on shiftstart from getting broken antag status on latejoin (#59377)

* Prevent players who get booted back to the lobby on shiftstart from getting broken antag status on latejoin

* Mirrored

* oop

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Funce <funce.973@gmail.com>
This commit is contained in:
SkyratBot
2021-06-01 11:58:55 +12:00
committed by GitHub
co-authored by Timberpoes Funce
parent e300ce16ca
commit ef2ebaf291
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/dynamic/dynamic.dm
+1 -1
View File
@@ -386,7 +386,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
for(var/i in GLOB.new_player_list)
var/mob/dead/new_player/player = i
if(player.ready == PLAYER_READY_TO_PLAY && player.mind)
if(player.ready == PLAYER_READY_TO_PLAY && player.mind && player.check_preferences())
roundstart_pop_ready++
if(player.client.prefs.be_antag) //SKYRAT EDIT CHANGE
candidates.Add(player)
code/modules/mob/dead/new_player/new_player.dm
+2 -3
View File
@@ -527,9 +527,8 @@
ineligible_for_roles = TRUE
ready = PLAYER_NOT_READY
if(has_antags)
log_admin("[src.ckey] just got booted back to lobby with no jobs, but antags enabled.")
message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.")
log_admin("[src.ckey] has no jobs enabled, return to lobby if job is unavailable enabled and [client.prefs.be_special.len] antag preferences enabled. The player has been forcefully returned to the lobby.")
message_admins("[src.ckey] has no jobs enabled, return to lobby if job is unavailable enabled and [client.prefs.be_special.len] antag preferences enabled. This is an old antag rolling technique. The player has been asked to update their job preferences and has been forcefully returned to the lobby.")
return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well
return TRUE
modular_skyrat/master_files/code/modules/mob/living/dead/new_player/new_player.dm
+2 -3
View File
@@ -570,9 +570,8 @@
ineligible_for_roles = TRUE
ready = PLAYER_NOT_READY
if(has_antags)
log_admin("[src.ckey] just got booted back to lobby with no jobs, but antags enabled.")
message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.")
log_admin("[src.ckey] has no jobs enabled, return to lobby if job is unavailable enabled and [client.prefs.be_special.len] antag preferences enabled. The player has been forcefully returned to the lobby.")
message_admins("[src.ckey] has no jobs enabled, return to lobby if job is unavailable enabled and [client.prefs.be_special.len] antag preferences enabled. This is an old antag rolling technique. The player has been asked to update their job preferences and has been forcefully returned to the lobby.")
return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well
return TRUE