Return of the NOSTOMACH trait (#70230)

* a regretable decision

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
itseasytosee
2022-10-04 05:09:13 +00:00
committed by GitHub
co-authored by GoldenAlpharex
parent e3852ace15
commit c675ad0907
4 changed files with 4 additions and 4 deletions
@@ -274,7 +274,7 @@
missing_organs += "lungs"
if(!(TRAIT_NOMETABOLISM in the_dudes_species.species_traits) && !humantarget.getorganslot(ORGAN_SLOT_LIVER))
missing_organs += "liver"
if(!(TRAIT_NOHUNGER in the_dudes_species.species_traits) && !humantarget.getorganslot(ORGAN_SLOT_STOMACH))
if(!(NOSTOMACH in the_dudes_species.species_traits) && !humantarget.getorganslot(ORGAN_SLOT_STOMACH))
missing_organs += "stomach"
if(!(NO_TONGUE in the_dudes_species.species_traits) && !humantarget.getorganslot(ORGAN_SLOT_TONGUE))
missing_organs += "tongue"
@@ -3,7 +3,7 @@
id = SPECIES_ABDUCTOR
say_mod = "gibbers"
sexes = FALSE
species_traits = list(NOBLOOD,NOEYESPRITES)
species_traits = list(NOBLOOD, NOEYESPRITES, NOSTOMACH)
inherent_traits = list(
TRAIT_CHUNKYFINGERS,
TRAIT_NOBREATH,
@@ -2,7 +2,7 @@
name = "Android"
id = SPECIES_ANDROID
say_mod = "states"
species_traits = list(NOBLOOD, NO_DNA_COPY, NOTRANSSTING)
species_traits = list(NOBLOOD, NO_DNA_COPY, NOTRANSSTING, NOSTOMACH)
inherent_traits = list(
TRAIT_CAN_USE_FLIGHT_POTION,
TRAIT_GENELESS,
@@ -206,7 +206,7 @@
human.remove_movespeed_modifier(/datum/movespeed_modifier/hunger)
/obj/item/organ/internal/stomach/get_availability(datum/species/owner_species)
return !((TRAIT_NOHUNGER in owner_species.inherent_traits) || (NOSTOMACH in owner_species.species_traits))
return !(NOSTOMACH in owner_species.species_traits)
/obj/item/organ/internal/stomach/proc/handle_disgust(mob/living/carbon/human/disgusted, delta_time, times_fired)
var/old_disgust = disgusted.old_disgust