From bf42389916d1cff7f4867e410a37c676c8283fa4 Mon Sep 17 00:00:00 2001 From: MarcellusPye Date: Sat, 3 Jun 2017 14:20:38 +1200 Subject: [PATCH 1/5] Fixes slime people lmbs --- code/modules/mob/living/carbon/human/emote.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 1b15dccdc2c..6967d4e1598 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -789,6 +789,14 @@ emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob" else if(species.name == "Slime People") emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob" + else if(species.name == "Drask") + emotelist += "\nDrask specific emotes :- drone(s)-(none)/mob, hum(s)-(none)/mob, rumble(s)-(none)/mob" + else if(species.name == "Kidan") + emotelist += "\nKidan specific emotes :- click(s), clack(s)" + else if(species.name == "Unathi") + emotelist += "\nUnathi specific emotes :- hiss(es)" + if(!species.name == "Slime People" && found_slime_bodypart) + emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" to_chat(src, emotelist) else From d1b8c2da1f6f22e3b3d5e699f10422ef0b620687 Mon Sep 17 00:00:00 2001 From: MarcellusPye Date: Sat, 3 Jun 2017 14:28:28 +1200 Subject: [PATCH 2/5] found_slime_bodypart is a diffrent function --- code/modules/mob/living/carbon/human/emote.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 6967d4e1598..0365009e2bf 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -795,8 +795,11 @@ emotelist += "\nKidan specific emotes :- click(s), clack(s)" else if(species.name == "Unathi") emotelist += "\nUnathi specific emotes :- hiss(es)" - if(!species.name == "Slime People" && found_slime_bodypart) - emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" + if (!(species.name == "Slime People")) + for(var/obj/item/organ/external/L in bodyparts) // if your limbs are squishy you can squish too! + if(L.dna.species in list("Slime People")) + emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" + break to_chat(src, emotelist) else From 59c13d47b534e7cee4a28eec6a6f952c05d3400f Mon Sep 17 00:00:00 2001 From: MarcellusPye Date: Sun, 4 Jun 2017 17:28:40 +1200 Subject: [PATCH 3/5] Changed from an IF chain to case --- code/modules/mob/living/carbon/human/emote.dm | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 0365009e2bf..740f7aaa327 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -785,23 +785,26 @@ + " handshake-mob, hug(s)-(none)/mob, johnny, jump, laugh(s), look(s)-(none)/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-(none)/mob, scream(s), shake(s)," \ + " shiver(s), shrug(s), sigh(s), signal(s)-#1-10,slap(s)-(none)/mob, smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-(none)/mob, swag(s), tremble(s), twitch(es), twitch(es)_s," \ + " wag(s), wave(s), whimper(s), wink(s), yawn(s)" - if(species.name == "Machine") - emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob" - else if(species.name == "Slime People") - emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob" - else if(species.name == "Drask") - emotelist += "\nDrask specific emotes :- drone(s)-(none)/mob, hum(s)-(none)/mob, rumble(s)-(none)/mob" - else if(species.name == "Kidan") - emotelist += "\nKidan specific emotes :- click(s), clack(s)" - else if(species.name == "Unathi") - emotelist += "\nUnathi specific emotes :- hiss(es)" - if (!(species.name == "Slime People")) - for(var/obj/item/organ/external/L in bodyparts) // if your limbs are squishy you can squish too! - if(L.dna.species in list("Slime People")) - emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" - break - to_chat(src, emotelist) + switch(species.name) + if("Machine") + emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob" + if("Drask") + emotelist += "\nDrask specific emotes :- drone(s)-(none)/mob, hum(s)-(none)/mob, rumble(s)-(none)/mob" + if("Kidan") + emotelist += "\nKidan specific emotes :- click(s), clack(s)" + if("Unathi") + emotelist += "\nUnathi specific emotes :- hiss(es)" + + if (species.name == "Slime People") + emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob" + else + for(var/obj/item/organ/external/L in bodyparts) // if your limbs are squishy you can squish too! + if(L.dna.species in list("Slime People")) + emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" + break + + to_chat(src, emotelist) else to_chat(src, "Unusable emote '[act]'. Say *help for a list.") From dfdcca8c4607b9ec05eb5d63c9389696b94b7cf5 Mon Sep 17 00:00:00 2001 From: MarcellusPye Date: Sun, 4 Jun 2017 18:15:53 +1200 Subject: [PATCH 4/5] Fixed formatting so it compiles --- code/modules/mob/living/carbon/human/emote.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 740f7aaa327..2b4dbb68db0 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -800,9 +800,9 @@ emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob" else for(var/obj/item/organ/external/L in bodyparts) // if your limbs are squishy you can squish too! - if(L.dna.species in list("Slime People")) - emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" - break + if(L.dna.species in list("Slime People")) + emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" + break to_chat(src, emotelist) else From abd27b5ef250a4c5c7d8e49a370d734b67008b2e Mon Sep 17 00:00:00 2001 From: MarcellusPye Date: Sun, 4 Jun 2017 20:24:58 +1200 Subject: [PATCH 5/5] Machene People Completion Adds Buzz2 to machene people *help because it wasen't there before for some reason. --- code/modules/mob/living/carbon/human/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 2b4dbb68db0..d1f73360874 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -788,7 +788,7 @@ switch(species.name) if("Machine") - emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob" + emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob, buzz2-(none)/mob" if("Drask") emotelist += "\nDrask specific emotes :- drone(s)-(none)/mob, hum(s)-(none)/mob, rumble(s)-(none)/mob" if("Kidan")