mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 14:08:31 +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
@@ -38,6 +38,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
|
||||
/client/proc/check_ai_laws, /*shows AI and borg laws*/
|
||||
/client/proc/ghost_pool_protection, /*opens a menu for toggling ghost roles*/
|
||||
/datum/admins/proc/toggledchat, // SKYRAT EDIT ADDITION
|
||||
/client/proc/request_help, // SKYRAT EDIT ADDITION
|
||||
/datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/
|
||||
/datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/
|
||||
/datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/
|
||||
|
||||
@@ -822,12 +822,19 @@ GLOBAL_DATUM_INIT(admin_help_ui_handler, /datum/admin_help_ui_handler, new)
|
||||
additional_data += type
|
||||
|
||||
var/list/servers = CONFIG_GET(keyed_list/cross_server)
|
||||
for(var/I in servers)
|
||||
if(I == our_id) //No sending to ourselves
|
||||
continue
|
||||
if(target_servers && !(I in target_servers))
|
||||
continue
|
||||
world.send_cross_comms(I, additional_data)
|
||||
// SKYRAT EDTI ADDITION
|
||||
if(target_servers == "all")
|
||||
for(var/server in servers)
|
||||
if(server == our_id)
|
||||
continue
|
||||
world.send_cross_comms(server, additional_data)
|
||||
else //SKYRAT EDIT END
|
||||
for(var/I in servers)
|
||||
if(I == our_id) //No sending to ourselves
|
||||
continue
|
||||
if(target_servers && !(I in target_servers))
|
||||
continue
|
||||
world.send_cross_comms(I, additional_data)
|
||||
|
||||
/// Sends a message to a given cross comms server by name (by name for security).
|
||||
/world/proc/send_cross_comms(server_name, list/message, auth = TRUE)
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
mob.log_talk(msg, LOG_ASAY)
|
||||
msg = keywords_lookup(msg)
|
||||
send_asay_to_other_server(ckey, msg) //SKYRAT EDIT ADDITION
|
||||
var/asay_color = prefs.read_preference(/datum/preference/color/asay_color)
|
||||
var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && asay_color) ? "<font color=[asay_color]>" : "<font color='[DEFAULT_ASAY_COLOR]'>"
|
||||
msg = "[span_adminsay("[span_prefix("ADMIN:")] <EM>[key_name(usr, 1)]</EM> [ADMIN_FLW(mob)]: [custom_asay_color]<span class='message linkify'>[msg]")]</span>[custom_asay_color ? "</font>":null]"
|
||||
|
||||
Reference in New Issue
Block a user