Merge pull request #381 from Sharkmare/patch-8

NEVER TALK TO ME OR MY SON EVER AGAIN BYOND
This commit is contained in:
Vollybally
2019-02-12 19:23:13 -05:00
committed by GitHub
@@ -117,6 +117,7 @@
verbs |= /mob/living/proc/ventcrawl
verbs |= /mob/living/simple_animal/proc/contort
verbs += /mob/living/simple_animal/retaliate/synx/proc/disguise
verbs += /mob/living/simple_animal/retaliate/synx/proc/honk
mob/living/simple_animal/synx/PunchTarget()
if(!Adjacent(target_mob))
@@ -318,24 +319,20 @@ mob/living/simple_animal/synx/PunchTarget()
/mob/living/simple_animal/retaliate/synx/pet/hear_say(message)
. = ..()
if(!message) return
speak += message
if(speak.len>=memorysize)
speak -= (pick(speak))//making the list more dynamic
if(resting)
resting = !resting
if(message=="Up up down down left right left right b a select start")//shhh no spoilers yet
icon_state = "synx_pet_rainbow"
icon_living = "synx_pet_rainbow"
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
return
if(message=="Shock on"||"shock on")//Voice activated collar//new
anchored=1 //Shocked nerd
return//dont want the synx to start shocking itself
if(message=="shock off"||"Shock off")//new
anchored=0
return
if(message)
if(speak.len>=memorysize)
speak -= (pick(speak))//making the list more dynamic
speak += message
/mob/living/simple_animal/retaliate/synx/proc/honk()
set name = "HONK"
set desc = "TAAA RAINBOW"
set category = "Abilities"
icon_state = "synx_pet_rainbow"
icon_living = "synx_pet_rainbow"
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
////////////////////////////////////////
////////////////SYNX VARIATIONS/////////