From dde04939690c99da89f3e21f146497a2205625b7 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 00:41:59 +0100 Subject: [PATCH 1/3] NEVER TALK TO ME OR MY SON EVER AGAIN BYOND THIS SHOUlD FINaLLY FIX SPEECHCODE Byond stop being dick. --- .../mob/living/simple_animal/animals/synx.dm | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 89bbddf56e..6c3138b9c5 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -318,23 +318,16 @@ 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 + //icon_state = "synx_pet_rainbow" + //icon_living = "synx_pet_rainbow" + //playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + + //////////////////////////////////////// From e1b65812284d92a530ad637b92b02141ba71d45b Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 00:55:49 +0100 Subject: [PATCH 2/3] Update synx.dm --- .../modules/mob/living/simple_animal/animals/synx.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 6c3138b9c5..49fa949d4c 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -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)) @@ -323,13 +324,16 @@ mob/living/simple_animal/synx/PunchTarget() speak -= (pick(speak))//making the list more dynamic if(resting) resting = !resting - //icon_state = "synx_pet_rainbow" - //icon_living = "synx_pet_rainbow" - //playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + /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///////// //////////////////////////////////////// From 5afbd72ff2fc0410e815a13bcf1145453cac34aa Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Wed, 13 Feb 2019 01:09:44 +0100 Subject: [PATCH 3/3] Update synx.dm --- code/modules/mob/living/simple_animal/animals/synx.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/synx.dm b/code/modules/mob/living/simple_animal/animals/synx.dm index 49fa949d4c..fe99ecb17d 100644 --- a/code/modules/mob/living/simple_animal/animals/synx.dm +++ b/code/modules/mob/living/simple_animal/animals/synx.dm @@ -325,8 +325,8 @@ mob/living/simple_animal/synx/PunchTarget() if(resting) resting = !resting - /mob/living/simple_animal/retaliate/synx/proc/honk() - set name = "HONK" +/mob/living/simple_animal/retaliate/synx/proc/honk() + set name = "HONK" set desc = "TAAA RAINBOW" set category = "Abilities" icon_state = "synx_pet_rainbow"