cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Sorts the majority of the rest of the unsorted chat (#5459)

Browse Source 
* Sorts the majority of the rest of the unsorted chat

* 0.

* Update database_changelog.txt

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-05-06 23:48:08 +01:00
committed by GitHub
co-authored by Seris02 Gandalf
parent 88dc3ba6b0
commit c84d208fa6
40 changed files with 203 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+5 -5
View File
@@ -547,8 +547,8 @@ SUBSYSTEM_DEF(job)
if(living_mob.mind)
living_mob.mind.assigned_role = rank
to_chat(M, "<b>You are the [rank].</b>")
var/list/packed_items //SKYRAT CHANGE ADDITION - CUSTOMIZATION
to_chat(M, "<span class='infoplain'><b>You are the [rank].</b></span>")
var/list/packed_items
if(job)
//SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION
if (M.client && job.no_dresscode && job.loadout)
@@ -570,10 +570,10 @@ SUBSYSTEM_DEF(job)
else
handle_auto_deadmin_roles(M.client, rank)
to_chat(M, "<b>As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>")
to_chat(M, "<span class='infoplain'><b>As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b></span>")
job.radio_help_message(M)
if(job.req_admin_notify)
to_chat(M, "<b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b>")
to_chat(M, "<span class='infoplain'><b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b></span>")
if(CONFIG_GET(number/minimal_access_threshold))
to_chat(M, "<span class='notice'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></span>")
@@ -701,7 +701,7 @@ SUBSYSTEM_DEF(job)
if(PopcapReached())
JobDebug("Popcap overflow Check observer located, Player: [player]")
JobDebug("Player rejected :[player]")
to_chat(player, "<b>You have failed to qualify for any job you desired.</b>")
to_chat(player, "<span class='infoplain'><b>You have failed to qualify for any job you desired.</b></span>")
unassigned -= player
player.ready = PLAYER_NOT_READY
player.client << output(player.ready, "lobbybrowser:imgsrc") //SKYRAT EDIT ADDITION
code/controllers/subsystem/ticker.dm
+3 -6
View File
@@ -160,13 +160,10 @@ 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>")
// SKYRAT EDIT START - DISCORD SPAM PREVENTION
to_chat(world, "<span class='notice'><b>Welcome to [station_name()]!</b></span>")
if(!discord_alerted)
discord_alerted = TRUE
send2chat("<@&[CONFIG_GET(string/game_alert_role_id)]> New round starting on [SSmapping.config.map_name], [CONFIG_GET(string/servername)]! \nIf you wish to be pinged for game related stuff, go to <#[CONFIG_GET(string/role_assign_channel_id)]> and assign yourself the roles.", CONFIG_GET(string/chat_announce_new_game)) // Skyrat EDIT -- role ping
// SKYRAT EDIT END
current_state = GAME_STATE_PREGAME
send2chat("<@&[CONFIG_GET(string/game_alert_role_id)]> New round starting on [SSmapping.config.map_name], [CONFIG_GET(string/servername)]! \nIf you wish to be pinged for game related stuff, go to <#[CONFIG_GET(string/role_assign_channel_id)]> and assign yourself the roles.", CONFIG_GET(string/chat_announce_new_game)) // Skyrat EDIT -- role pingcurrent_state = GAME_STATE_PREGAME
change_lobbyscreen() //SKYRAT EDIT ADDITION
//Everyone who wants to be an observer is now spawned
create_observers()
@@ -512,7 +509,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 class='oocplain'><span class='purple'><b>Tip of the round: </b>[html_encode(m)]</span></span>")
/datum/controller/subsystem/ticker/proc/check_queue()
if(!queued_players.len)