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

Makes silicons hear a lot less flock system messages #12131

Merged
merged 2 commits into from Nov 24, 2022
Merged

Makes silicons hear a lot less flock system messages #12131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4119511
Prevents silicons from hearing flock system messages
TobleroneSwordfish Nov 23, 2022
b87676f
Prob it
TobleroneSwordfish Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/procs/mobprocs/chatprocs.dm
View file
Open in desktop
Expand Up @@ -1091,7 +1091,7 @@

if((isflockmob(M)) || (M.client.holder && !M.client.player_mode) || (isobserver(M) && !(istype(M, /mob/dead/target_observer/hivemind_observer))))
thisR = rendered
if(M.robot_talk_understand || istype(M, /mob/living/intangible/aieye))
if((M.robot_talk_understand || istype(M, /mob/living/intangible/aieye)) && (!involuntary && mob_speaking || prob(30)))
thisR = siliconrendered
if(istype(M, /mob/living/intangible/flock/flockmind) && !(istype(mob_speaking, /mob/living/intangible/flock/flockmind)) && M:flock == flock)
thisR = flockmindRendered
Expand Down