diff --git a/code/_helpers/time.dm b/code/_helpers/time.dm index d111ebb8fc..6411806a35 100644 --- a/code/_helpers/time.dm +++ b/code/_helpers/time.dm @@ -36,9 +36,12 @@ proc/round_duration() var/mills = world.time // 1/10 of a second, not real milliseconds but whatever //var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something - var/mins = (mills % 36000) / 600 - var/hours = mills / 36000 + var/mins = round((mills % 36000) / 600) + var/hours = round(mills / 36000) - last_round_duration = "[round(hours)]h [round(mins)]m" + mins = mins < 10 ? add_zero(mins, 1) : mins + hours = hours < 10 ? add_zero(hours, 1) : hours + + last_round_duration = "[hours]:[mins]" next_duration_update = world.time + 1 MINUTES return last_round_duration diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index bbf1844c45..1fd82ed230 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -165,10 +165,11 @@ /mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name) switch(message_mode) if("intercom") - for(var/obj/item/device/radio/intercom/I in view(1)) - I.talk_into(src, message, verb, speaking) - I.add_fingerprint(src) - used_radios += I + if(!src.restrained()) + for(var/obj/item/device/radio/intercom/I in view(1)) + I.talk_into(src, message, null, verb, speaking) + I.add_fingerprint(src) + used_radios += I if("headset") if(l_ear && istype(l_ear,/obj/item/device/radio)) var/obj/item/device/radio/R = l_ear diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 2db05cedeb..7cd9aba719 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -651,7 +651,7 @@ /mob/Stat() ..() - . = (client && client.inactivity < 1200) + . = (is_client_active(10 MINUTES)) if(.) if(statpanel("Status") && ticker && ticker.current_state != GAME_STATE_PREGAME)