From aa86c85b98ec3519f3256e125e2060629948dab4 Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant2@gmail.com>
Date: Sun, 1 Nov 2015 20:34:37 -0800
Subject: [PATCH] Add config option to disable same-CID popup "YOU'LL BE BANNED
 STOP IT"

This is seriously fucking annoying when testing local changes. Only a
config option instead of being removed completely because I am actually
going to go fucking insane without this being gone.
---
 code/controllers/configuration.dm | 4 ++++
 code/modules/mob/login.dm         | 3 ++-
 config/example/config.txt         | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index f356a1a9ca7..9447e3ea681 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -173,6 +173,7 @@
 	var/dsay_allowed = 1
 
 	var/disable_lobby_music = 0 // Disables the lobby music
+	var/disable_cid_warn_popup = 0 //disables the annoying "You have already logged in this round, disconnect or be banned" popup, because it annoys the shit out of me when testing.
 
 /datum/configuration/New()
 	var/list/L = subtypesof(/datum/game_mode)
@@ -549,6 +550,9 @@
 				if("disable_lobby_music")
 					config.disable_lobby_music = 1
 
+				if("disable_cid_warn_popup")
+					config.disable_cid_warn_popup = 1
+
 				else
 					diary << "Unknown setting in configuration: '[name]'"
 
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index a1478496ff7..4ed0f62e96b 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -14,7 +14,8 @@
 				if( (M.computer_id == client.computer_id) )
 					if(matches)	matches += " and "
 					matches += "ID ([client.computer_id])"
-					spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
+					if(!config.disable_cid_warn_popup)
+						spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!")
 				if(matches)
 					if(M.client)
 						message_admins("<font color='red'><B>Notice: </B><font color='blue'><A href='?src=\ref[usr];priv_msg=\ref[src]'>[key_name_admin(src)]</A> has the same [matches] as <A href='?src=\ref[usr];priv_msg=\ref[M]'>[key_name_admin(M)]</A>.</font>", 1)
diff --git a/config/example/config.txt b/config/example/config.txt
index 6f5485ba6e6..835edc66e4d 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -311,4 +311,7 @@ PLAYER_REROUTE_CAP 0
 #DISABLE_DSAY
 
 ## Uncomment this if you want to disable the lobby music
-#DISABLE_LOBBY_MUSIC
\ No newline at end of file
+#DISABLE_LOBBY_MUSIC
+
+## Uncomment this if you want to disable the popup alert for people on the same CID
+#DISABLE_CID_WARN_POPUP
\ No newline at end of file