From 529125d3dd19143be27aa22d4f463923b58dc55a Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Mon, 1 May 2017 11:51:27 -0500
Subject: [PATCH] Moves tips from config to strings tree

---
 code/controllers/subsystem/ticker.dm    |  4 ++--
 code/modules/admin/verbs/deadsay.dm.rej | 10 ++++++++++
 {config => strings}/admin_nicknames.txt |  0
 {config => strings}/sillytips.txt       |  0
 {config => strings}/tips.txt            |  0
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 code/modules/admin/verbs/deadsay.dm.rej
 rename {config => strings}/admin_nicknames.txt (100%)
 rename {config => strings}/sillytips.txt (100%)
 rename {config => strings}/tips.txt (100%)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index f701c051da..67599e4f4c 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -625,8 +625,8 @@ SUBSYSTEM_DEF(ticker)
 	if(selected_tip)
 		m = selected_tip
 	else
-		var/list/randomtips = world.file2list("config/tips.txt")
-		var/list/memetips = world.file2list("config/sillytips.txt")
+		var/list/randomtips = world.file2list("strings/tips.txt")
+		var/list/memetips = world.file2list("strings/sillytips.txt")
 		if(randomtips.len && prob(95))
 			m = pick(randomtips)
 		else if(memetips.len)
diff --git a/code/modules/admin/verbs/deadsay.dm.rej b/code/modules/admin/verbs/deadsay.dm.rej
new file mode 100644
index 0000000000..7d0347427b
--- /dev/null
+++ b/code/modules/admin/verbs/deadsay.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm	(rejected hunks)
+@@ -19,7 +19,7 @@
+ 
+ 	if (!msg)
+ 		return
+-	var/static/nicknames = world.file2list("strings/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/config/admin_nicknames.txt b/strings/admin_nicknames.txt
similarity index 100%
rename from config/admin_nicknames.txt
rename to strings/admin_nicknames.txt
diff --git a/config/sillytips.txt b/strings/sillytips.txt
similarity index 100%
rename from config/sillytips.txt
rename to strings/sillytips.txt
diff --git a/config/tips.txt b/strings/tips.txt
similarity index 100%
rename from config/tips.txt
rename to strings/tips.txt