cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 17:45:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30404 from AnturK/monkey_testing

Browse Source 
Fixes Poly speak.
This commit is contained in:
Leo
2017-09-05 11:40:59 -03:00
committed by GitHub
parent dfeb900bd4 2b648112bd
commit ccbc47dc14
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
@@ -295,7 +295,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
@@ -944,7 +944,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