diff --git a/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm b/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm index 52f516ee4060..d1488a60b3bb 100644 --- a/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm +++ b/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm @@ -36,13 +36,6 @@ modified_speech = copytext_char(speech, 3) else - // monke start - stfu poly - var/speak_prob = speaking_pawn.ears.use_command ? 25 : 50 - for(var/channel in list(RADIO_KEY_COMMON, RADIO_TOKEN_COMMAND)) - if(channel in available_channels) - speak_prob = max(FLOOR(speak_prob * 0.4, 5), 5) - use_radio = prob(speak_prob) - // monke end if(HAS_CHANNEL_PREFIX) modified_speech = "[use_radio ? pick(available_channels) : ""][copytext_char(speech, 3)]" else diff --git a/monkestation/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm b/monkestation/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm new file mode 100644 index 000000000000..96c6ed44340c --- /dev/null +++ b/monkestation/code/modules/mob/living/basic/pets/parrot/parrot_ai/parroting_action.dm @@ -0,0 +1,5 @@ +/datum/ai_behavior/perform_speech/parrot + action_cooldown = 45 SECONDS // SHUT UP + +/datum/ai_behavior/perform_speech/parrot/perform(seconds_per_tick, datum/ai_controller/controller, ...) + controller.behavior_cooldowns[src] = world.time + rand(45 SECONDS, 3 MINUTES) diff --git a/tgstation.dme b/tgstation.dme index 62dc515675d0..a9b0f4517969 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6412,6 +6412,7 @@ #include "monkestation\code\modules\mob\living\basic\animatronic.dm" #include "monkestation\code\modules\mob\living\basic\ggg\glerm.dm" #include "monkestation\code\modules\mob\living\basic\ggg\susflash.dm" +#include "monkestation\code\modules\mob\living\basic\pets\parrot\parrot_ai\parroting_action.dm" #include "monkestation\code\modules\mob\living\basic\space_fauna\fugu_gland.dm" #include "monkestation\code\modules\mob\living\basic\vermin\mouse.dm" #include "monkestation\code\modules\mob\living\carbon\carbon_death.dm"