mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
CROSSLINK + Population control cap (#9979)
* Ew * Update login.dm * Update code/modules/mob/dead/new_player/login.dm Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com> * Oogleboogle * E * EEE * Update client_procs.dm * E * E * E * Update communications.dm * Update communications.dm * E * Update chat_link.dm * EEEE * EEE * Update communications.dm * EEE * 0 * E * Update skyrat_config.txt * EEEE * E * E * E * E * 0 * Update code/modules/admin/verbs/adminhelp.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/master_files/code/_onclick/hud/new_player.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/server_overflow/code/client_procs.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update tgui/packages/tgui/interfaces/ServerControlPanel.js Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * You missed one Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
co-authored by
OrionTheFox
GoldenAlpharex
GoldenAlpharex
parent
ed380fa221
commit
49a1a276e7
@@ -226,6 +226,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
|
||||
else if(GLOB.deadmins[ckey])
|
||||
add_verb(src, /client/proc/readmin)
|
||||
connecting_admin = TRUE
|
||||
//SKYRAT EDIT ADDITION //We will check the population here, because we need to know if the client is an admin or not.
|
||||
if(!check_population(connecting_admin))
|
||||
qdel(src)
|
||||
return
|
||||
// SKYRAT EDIT END
|
||||
if(CONFIG_GET(flag/autoadmin))
|
||||
if(!GLOB.admin_datums[ckey])
|
||||
var/datum/admin_rank/autorank
|
||||
|
||||
@@ -72,12 +72,17 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
|
||||
mob.log_talk(raw_msg, LOG_OOC)
|
||||
|
||||
var/keyname = key
|
||||
|
||||
if(CONFIG_GET(flag/enable_cross_server_ooc)) //SKYRAT EDIT ADDITION
|
||||
send_ooc_to_other_server(ckey, msg) //SKYRAT EDIT ADDITION
|
||||
|
||||
if(prefs.unlock_content)
|
||||
if(prefs.toggles & MEMBER_PUBLIC)
|
||||
keyname = "<font color='[prefs.read_preference(/datum/preference/color/ooc_color) || GLOB.normal_ooc_colour]'>[icon2html('icons/member_content.dmi', world, "blag")][keyname]</font>"
|
||||
if(prefs.hearted)
|
||||
var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
|
||||
keyname = "[sheet.icon_tag("emoji-heart")][keyname]"
|
||||
|
||||
//The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url
|
||||
for(var/client/receiver as anything in GLOB.clients)
|
||||
if(!receiver.prefs) // Client being created or deleted. Despite all, this can be null.
|
||||
|
||||
Reference in New Issue
Block a user