diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 36f2147fa7d..ef71fb09a8c 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -77,7 +77,7 @@ #define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "(F)" //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam -#define MAX_MESSAGE_LEN 1024 +#define MAX_MESSAGE_LEN 2048 //SKYRAT EDIT CHANGE - ORIGINAL 1024 - I SAID DOUBLE IT!! FUCK THE WARNING! #define MAX_NAME_LEN 42 #define MAX_BROADCAST_LEN 512 #define MAX_CHARTER_LEN 80 diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index ddc5cb30931..f6e245fc1e9 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -20,7 +20,8 @@ SUBSYSTEM_DEF(statpanels) "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]", "Round Time: [round_time > MIDNIGHT_ROLLOVER ? "[round(round_time/MIDNIGHT_ROLLOVER)]:[worldtime2text()]" : worldtime2text()]", "Station Time: [station_time_timestamp()]", - "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)" + "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)", + "Connected Players: [GLOB.clients.len]" ) if(SSshuttle.emergency) diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index cad1b6e1a70..dbdc55ea16e 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -271,11 +271,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list( eavesdrop_range = EAVESDROP_EXTRA_RANGE var/list/listening = get_hearers_in_view(message_range+eavesdrop_range, source) var/list/the_dead = list() - //SKYRAT EDIT ADDITION BEGIN - YELLING ECHOES - var/list/yellareas - if(say_test(message) == "2") - yellareas = get_areas_in_range(message_range,src) - //SKYRAT EDIT ADDITION END if(HAS_TRAIT(src, TRAIT_SIGN_LANG)) var/mob/living/carbon/mute = src if(istype(mute)) @@ -300,12 +295,6 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(QDELETED(M)) //Some times nulls and deleteds stay in this list. This is a workaround to prevent ic chat breaking for everyone when they do. continue //Remove if underlying cause (likely byond issue) is fixed. See TG PR #49004. if(M.stat != DEAD) //not dead, not important - //SKYRAT EDIT ADDITION BEGIN - YELLING ECHOES - if(yellareas) - var/area/A = get_area(M) - if(istype(A) && A.ambientsounds != SPACE && (A in yellareas)) - listening |= M - //SKYRAT EDIT ADDITION END continue if(get_dist(M, src) > 7 || M.z != z) //they're out of range of normal hearing if(eavesdrop_range)