shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Poly (#2598)

Browse Source
This commit is contained in:
Poojawa
2017-09-04 09:08:25 -05:00
committed by GitHub
parent 5f1d88ffeb
commit 362b4b5a16
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/parrot.dm
+2 -2
View File
@@ -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