diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index bc580e34716..afbb7f8f9c8 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -642,11 +642,19 @@ var/list/blood_splatter_icons = list()
update_icons() //apply the now updated overlays to the mob
-/atom/proc/add_vomit_floor(toxvomit = 0, type = /obj/effect/decal/cleanable/vomit)
+/atom/proc/add_vomit_floor(toxvomit = 0, green = FALSE)
playsound(src, 'sound/effects/splat.ogg', 50, 1)
+ var/type = green ? /obj/effect/decal/cleanable/vomit/green : /obj/effect/decal/cleanable/vomit
+ var/vomit_reagent = green ? "green_vomit" : "vomit"
if(istype(src, /turf/simulated))
- if(locate(type) in get_turf(src))
- return //Performance improvement
+ for(var/obj/effect/decal/cleanable/vomit/V in get_turf(src))
+ if(V.type == type)
+ if(V.scoop_reagents[vomit_reagent])
+ V.scoop_reagents[vomit_reagent] += 5
+ else
+ V.scoop_reagents[vomit_reagent] = 5
+ return
+
var/obj/effect/decal/cleanable/vomit/this = new type(src)
// Make toxins vomit look different
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 15c88318d0a..0398687d24d 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1176,7 +1176,7 @@ var/list/slot_equipment_priority = list( \
if(green)
if(!no_text)
visible_message("[src] vomits up some green goo!","You vomit up some green goo!")
- location.add_vomit_floor(FALSE, /obj/effect/decal/cleanable/vomit/green)
+ location.add_vomit_floor(FALSE, TRUE)
else
if(!no_text)
visible_message("[src] pukes all over [p_them()]self!","You puke all over yourself!")
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index fe2ea7a692e..bf2417a192e 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -917,7 +917,7 @@
/datum/reagent/greenvomit/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
- T.add_vomit_floor(FALSE, /obj/effect/decal/cleanable/vomit/green)
+ T.add_vomit_floor(FALSE, TRUE)
////Lavaland Flora Reagents////