From 3f6ea95f50160abf15aecbbc32adecf1c1d63a50 Mon Sep 17 00:00:00 2001 From: Dani Glore Date: Sun, 16 Oct 2022 07:40:34 -0400 Subject: [PATCH] Fix: Poly voice command softlock (#16849) Added conditionals to check if Poly is buckled or not --- modular_skyrat/modules/poly_commands/parrot.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modular_skyrat/modules/poly_commands/parrot.dm b/modular_skyrat/modules/poly_commands/parrot.dm index f573a120ab3..f54979aadde 100644 --- a/modular_skyrat/modules/poly_commands/parrot.dm +++ b/modular_skyrat/modules/poly_commands/parrot.dm @@ -55,6 +55,8 @@ return FALSE /mob/living/simple_animal/parrot/poly/proc/command_perch(mob/living/carbon/human/human_target) + if (!buckled) + buckled_to_human = FALSE if(human_target.buckled_mobs?.len >= human_target.max_buckled_mobs) return if(buckled_to_human) @@ -67,6 +69,8 @@ perch_on_human(human_target) /mob/living/simple_animal/parrot/poly/proc/command_hop_off(mob/living/carbon/human/human_target) + if (!buckled) + buckled_to_human = FALSE if(!buckled_to_human || !buckled) emote("me", EMOTE_VISIBLE, "gives [human_target] a confused look, squawking softly.") return