Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 036a26f

Browse files
committed
TGS Test Merge (#20771)
2 parents b251e1d + 30866f4 commit 036a26f

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

yogstation/code/game/world.dm

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,17 @@ GLOBAL_LIST_EMPTY(donators)
4040
var/s = ""
4141
var/server_name = CONFIG_GET(string/servername)
4242
if (server_name)
43-
s += "<br><b>[server_name]</b> &#8212; New Player Friendly &#8212; 99% Lag Free!!"
44-
s += "<br>(<a href=\"https://tinyurl.com/yogsfo\">Forums</a>|<a href=\"https://tinyurl.com/yogsdis\">Discord</a>)" // The Forum & Discord links line
45-
s += "<br>Time: <b>[gameTimestamp("hh:mm")]</b>"
46-
s += "<br>Map: <b>[SSmapping?.config?.map_name || "Unknown"]</b>"
47-
s += "<br>Alert: <b>[capitalize(get_security_level())]</b>"
48-
s += "<br><i>[pick(world.file2list("yogstation/strings/taglines.txt"))]</i><br>"
43+
s += "[server_name]\] &#8212; Dive In Now: Perfect for Beginners!"
44+
s += "<br>99% Lag-Free Experience! Join the Adventure!"
45+
s += "<br>Time: <b>[gameTimestamp("hh:mm")]</b> | Map: <b>[SSmapping?.config?.map_name || "Unknown"]</b> | Alert: <b>[capitalize(get_security_level())]</b>"
46+
s += "<br>\[<a href=\"https://yogstation.net/\">Website</a>" // link to our website so they can join forums + discord from here
4947

48+
//As of October 27th, 2023 taglines.txt is no longer used in the status because we never had the characters to spare it, so it would put 2-3 random characters at the end and look bad.
5049

5150
//PLAYER COUNT
51+
5252
var/players = GLOB.clients.len
53+
/*
5354
var/popcaptext = ""
5455
if(players)
5556
popcaptext = "~[players] player\s"
@@ -59,11 +60,17 @@ GLOBAL_LIST_EMPTY(donators)
5960
6061
s += "\[[popcaptext][queuetext]"
6162
63+
*/
64+
65+
/*
66+
6267
//HOST
6368
var/hostedby = CONFIG_GET(string/hostedby)
6469
if (!host && hostedby)
6570
s += " hosted by <b>[hostedby]</b>"
6671
72+
*/
73+
6774
//RETURN
6875
status = s
6976
game_state = (CONFIG_GET(number/extreme_popcap) && players >= CONFIG_GET(number/extreme_popcap)) //tells the hub if we are full

0 commit comments

Comments
 (0)