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

Social Anxiety quirk fixes and tweaks #3222

Merged
merged 1 commit into from
Aug 3, 2024
Merged

Social Anxiety quirk fixes and tweaks #3222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions code/datums/traits/negative.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,15 +451,14 @@

/datum/quirk/social_anxiety/on_process()
var/nearby_people = 0
if(HAS_TRAIT(quirk_holder, TRAIT_FEARLESS))
return
for(var/mob/living/carbon/human/H in oview(3, quirk_holder))
if(H.client)
nearby_people++
var/mob/living/carbon/human/H = quirk_holder
if(prob(2 + nearby_people))
H.stuttering = max(3, H.stuttering)
else if(prob(min(3, nearby_people)) && !H.silent)
to_chat(H, "<span class='danger'>You retreat into yourself. You <i>really</i> don't feel up to talking.</span>")
H.silent = max(10, H.silent)
H.stuttering = max(4, H.stuttering)
else if(prob(0.5) && dumb_thing)
to_chat(H, "<span class='userdanger'>You think of a dumb thing you said a long time ago and scream internally.</span>")
dumb_thing = FALSE //only once per life
Expand All @@ -479,6 +478,8 @@
/datum/quirk/social_anxiety/proc/eye_contact(datum/source, mob/living/other_mob, triggering_examiner)
SIGNAL_HANDLER

if(HAS_TRAIT(quirk_holder, TRAIT_FEARLESS))
return
if(prob(75))
return
var/msg
Expand Down
8 changes: 2 additions & 6 deletions code/modules/mob/mob_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,9 @@
var/static/regex/nostutter = regex(@@[aeiouAEIOU "'()[\]{}.!?,:;_`~-]@)
for(var/i = 1, i <= leng, i += length(rawchar))
rawchar = newletter = phrase[i]
if(prob(80) && !nostutter.Find(rawchar))
if(prob(10))
newletter = "[newletter]-[newletter]-[newletter]-[newletter]"
else if(prob(20))
if(prob(70) && !nostutter.Find(rawchar))
if(prob(25))
newletter = "[newletter]-[newletter]-[newletter]"
else if (prob(5))
newletter = ""
else
newletter = "[newletter]-[newletter]"
. += newletter
Expand Down
Loading