From f972199a156fc2838d032ff3a929009dab881ab0 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Sat, 29 Apr 2017 15:44:51 -0500
Subject: [PATCH] Fixed Dsay always causing a disk read

---
 code/modules/admin/verbs/deadsay.dm     | 2 +-
 code/modules/admin/verbs/deadsay.dm.rej | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 code/modules/admin/verbs/deadsay.dm.rej

diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 8703784fc6..3dabd99da1 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -19,7 +19,7 @@
 
 	if (!msg)
 		return
-	var/nicknames = world.file2list("config/admin_nicknames.txt")
+	var/static/nicknames = world.file2list("config/admin_nicknames.txt")
 
 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
 
diff --git a/code/modules/admin/verbs/deadsay.dm.rej b/code/modules/admin/verbs/deadsay.dm.rej
new file mode 100644
index 0000000000..2e48326069
--- /dev/null
+++ b/code/modules/admin/verbs/deadsay.dm.rej
@@ -0,0 +1,8 @@
+diff a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm	(rejected hunks)
+@@ -29,4 +29,4 @@
+ 		if (M.stat == DEAD || (M.client && M.client.holder && (M.client.prefs.chat_toggles & CHAT_DEAD))) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
+ 			M.show_message(rendered, 2)
+ 
+-	SSblackbox.add_details("admin_verb","Dsay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+\ No newline at end of file
++	SSblackbox.add_details("admin_verb","Dsay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!