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

Synthetic Gas fixes #3858

Closed
wants to merge 1 commit into from
Closed

Synthetic Gas fixes #3858

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
4 changes: 3 additions & 1 deletion code/game/objects/effects/effect_system/smoke.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@

/obj/effect/particle_effect/smoke/bad/affect(mob/living/carbon/M)
..()
if (isxeno(M) || isyautja(M) || issynth(M))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Smoke is more than just inhalation but also disorientation from senses being obscured. Synths should not cough yes but losing what they're holding/dragging is reasonable and part of gameplay considerations for smoke. (The same with the other two as well)

Essentially, feel free to stop them from coughing. The rest is overreach if we're calling it a "bug".

return
if (M.internal != null && M.wear_mask && (M.wear_mask.flags_inventory & ALLOWINTERNALS))
return
else
Expand Down Expand Up @@ -365,7 +367,7 @@

/obj/effect/particle_effect/smoke/xeno_weak/affect(mob/living/carbon/moob) // This applies every tick someone is in the smoke
..()
if(isxeno(moob))
if(isxeno(moob) || issynth(moob))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either find a different way to effect them or remove this. This is another gameplay consideration.

return
if(isyautja(moob))
neuro_dose = neuro_dose*2 // Yautja get half effects
Expand Down