From afc7a5cf3e46ee7ccfe985c8836bbc080e299e91 Mon Sep 17 00:00:00 2001 From: thegrb93 Date: Mon, 25 Nov 2024 16:09:34 -0500 Subject: [PATCH] Fix synths vomitting from too much flip (#2547) ## About The Pull Request Dunno if this is the ideal fix or if the vomit proc needs an override for checking issynthetic. ## Why It's Good For The Game Synths are more agile at flipping and don't spew chunks ## Proof Of Testing
Screenshots/Videos
## Changelog :cl: fix: Synths vomit nanites when flipping too many times /:cl: --------- Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> --- code/modules/mob/emote.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 3ec9cccbc41..66a9d5b6615 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -88,7 +88,7 @@ var/mob/living/carbon/flippy_mcgee = user flippy_mcgee.set_confusion_if_lower(FLIP_EMOTE_DURATION) if(flippy_mcgee.get_timed_status_effect_duration(/datum/status_effect/confusion) > BEYBLADE_PUKE_THRESHOLD) - flippy_mcgee.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0) + flippy_mcgee.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0, vomit_type = (issynthetic(flippy_mcgee) && /obj/effect/decal/cleanable/vomit/nanites || /obj/effect/decal/cleanable/vomit/toxic)) return user.SpinAnimation(FLIP_EMOTE_DURATION, 1) @@ -161,7 +161,7 @@ return if(user.get_timed_status_effect_duration(/datum/status_effect/confusion) > BEYBLADE_PUKE_THRESHOLD) - user.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0) + user.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0, vomit_type = (issynthetic(user) && /obj/effect/decal/cleanable/vomit/nanites || /obj/effect/decal/cleanable/vomit/toxic)) // BUBBER EDIT CHANGE - Original: user.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0) return if(prob(BEYBLADE_DIZZINESS_PROBABILITY))