diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index e445787498..f802555c7e 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -83,8 +83,8 @@ return message /datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args) - if(HAS_TRAIT(owner, TRAIT_FEARLESS)) - return message + if(HAS_TRAIT(owner, TRAIT_FEARLESS)) + return for(var/word in trigger_words) var/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i") diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 2d6e2fa592..549f0cc953 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -256,7 +256,7 @@ if(prob(20)) message += pick(" OwO", " uwu") message = lowertext(message) - return message + speech_args[SPEECH_MESSAGE] = message /obj/item/organ/tongue/cybernetic name = "cybernetic tongue" diff --git a/modular_citadel/code/modules/reagents/objects/clothes.dm b/modular_citadel/code/modules/reagents/objects/clothes.dm index cb1b4f4da4..f925c229a3 100644 --- a/modular_citadel/code/modules/reagents/objects/clothes.dm +++ b/modular_citadel/code/modules/reagents/objects/clothes.dm @@ -54,14 +54,15 @@ if (T.name == "fluffy tongue") if(prob(0.01)) message += "\" and tips their hat. \"swpy's sappin' my chem dispwencer uwu!!" - return message - message += "\" and tips their hat. \"[pick("weehaw!", "bwoy howdy.", "dawn tuutin'.", "weww don't that beat aww.", "whoooowee, wouwd ya wook at that!", "whoooowee! makin' bwacon!", "cweam gwavy!", "yippekeeyah-heeyapeeah-kwayoh!", "mwove 'em uut!", "gwiddy up!")]" - return message + else + message += "\" and tips their hat. \"[pick("weehaw!", "bwoy howdy.", "dawn tuutin'.", "weww don't that beat aww.", "whoooowee, wouwd ya wook at that!", "whoooowee! makin' bwacon!", "cweam gwavy!", "yippekeeyah-heeyapeeah-kwayoh!", "mwove 'em uut!", "gwiddy up!")]" + speech_args[SPEECH_MESSAGE] = trim(message) + return if(prob(0.01)) message += "\" and tips their hat. \"Spy's sappin' my chem dispenser!"//How did I not think of this earlier - message_admins("I really appreciate all the hard work you put into adminning citadel, I hope you're all having a good day and I hope this hidden and rare message admins brightens up your day.") - return message - message += "\" and tips their hat. \"[pick("Yeehaw!", "Boy howdy.", "Darn tootin'.", "Well don't that beat all.", "Whoooowee, would ya look at that!", "Whoooowee! Makin' bacon!", "Cream Gravy!", "Yippekeeyah-heeyapeeah-kayoh!", "Move 'em out!", "Giddy up!")]" + message_admins("I really appreciate all the hard work you put into adminning citadel, I hope you're all having a good day and I hope this hidden and rare message_admins brightens up your day.") + else + message += "\" and tips their hat. \"[pick("Yeehaw!", "Boy howdy.", "Darn tootin'.", "Well don't that beat all.", "Whoooowee, would ya look at that!", "Whoooowee! Makin' bacon!", "Cream Gravy!", "Yippekeeyah-heeyapeeah-kayoh!", "Move 'em out!", "Giddy up!")]" speech_args[SPEECH_MESSAGE] = trim(message) /* if(message[1] != "*")