Merge pull request #4339 from FlattestGuitar/roboslur

Robutts slur and stammer robotically
This commit is contained in:
Fox McCloud
2016-05-05 21:39:30 -04:00
2 changed files with 39 additions and 8 deletions
+10 -4
View File
@@ -70,7 +70,7 @@ proc/get_radio_key_from_channel(var/channel)
/mob/living/proc/handle_speech_problems(var/message, var/verb)
var/list/returns[3]
var/speech_problem_flag = 0
var/robot = isSynthetic()
if((HULK in mutations) && health >= 25 && length(message))
@@ -79,11 +79,17 @@ proc/get_radio_key_from_channel(var/channel)
speech_problem_flag = 1
if(slurring)
message = slur(message)
if(robot)
message = slur(message, list("@", "!", "#", "$", "%", "&", "?"))
else
message = slur(message)
verb = "slurs"
speech_problem_flag = 1
if(stuttering)
message = stutter(message)
if(robot)
message = robostutter(message)
else
message = stutter(message)
verb = "stammers"
speech_problem_flag = 1
@@ -450,4 +456,4 @@ proc/get_radio_key_from_channel(var/channel)
/mob/living/speech_bubble(var/bubble_state = "",var/bubble_loc = src, var/list/bubble_recipients = list())
var/image/I = image('icons/mob/talk.dmi', bubble_loc, bubble_state, MOB_LAYER + 1)
I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
flick_overlay(I, bubble_recipients, 30)
flick_overlay(I, bubble_recipients, 30)