From e6679878b345c8b89a1988753cb2078f0a68384e Mon Sep 17 00:00:00 2001 From: GDLW Date: Tue, 9 May 2023 16:03:21 +0200 Subject: [PATCH] respawn limit removed you can now respawn as the same character --- code/modules/mob/dead/new_player/new_player.dm | 8 +++++--- code/modules/mob/mob.dm | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index cff9bad7..b8a14a9d 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -122,9 +122,11 @@ LateChoices() return - if(client.prefs.real_name in client.pastcharacters) //if character has been spawned before - to_chat(usr, "You have played that character before this round, please select a new one!") - return + // if(client.prefs.real_name in client.pastcharacters) //if character has been spawned before + // to_chat(usr, "You have played that character before this round, please select a new one!") + // return + + //GS13 - commented it out to allow players to rejoin if(SSticker.queued_players.len || (relevant_cap && living_player_count() >= relevant_cap && !(ckey(key) in GLOB.admin_datums))) to_chat(usr, "[CONFIG_GET(string/hard_popcap_message)]") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ab20dc2d..2133535c 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -451,10 +451,12 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA //if they didnt join as a observer, add their name to the past character list so they cannot play them again. if(!usr.client.respawn_observing) - var/responserespawn = alert(src,"If you respawn now, you cannot rejoin the game as your current character! Are you sure you want to respawn?","Warning","Yes","No") - if(responserespawn != "Yes") - return - usr.client.pastcharacters += usr.real_name + var/responserespawn = alert(src,"Are you sure you want to respawn?","Warning","Yes","No") + // if(responserespawn != "Yes") + // return + // usr.client.pastcharacters += usr.real_name + + //GS13 - commented out to allow players to rejoin with the same char if(!client) log_game("[key_name(usr)] AM failed due to disconnect.")