cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Toxin lovers don't throw up. (#45668)

Browse Source 
* Toxin lowers don't throw up

* Update human.dm

* Update code/modules/mob/living/carbon/carbon.dm

Co-Authored-By: JJRcop <jrubcop@gmail.com>
This commit is contained in:
Dennok
2019-08-06 02:20:32 -07:00
committed by Rob Bailey
co-authored by JJRcop
parent 49b13a9faf
commit 0cb84ff57d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -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("<span class='warning'>[src] dry heaves!</span>", \
"<span class='userdanger'>You try to throw up, but there's nothing in your stomach!</span>")