mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 01:49:19 +00:00
Moves tips from config to strings tree
This commit is contained in:
@@ -625,8 +625,8 @@ SUBSYSTEM_DEF(ticker)
|
|||||||
if(selected_tip)
|
if(selected_tip)
|
||||||
m = selected_tip
|
m = selected_tip
|
||||||
else
|
else
|
||||||
var/list/randomtips = world.file2list("config/tips.txt")
|
var/list/randomtips = world.file2list("strings/tips.txt")
|
||||||
var/list/memetips = world.file2list("config/sillytips.txt")
|
var/list/memetips = world.file2list("strings/sillytips.txt")
|
||||||
if(randomtips.len && prob(95))
|
if(randomtips.len && prob(95))
|
||||||
m = pick(randomtips)
|
m = pick(randomtips)
|
||||||
else if(memetips.len)
|
else if(memetips.len)
|
||||||
|
|||||||
10
code/modules/admin/verbs/deadsay.dm.rej
Normal file
10
code/modules/admin/verbs/deadsay.dm.rej
Normal file
@@ -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>"
|
||||||
|
|
||||||
Reference in New Issue
Block a user