Change ishumanbasic to not count felinids (#62376)

ishumanbasic allowed felinids (human subtypes) to pass. This is something every check of ishumanbasic does not account for (some even check isfelinid explicitly!)
This commit is contained in:
Mothblocks
2021-10-28 10:19:27 +01:00
committed by GitHub
parent a4ce92199e
commit 73a0a873ec
2 changed files with 9 additions and 1 deletions
-1
View File
@@ -69,7 +69,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define iszombie(A) (is_species(A, /datum/species/zombie))
#define isskeleton(A) (is_species(A, /datum/species/skeleton))
#define ismoth(A) (is_species(A, /datum/species/moth))
#define ishumanbasic(A) (is_species(A, /datum/species/human))
#define isfelinid(A) (is_species(A, /datum/species/human/felinid))
#define isethereal(A) (is_species(A, /datum/species/ethereal))
#define isvampire(A) (is_species(A,/datum/species/vampire))
+9
View File
@@ -435,6 +435,15 @@ GLOBAL_LIST_EMPTY(species_list)
if(H.dna && istype(H.dna.species, species_datum))
. = TRUE
/// Returns if the given target is a human. Like, a REAL human.
/// Not a moth, not a felinid (which are human subtypes), but a human.
/proc/ishumanbasic(target)
if (!ishuman(target))
return FALSE
var/mob/living/carbon/human/human_target = target
return human_target.dna?.species?.type == /datum/species/human
/proc/spawn_atom_to_turf(spawn_type, target, amount, admin_spawn=FALSE, list/extra_args)
var/turf/T = get_turf(target)
if(!T)