From 0cb84ff57d29c32fa71b7efca0f1093fefb27243 Mon Sep 17 00:00:00 2001 From: Dennok Date: Tue, 6 Aug 2019 12:20:32 +0300 Subject: [PATCH] Toxin lovers don't throw up. (#45668) * Toxin lowers don't throw up * Update human.dm * Update code/modules/mob/living/carbon/carbon.dm Co-Authored-By: JJRcop --- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index c3d6a8769e1..279384088a4 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -430,7 +430,7 @@ return ..() /mob/living/carbon/proc/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE, harm = TRUE, force = FALSE) - if(HAS_TRAIT(src, TRAIT_NOHUNGER) && !force) + if((HAS_TRAIT(src, TRAIT_NOHUNGER) || HAS_TRAIT(src, TRAIT_TOXINLOVER)) && !force) return TRUE if(nutrition < 100 && !blood) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 54cca02e4ad..012bb6551f2 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -807,7 +807,7 @@ ..() /mob/living/carbon/human/vomit(lost_nutrition = 10, blood = 0, stun = 1, distance = 0, message = 1, toxic = 0) - if(blood && (NOBLOOD in dna.species.species_traits)) + if(blood && (NOBLOOD in dna.species.species_traits) && !HAS_TRAIT(src, TRAIT_TOXINLOVER)) if(message) visible_message("[src] dry heaves!", \ "You try to throw up, but there's nothing in your stomach!")