puke update

This commit is contained in:
joep van der velden
2019-04-13 10:56:30 +02:00
parent 244bdf131e
commit 9166de2a3d
3 changed files with 13 additions and 5 deletions
+11 -3
View File
@@ -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
+1 -1
View File
@@ -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>")
@@ -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////