cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Steals tg's span macros (#12232)

Browse Source 
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
This commit is contained in:
adamsong
2021-09-17 06:50:16 -05:00
committed by GitHub
parent 3b63dff207
commit 3baeaeb0c4
1702 changed files with 15112 additions and 14933 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
code/controllers/subsystem/ticker.dm
View File

@@ -117,7 +117,7 @@ SUBSYSTEM_DEF(ticker)
login_music = choose_lobby_music()
if(!login_music)
to_chat(world, "<span class='boldwarning'>Could not load lobby music.</span>") //yogs end
to_chat(world, span_boldwarning("Could not load lobby music.")) //yogs end
if(!GLOB.syndicate_code_phrase)
GLOB.syndicate_code_phrase = generate_code_phrase(return_list=TRUE)
@@ -154,7 +154,7 @@ SUBSYSTEM_DEF(ticker)
start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
for(var/client/C in GLOB.clients)
window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
to_chat(world, "<span class='boldnotice'>Welcome to [station_name()]!</span>")
to_chat(world, span_boldnotice("Welcome to [station_name()]!"))
send2chat("New round starting on [SSmapping.config.map_name]!", CONFIG_GET(string/chat_announce_new_game))
current_state = GAME_STATE_PREGAME
//Everyone who wants to be an observer is now spawned
@@ -212,7 +212,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/setup()
to_chat(world, "<span class='boldannounce'>Starting game...</span>")
to_chat(world, span_boldannounce("Starting game..."))
var/init_start = world.timeofday
//Create and announce mode
var/list/datum/game_mode/runnable_modes
@@ -226,14 +226,14 @@ SUBSYSTEM_DEF(ticker)
if(runnable_modes.len)
smode = config.pick_mode(GLOB.secret_force_mode)
if(!smode.can_start())
message_admins("<span class='notice'>Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.</span>")
message_admins(span_notice("Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed."))
else
mode = smode
if(!mode)
if(!runnable_modes.len)
mode = new /datum/game_mode/extended()
message_admins("<span class='notice'>Unable to choose any non-extended gamemode, running extended.</span>")
message_admins(span_notice("Unable to choose any non-extended gamemode, running extended."))
else
mode = pickweight(runnable_modes)
if(!mode) //too few roundtypes all run too recently
@@ -264,7 +264,7 @@ SUBSYSTEM_DEF(ticker)
SSjob.ResetOccupations()
return 0
else
message_admins("<span class='notice'>DEBUG: Bypassing prestart checks...</span>")
message_admins(span_notice("DEBUG: Bypassing prestart checks..."))
CHECK_TICK
if(hide_mode)
@@ -297,7 +297,7 @@ SUBSYSTEM_DEF(ticker)
round_start_time = world.time
SSdbcore.SetRoundStart()
to_chat(world, "<span class='notice'><B>Welcome to [station_name()], enjoy your stay!</B></span>")
to_chat(world, span_notice("<B>Welcome to [station_name()], enjoy your stay!</B>"))
SEND_SOUND(world, sound(SSstation.announcer.get_rand_welcome_sound()))
current_state = GAME_STATE_PLAYING
@@ -305,7 +305,7 @@ SUBSYSTEM_DEF(ticker)
Master.SetRunLevel(RUNLEVEL_GAME)
if(SSevents.holidays)
to_chat(world, "<span class='notice'>and...</span>")
to_chat(world, span_notice("and..."))
for(var/holidayname in SSevents.holidays)
var/datum/holiday/holiday = SSevents.holidays[holidayname]
to_chat(world, "<h4>[holiday.greet()]</h4>")
@@ -452,7 +452,7 @@ SUBSYSTEM_DEF(ticker)
m = pick(memetips)
if(m)
to_chat(world, "<span class='purple'><b>Tip of the round: </b>[html_encode(m)]</span>")
to_chat(world, span_purple("<b>Tip of the round: </b>[html_encode(m)]"))
/datum/controller/subsystem/ticker/proc/check_queue()
if(!queued_players.len)
@@ -465,7 +465,7 @@ SUBSYSTEM_DEF(ticker)
if(!hpc)
listclearnulls(queued_players)
for (var/mob/dead/new_player/NP in queued_players)
to_chat(NP, "<span class='userdanger'>The alive players limit has been released!<br><a href='?src=[REF(NP)];late_join=override'>[html_encode(">>Join Game<<")]</a></span>")
to_chat(NP, span_userdanger("The alive players limit has been released!<br><a href='?src=[REF(NP)];late_join=override'>[html_encode(">>Join Game<<")]</a>"))
SEND_SOUND(NP, sound('sound/misc/notice1.ogg'))
NP.LateChoices()
queued_players.len = 0
@@ -480,14 +480,14 @@ SUBSYSTEM_DEF(ticker)
listclearnulls(queued_players)
if(living_player_count() < hpc)
if(next_in_line && next_in_line.client)
to_chat(next_in_line, "<span class='userdanger'>A slot has opened! You have approximately 20 seconds to join. <a href='?src=[REF(next_in_line)];late_join=override'>\>\>Join Game\<\<</a></span>")
to_chat(next_in_line, span_userdanger("A slot has opened! You have approximately 20 seconds to join. <a href='?src=[REF(next_in_line)];late_join=override'>\>\>Join Game\<\<</a>"))
SEND_SOUND(next_in_line, sound('sound/misc/notice1.ogg'))
next_in_line.LateChoices()
return
queued_players -= next_in_line //Client disconnected, remove he
queue_delay = 0 //No vacancy: restart timer
if(25 to INFINITY) //No response from the next in line when a vacancy exists, remove he
to_chat(next_in_line, "<span class='danger'>No response received. You have been removed from the line.</span>")
to_chat(next_in_line, span_danger("No response received. You have been removed from the line."))
queued_players -= next_in_line
queue_delay = 0
@@ -658,20 +658,20 @@ SUBSYSTEM_DEF(ticker)
var/skip_delay = check_rights()
if(delay_end && !skip_delay)
to_chat(world, "<span class='boldannounce'>An admin has delayed the round end.</span>")
to_chat(world, span_boldannounce("An admin has delayed the round end."))
return
//yogs start - yogs tickets
if(GLOB.ahelp_tickets && GLOB.ahelp_tickets.ticketAmount)
var/list/adm = get_admin_counts(R_BAN)
var/list/activemins = adm["present"]
if(activemins.len > 0)
to_chat(world, "<span class='boldannounce'>Not all tickets have been resolved. Server restart delayed.</span>")
to_chat(world, span_boldannounce("Not all tickets have been resolved. Server restart delayed."))
return
else
to_chat(world, "<span class='boldannounce'>Round ended, but there were still active tickets. Please submit a player complaint if you did not receive a response.</span>")
to_chat(world, span_boldannounce("Round ended, but there were still active tickets. Please submit a player complaint if you did not receive a response."))
//yogs end - yogs tickets
to_chat(world, "<span class='boldannounce'>Rebooting World in [DisplayTimeText(delay)]. [reason]</span>")
to_chat(world, span_boldannounce("Rebooting World in [DisplayTimeText(delay)]. [reason]"))
webhook_send_roundstatus("endgame") //yogs - webhook support
var/start_wait = world.time
@@ -679,7 +679,7 @@ SUBSYSTEM_DEF(ticker)
sleep(delay - (world.time - start_wait))
if(delay_end && !skip_delay)
to_chat(world, "<span class='boldannounce'>Reboot was cancelled by an admin.</span>")
to_chat(world, span_boldannounce("Reboot was cancelled by an admin."))
return
if(end_string)
end_state = end_string
@@ -687,11 +687,11 @@ SUBSYSTEM_DEF(ticker)
var/statspage = CONFIG_GET(string/roundstatsurl)
var/gamelogloc = CONFIG_GET(string/gamelogurl)
if(statspage)
to_chat(world, "<span class='info'>Round statistics and logs can be viewed <a href=\"[statspage][GLOB.round_id]\">at this website!</a></span>")
to_chat(world, span_info("Round statistics and logs can be viewed <a href=\"[statspage][GLOB.round_id]\">at this website!</a>"))
else if(gamelogloc)
to_chat(world, "<span class='info'>Round logs can be located <a href=\"[gamelogloc]\">at this website!</a></span>")
to_chat(world, span_info("Round logs can be located <a href=\"[gamelogloc]\">at this website!</a>"))
log_game("<span class='boldannounce'>Rebooting World. [reason]</span>")
log_game(span_boldannounce("Rebooting World. [reason]"))
world.Reboot()