Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

People with lisp now lisp on radio #3760

Merged
merged 6 commits into from
Jun 30, 2023
Merged

People with lisp now lisp on radio #3760

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8c42d2
Speech Problems now reflected in Radio
Ben10083 Jun 28, 2023
3b73ae6
Way better way to handle this
Ben10083 Jun 28, 2023
9212192
Merge branch 'master' into Lisp_Radio
Ben10083 Jun 28, 2023
fc9434a
Comment I forgot to remove
Ben10083 Jun 28, 2023
4f5feb1
Speech_Problem_Flag and handled variables now use TRUE/FALSE
Ben10083 Jun 30, 2023
5eeb1b1
Merge branch 'master' into Lisp_Radio
Ben10083 Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/modules/character_traits/biology_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@
return

ADD_TRAIT(target, TRAIT_LISPING, TRAIT_SOURCE_QUIRK)
target.speech_problem_flag = 1
Ben10083 marked this conversation as resolved.
Show resolved Hide resolved

..()

/datum/character_trait/biology/lisp/unapply_trait(mob/living/carbon/human/target)
REMOVE_TRAIT(target, TRAIT_LISPING, TRAIT_SOURCE_QUIRK)
target.speech_problem_flag = 0
Ben10083 marked this conversation as resolved.
Show resolved Hide resolved
..()

/datum/character_trait/biology/bad_leg
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/say.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ for it but just ignore it.
message = uppertext(message)
verb = pick("yells like an idiot","says rather loudly")
if(HAS_TRAIT(src, TRAIT_LISPING))
handled = 1
Ben10083 marked this conversation as resolved.
Show resolved Hide resolved
var/old_message = message
message = lisp_replace(message)
if(old_message != message)
Expand Down