This commit is contained in:
Fluffy
2024-02-08 12:38:28 +00:00
committed by GitHub
parent c708dc23da
commit 849340274d
82 changed files with 228 additions and 164 deletions
+6 -6
View File
@@ -56,19 +56,19 @@
data["psi_points"] = owner.psi.psi_points
data["bought_powers"] = owner.psi.psionic_powers
for(var/singleton/psionic_power/P in GET_SINGLETON_SUBTYPE_LIST(/singleton/psionic_power))
if(HAS_FLAG(P.ability_flags, PSI_FLAG_SPECIAL) && !(P.type in owner.psi.psionic_powers))
if((P.ability_flags & PSI_FLAG_SPECIAL) && !(P.type in owner.psi.psionic_powers))
continue
if(owner_rank < P.minimum_rank)
continue
/// Apex and Limitless abilities are automatically given, but we want them to have said abilities in the point shop so the users know what they do.
if(owner_rank < PSI_RANK_APEX && HAS_FLAG(P.ability_flags, PSI_FLAG_APEX))
if(owner_rank < PSI_RANK_APEX && (P.ability_flags & PSI_FLAG_APEX))
continue
if(owner_rank < PSI_RANK_LIMITLESS && HAS_FLAG(P.ability_flags, PSI_FLAG_LIMITLESS))
if(owner_rank < PSI_RANK_LIMITLESS && (P.ability_flags & PSI_FLAG_LIMITLESS))
continue
if(NOT_FLAG(P.ability_flags, PSI_FLAG_CANON))
if(owner_rank < PSI_RANK_HARMONIOUS && HAS_FLAG(P.ability_flags, PSI_FLAG_EVENT))
if(!(P.ability_flags & PSI_FLAG_CANON))
if(owner_rank < PSI_RANK_HARMONIOUS && (P.ability_flags & PSI_FLAG_EVENT))
continue
if(owner_rank < PSI_RANK_HARMONIOUS && HAS_FLAG(P.ability_flags, PSI_FLAG_ANTAG))
if(owner_rank < PSI_RANK_HARMONIOUS && (P.ability_flags & PSI_FLAG_ANTAG))
continue
data["available_psionics"] += list(
list(