Merge pull request #13852 from Citadel-Station-13/silicons-patch-39

!always_can_respawn_as
This commit is contained in:
DeltaFire
2020-12-23 04:45:56 +01:00
committed by GitHub

View File

@@ -126,7 +126,7 @@
/datum/job/proc/special_check_latejoin(client/C)
var/joined = LAZYLEN(C.prefs?.characters_joined_as)
if(C.prefs?.respawn_restrictions_active && (joined || CONFIG_GET(flag/respawn_penalty_includes_observe)))
if(!CONFIG_GET(flag/allow_non_assistant_respawn) && always_can_respawn_as)
if(!CONFIG_GET(flag/allow_non_assistant_respawn) && !always_can_respawn_as)
return FALSE
if(!CONFIG_GET(flag/allow_combat_role_respawn) && considered_combat_role)
return FALSE