From 362b4b5a16c6d2eb68a7e076ff1638823fb89236 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Mon, 4 Sep 2017 09:08:25 -0500 Subject: [PATCH] Fixes Poly (#2598) --- code/modules/mob/living/simple_animal/parrot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index a70a60a809..aa96494745 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -296,7 +296,7 @@ else parrot_state |= PARROT_FLEE //Otherwise, fly like a bat out of hell! drop_held_item(0) - if(!stat && M.a_intent == INTENT_HELP) + if(stat != DEAD && M.a_intent == INTENT_HELP) handle_automated_speech(1) //assured speak/emote return @@ -945,7 +945,7 @@ speech_buffer = list() /mob/living/simple_animal/parrot/Poly/proc/Write_Memory() - var/json_file = file("data/npc_saves/Punpun.json") + var/json_file = file("data/npc_saves/Poly.json") var/list/file_data = list() if(islist(speech_buffer)) file_data["phrases"] = speech_buffer