diff --git a/code/game/world.dm b/code/game/world.dm
index d3491903..09697a52 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -32,8 +32,10 @@ GLOBAL_VAR(restart_counter)
 
 	load_admins()
 	LoadVerbs(/datum/verbs/menu)
-	if(CONFIG_GET(flag/usewhitelist))
-		load_whitelist()
+	load_paniclist()
+// Hyperstation: Whitelists do not work.
+//	if(CONFIG_GET(flag/usewhitelist))
+//		load_whitelist()
 	LoadBans()
 	reload_custom_roundstart_items_list()//Cit change - loads donator items. Remind me to remove when I port over bay's loadout system
 
diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm
index 52ba3c52..117cc6a9 100644
--- a/code/modules/admin/chat_commands.dm
+++ b/code/modules/admin/chat_commands.dm
@@ -138,6 +138,6 @@ GLOBAL_LIST(round_end_notifiees)
 
 	GLOB.bunker_passthrough |= ckey(params)
 
-	log_admin("[sender.friendly_name] has added [params] to the current round's bunker bypass list.")
-	message_admins("[sender.friendly_name] has added [params] to the current round's bunker bypass list.")
+	log_admin("[sender.friendly_name] has added [params] to the bunker bypass list.")
+	message_admins("[sender.friendly_name] has added [params] to the bunker bypass list.")
 	return "[params] has been added to the current round's bunker bypass list."
diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm
index d4bca5e3..262d35c9 100644
--- a/code/modules/admin/verbs/panicbunker.dm
+++ b/code/modules/admin/verbs/panicbunker.dm
@@ -1,3 +1,6 @@
+#define PANICFILE "[global.config.directory]/whitelist.txt"
+
+
 /client/proc/panicbunker()
 	set category = "Server"
 	set name = "Toggle Panic Bunker"
@@ -25,9 +28,10 @@
 		return
 
 	GLOB.bunker_passthrough |= ckey(ckeytobypass)
-	log_admin("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
-	message_admins("[key_name_admin(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
-	send2irc("Panic Bunker", "[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
+	log_admin("[key_name(usr)] has added [ckeytobypass] to the bunker bypass list.")
+	message_admins("[key_name_admin(usr)] has added [ckeytobypass] to the bunker bypass list.")
+	send2irc("Panic Bunker", "[key_name(usr)] has added [ckeytobypass] to the bunker bypass list.")
+	save_paniclist()
 
 /client/proc/revokebunkerbypass(ckeytobypass as text)
 	set category = "Special Verbs"
@@ -41,3 +45,23 @@
 	log_admin("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
 	message_admins("[key_name_admin(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
 	send2irc("Panic Bunker", "[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
+	save_paniclist()
+
+//Hyperchange, we altered the panic bunker into a whitelist. So it will load whitelist.txt and treat it as a bypass to the panic bunker.
+
+/proc/load_paniclist()
+	GLOB.bunker_passthrough = list()
+	for(var/line in world.file2list(PANICFILE))
+		if(!line)
+			continue
+		if(findtextEx(line,"#",1,2))
+			continue
+		GLOB.bunker_passthrough += ckey(line)
+
+	if(!GLOB.bunker_passthrough.len)
+		GLOB.bunker_passthrough = null
+
+/proc/save_paniclist()
+	var/namelist = list2text(GLOB.bunker_passthrough, ",")
+	var/paniclist = PANICFILE
+	paniclist << namelist
\ No newline at end of file
diff --git a/modular_citadel/icons/mob/robots.dmi b/modular_citadel/icons/mob/robots.dmi
index 88d8e48c..1489ae2a 100644
Binary files a/modular_citadel/icons/mob/robots.dmi and b/modular_citadel/icons/mob/robots.dmi differ