From 9166de2a3d2582dff4e59cae0aa22be5497aa4ec Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Sat, 13 Apr 2019 10:56:30 +0200
Subject: [PATCH] puke update

---
 code/game/atoms.dm                               | 14 +++++++++++---
 code/modules/mob/mob.dm                          |  2 +-
 code/modules/reagents/chemistry/reagents/food.dm |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

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("<span class='warning'>[src] vomits up some green goo!</span>","<span class='warning'>You vomit up some green goo!</span>")
-			location.add_vomit_floor(FALSE, /obj/effect/decal/cleanable/vomit/green)
+			location.add_vomit_floor(FALSE, TRUE)
 		else
 			if(!no_text)
 				visible_message("<span class='warning'>[src] pukes all over [p_them()]self!</span>","<span class='warning'>You puke all over yourself!</span>")
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////