diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 66a9d5b6615..0462713fe36 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, vomit_type = (issynthetic(flippy_mcgee) && /obj/effect/decal/cleanable/vomit/nanites || /obj/effect/decal/cleanable/vomit/toxic))
+			flippy_mcgee.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0)
 			return
 
 	user.SpinAnimation(FLIP_EMOTE_DURATION, 1)
@@ -127,7 +127,7 @@
 
 	var/mob/living/flippy_mcgee = user
 	var/sickness = flippy_mcgee.get_timed_status_effect_duration(/datum/status_effect/confusion)
-	if(sickness)
+	if(sickness && !(HAS_TRAIT(flippy_mcgee, TRAIT_FREERUNNING)))
 		if(prob(20))
 			flippy_mcgee.Knockdown(1.5 SECONDS)
 			flippy_mcgee.visible_message(
@@ -159,9 +159,13 @@
 		return
 	if(!iscarbon(user))
 		return
+	// BUBBER EDIT ADDITION BEGIN - Freerunning Quirk
+	if(HAS_TRAIT(user, TRAIT_FREERUNNING))
+		return
+	// BUBBER EDIT ADDITION END
 
 	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, 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)
+		user.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0)
 		return
 
 	if(prob(BEYBLADE_DIZZINESS_PROBABILITY))
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 7b26ce89e08..440426ea303 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -435,6 +435,11 @@
 	if(!force && HAS_TRAIT(src, TRAIT_STRONG_STOMACH))
 		lost_nutrition *= 0.5
 
+	// BUBBER EDIT ADDITION BEGIN - Synthetic Vomit
+	if(issynthetic(src))
+		vomit_type = /obj/effect/decal/cleanable/vomit/nanites
+	// BUBBER EDIT ADDITION END
+
 	SEND_SIGNAL(src, COMSIG_CARBON_VOMITED, distance, force)
 
 	// cache some stuff that we'll need later (at least multiple times)