From 84806e4d7c360bf126631aa9193ef436e5ef588f Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Sat, 7 Aug 2021 13:55:49 +0200 Subject: [PATCH] lowers emotional manipulator message frequency (#12262) * lowers emotional manipulator message frequency * updates emotion freq * updates the emotional manipulator frequency Co-authored-by: TheGreyWolf --- code/modules/organs/subtypes/augment.dm | 4 +++- html/changelogs/EmotionFreq.yml | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/EmotionFreq.yml diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index ed865c47021..3a92d8b13a4 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -480,6 +480,7 @@ action_button_icon = "emotional_manipulator" cooldown = 10 var/set_emotion = "Disabled" + var/last_emotion = 0 var/list/possible_emotions = list( "Disabled", @@ -502,12 +503,13 @@ if(!owner) return - if(prob(10)) + if(world.time > (last_emotion + 5 MINUTES)) switch(set_emotion) if("happiness") to_chat(owner, SPAN_NOTICE("You feel happy.")) if("calmness") to_chat(owner, SPAN_NOTICE("You feel calm.")) + last_emotion = world.time if(is_broken()) do_broken_act() diff --git a/html/changelogs/EmotionFreq.yml b/html/changelogs/EmotionFreq.yml new file mode 100644 index 00000000000..639dbecd70e --- /dev/null +++ b/html/changelogs/EmotionFreq.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - tweak: "Based on feedback, the frequency of the emotional manipulator's messages were toned back down a little."