Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00
parent aa1cb22edc 7433293a3e
commit 6b9becce71
506 changed files with 10079 additions and 6600 deletions
@@ -111,7 +111,7 @@
 	var/breathes = TRUE
 	var/blooded = TRUE
 	if(dna && dna.species)
-		if(has_trait(TRAIT_NOBREATH, SPECIES_TRAIT))
+		if(HAS_TRAIT_FROM(src, TRAIT_NOBREATH, SPECIES_TRAIT))
 			breathes = FALSE
 		if(NOBLOOD in dna.species.species_traits)
 			blooded = FALSE