From 5a349932ee93ec4bdeca491a720c3a358a7e38a8 Mon Sep 17 00:00:00 2001
From: quotefox <49098813+quotefox@users.noreply.github.com>
Date: Fri, 22 Nov 2019 04:47:27 +0000
Subject: [PATCH] Fixes
---
code/modules/admin/verbs/panicbunker.dm | 3 ++-
code/modules/client/client_procs.dm | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm
index 2897427d..d4bca5e3 100644
--- a/code/modules/admin/verbs/panicbunker.dm
+++ b/code/modules/admin/verbs/panicbunker.dm
@@ -15,9 +15,10 @@
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Panic Bunker", "[new_pb ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
send2irc("Panic Bunker", "[key_name(usr)] has toggled the Panic Bunker, it is now [new_pb ? "enabled" : "disabled"].")
+
/client/proc/addbunkerbypass(ckeytobypass as text)
set category = "Special Verbs"
- set name = "Add PB Bypass"
+ set name = "Whitelist"
set desc = "Allows a given ckey to connect despite the panic bunker for a given round."
if(!CONFIG_GET(flag/sql_enabled))
to_chat(usr, "The Database is not enabled!")
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 7f063f1e..b29fa56f 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -501,7 +501,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
if(!query_client_in_db.NextRow())
if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey] && !(ckey in GLOB.bunker_passthrough))
log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
- message_admins("Failed Login: [key] - New account attempting to connect during panic bunker")
+ message_admins("Failed Login: [key] - New account attempting to connect without being whitelisted!")
to_chat(src, "You must first join the Discord to verify your account before joining this server.
To do so, read the rules here http://hyperstation13.com/rules and post a request in the #whitelist-application under the \"Main server\" category in the Discord server linked here: https://discordapp.com/invite/PCtX2fH") //CIT CHANGE - makes the panic bunker disconnect message point to the discord
var/list/connectiontopic_a = params2list(connectiontopic)
var/list/panic_addr = CONFIG_GET(string/panic_server_address)