From 9c0bacbd723a4732d7b9f9ee95910be7b104f38c Mon Sep 17 00:00:00 2001 From: Akke Date: Tue, 1 Mar 2016 01:06:59 +0000 Subject: [PATCH] Yea, though I walk through the valley of the shadow of death, I will fear no evil: for thou art with me oranges; thy remie and thy coderbus they comfort me. --- code/game/atoms.dm | 4 +++- code/modules/mob/living/carbon/human/species_types.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 40a34ef51f3..b521719c6da 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -371,6 +371,9 @@ var/list/blood_splatter_icons = list() /atom/proc/add_vomit_floor(mob/living/carbon/M, toxvomit = 0) if(istype(src,/turf/simulated) ) var/obj/effect/decal/cleanable/vomit/V = PoolOrNew(/obj/effect/decal/cleanable/vomit, src) + // Make toxins vomit look different + if(toxvomit) + V.icon_state = "vomittox_[pick(1,4)]" if(M.reagents) clear_reagents_to_vomit_pool(M,V) @@ -380,5 +383,4 @@ var/list/blood_splatter_icons = list() if(istype(R, /datum/reagent/consumable)) var/datum/reagent/consumable/nutri_check = R if(nutri_check.nutriment_factor >0) - reagents.add_reagent(R.id,R.volume) M.reagents.remove_reagent(R.id,R.volume) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index a9d94c462d7..e427a58d42b 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -378,7 +378,7 @@ var/regex/lizard_hiSS = new("S+", "g") var/datum/reagent/consumable/nutri_check = chem if(nutri_check.nutriment_factor >0) var/turf/pos = get_turf(H) - H.vomit(0) + H.vomit() playsound(pos, 'sound/effects/splat.ogg', 50, 1) H.visible_message("[H] vomits on the floor!", \ "You throw up on the floor!")