cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into tgport-16569

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Tigercat2000
2016-04-02 20:29:28 -07:00
parent 8e7c447646 49f8ab674c
commit b4eaf130b0
139 changed files with 738 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/world.dm
+1 -1
View File
@@ -399,7 +399,7 @@ var/world_topic_spam_protect_time = world.timeofday
// features += "hosted by <b>[config.hostedby]</b>"
if (features)
s += ": [list2text(features, ", ")]"
s += ": [jointext(features, ", ")]"
/* does this help? I do not know */
if (src.status != s)