From ceb2c7112ee53a0c4607403d93d9b38edc2c87cf Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 18 Feb 2019 14:12:51 -0600 Subject: [PATCH 1/4] Merge pull request #5962 from GeneriedJenelle/patch-1 Prevents people from joining with the same character --- code/modules/mob/new_player/new_player.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index ea27828385..cd9171ab75 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -169,6 +169,13 @@ ViewManifest() if(href_list["SelectedJob"]) + + //Prevents people rejoining as same character. + for (var/mob/living/carbon/human/C in mob_list) + var/char_name = client.prefs.real_name + if(char_name == C.real_name) + usr << "There is a character that already exists with the same name - [C.real_name], please join with a different one." + return if(!config.enter_allowed) usr << "There is an administrative lock on entering the game!" From d9ad515056edb895a855019a36497155b074385e Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 25 Feb 2019 09:13:32 -0500 Subject: [PATCH 3/4] [5962] Adjustments to PR 4785 - QTR no longer blacklists the character from rejoining. - Modified notifications to encourage QTR use --- code/modules/mob/dead/observer/free_vr.dm | 4 ++-- code/modules/mob/new_player/new_player.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/dead/observer/free_vr.dm b/code/modules/mob/dead/observer/free_vr.dm index c10101f8be..dca361725f 100644 --- a/code/modules/mob/dead/observer/free_vr.dm +++ b/code/modules/mob/dead/observer/free_vr.dm @@ -11,7 +11,7 @@ var/global/list/prevent_respawns = list() set category = "OOC" set desc = "Free your job slot, remove yourself from the manifest, and prevent respawning as this character for this round." - var/confirm = alert("This will free up your job slot, remove you from the manifest, and prevent you from respawning with this character for the round. You can rejoin as another \ + var/confirm = alert("This will free up your job slot, remove you from the manifest, and allow you to respawn as this character. You can rejoin as another \ character if you like. Do this now?","Quit This Round","Quit Round","Cancel") if(confirm != "Quit Round") return @@ -22,7 +22,7 @@ var/global/list/prevent_respawns = list() return //Add them to the nope list - prevent_respawns += mind.name + //prevent_respawns += mind.name //Replaced by PR 4785 //Update any existing objectives involving this mob. for(var/datum/objective/O in all_objectives) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index cd9171ab75..b007ab9049 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -174,7 +174,7 @@ for (var/mob/living/carbon/human/C in mob_list) var/char_name = client.prefs.real_name if(char_name == C.real_name) - usr << "There is a character that already exists with the same name - [C.real_name], please join with a different one." + usr << "There is a character that already exists with the same name - [C.real_name], please join with a different one, or use Quit the Round with the previous character." return if(!config.enter_allowed) From 9a5065a77f06004e13892fb02f554d98ccca029a Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 25 Feb 2019 09:23:17 -0500 Subject: [PATCH 4/4] Forgot Vorestation Edit --- code/modules/mob/new_player/new_player.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index b007ab9049..410732573d 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -174,7 +174,7 @@ for (var/mob/living/carbon/human/C in mob_list) var/char_name = client.prefs.real_name if(char_name == C.real_name) - usr << "There is a character that already exists with the same name - [C.real_name], please join with a different one, or use Quit the Round with the previous character." + usr << "There is a character that already exists with the same name - [C.real_name], please join with a different one, or use Quit the Round with the previous character." //VOREStation Edit return if(!config.enter_allowed)