From ef3789eeb2d6454ed85ded65d7fd0ab4d1155f11 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sat, 1 Feb 2020 06:18:22 +0100 Subject: [PATCH 1/2] Playback device peeve. --- code/modules/assembly/playback.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/assembly/playback.dm b/code/modules/assembly/playback.dm index eecb991434..a34ebad040 100644 --- a/code/modules/assembly/playback.dm +++ b/code/modules/assembly/playback.dm @@ -25,12 +25,13 @@ listening = FALSE languages = message_language say("The recorded message is '[recorded]'.", language = message_language) + next_activate = max(round(length(recorded) * 0.5), 3 SECONDS) /obj/item/assembly/playback/activate() - if(recorded == "") // Why say anything when there isn't anything to say + . = ..() + if(!. || !recorded) // Why say anything when there isn't anything to say return FALSE say("[recorded]", language = languages) // Repeat the message in the language it was said in - return TRUE /obj/item/assembly/playback/proc/record() if(!secured || holder) From c75774e67ac56af92dba74a8eca50487edf1450e Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sat, 1 Feb 2020 06:20:23 +0100 Subject: [PATCH 2/2] Actual var. --- code/modules/assembly/playback.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/assembly/playback.dm b/code/modules/assembly/playback.dm index a34ebad040..42135f7ff9 100644 --- a/code/modules/assembly/playback.dm +++ b/code/modules/assembly/playback.dm @@ -25,7 +25,7 @@ listening = FALSE languages = message_language say("The recorded message is '[recorded]'.", language = message_language) - next_activate = max(round(length(recorded) * 0.5), 3 SECONDS) + activate_cooldown = max(round(length(recorded) * 0.5), 3 SECONDS) /obj/item/assembly/playback/activate() . = ..()