can commune fixes

NonQueueingMatt · Jul 24, 2023 · ddfd932 · ddfd932
1 parent 16909de
commit ddfd932
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 15 deletions.
diff --git a/code/modules/psionics/abilities/nlom_eyes.dm b/code/modules/psionics/abilities/nlom_eyes.dm
@@ -41,7 +41,7 @@
 	for(var/mob/living/L in mob_list)
 		if(L == user)
 			continue
-		if(!L.can_commune())
+		if(!L.is_psi_blocked())
 			continue
 		if(GET_Z(L) != GET_Z(user))
 			continue

diff --git a/code/modules/psionics/abilities/psi_awakening.dm b/code/modules/psionics/abilities/psi_awakening.dm
@@ -19,7 +19,7 @@
 	if(!isliving(hit_atom))
 		return
 	var/mob/living/L = hit_atom
-	if(!L.can_commune())
+	if(L.is_psi_blocked())
 		to_chat(user, SPAN_WARNING("This being doesn't have a Zona Bovinae."))
 		return
 	if(L.psi && L.psi.get_rank() >= PSI_RANK_HARMONIOUS)

diff --git a/code/modules/psionics/abilities/psi_drain.dm b/code/modules/psionics/abilities/psi_drain.dm
@@ -19,7 +19,7 @@
 	if(!isliving(hit_atom))
 		return
 	var/mob/living/L = hit_atom
-	if(!L.can_commune())
+	if(L.is_psi_blocked())
 		to_chat(user, SPAN_WARNING("This being doesn't have a Zona Bovinae."))
 		return
 	. = ..()
@@ -31,7 +31,7 @@
 	if(!isliving(hit_atom))
 		return
 	var/mob/living/L = hit_atom
-	if(!L.can_commune())
+	if(L.is_psi_blocked())
 		to_chat(user, SPAN_WARNING("This being doesn't have a Zona Bovinae."))
 		return
 	. = ..()

diff --git a/code/modules/psionics/abilities/psi_search.dm b/code/modules/psionics/abilities/psi_search.dm
@@ -28,7 +28,7 @@
 		var/list/level_humans = list()
 		var/found_apex = FALSE
 		for(var/mob/living/carbon/human/H in human_mob_list)
-			if(GET_Z(H) == GET_Z(H) && H.can_commune())
+			if(GET_Z(H) == GET_Z(H) && !H.is_psi_blocked())
 				if(HAS_TRAIT(H, TRAIT_PSIONIC_SUPPRESSION))
 					continue
 				level_humans |= H

diff --git a/code/modules/psionics/abilities/psi_sunder.dm b/code/modules/psionics/abilities/psi_sunder.dm
@@ -19,7 +19,7 @@
 	if(!isliving(hit_atom))
 		return
 	var/mob/living/L = hit_atom
-	if(!L.can_commune())
+	if(L.is_psi_blocked())
 		to_chat(user, SPAN_WARNING("This being doesn't have a Zona Bovinae."))
 		return
 	. = ..()

diff --git a/code/modules/psionics/abilities/zona_absorption.dm b/code/modules/psionics/abilities/zona_absorption.dm
@@ -18,7 +18,7 @@
 	if(!isliving(hit_atom))
 		return
 	var/mob/living/L = hit_atom
-	if(!L.can_commune())
+	if(L.is_psi_blocked())
 		to_chat(user, SPAN_WARNING("This being doesn't have a Zona Bovinae."))
 		return
 	if(HAS_TRAIT(L, TRAIT_ZONA_BOVINAE_ABSORBED))

diff --git a/code/modules/psionics/equipment/cerebro_enhancers.dm b/code/modules/psionics/equipment/cerebro_enhancers.dm
@@ -133,7 +133,7 @@
 	if(!ishuman(user))
 		return
 	var/mob/living/carbon/human/H = user
-	if(!H.can_commune())
+	if(H.is_psi_blocked())
 		to_chat(H, SPAN_WARNING("You don't have a Zona Bovinae!"))
 		return
 	if(H.psi.get_rank() >= PSI_RANK_HARMONIOUS)

diff --git a/code/modules/psionics/mob/mob_helpers.dm b/code/modules/psionics/mob/mob_helpers.dm
@@ -9,13 +9,10 @@
 	return !can_commune()
 
 /mob/living/carbon/is_psi_blocked()
-	if(!psi && !has_psi_aug())
-		if(isSynthetic())
-			return SPAN_ALIEN("Reaching out, your mind grasps at nothing.")
-		if (isvaurca(src))
-			return SPAN_CULT("You reach out into the Nlom; your call sails right through and yields no response.")
-		if (is_diona())
-			return SPAN_ALIEN("[src]'s mind is incompatible, formless.")
+	if(HAS_TRAIT(src, TRAIT_ZONA_BOVINAE_ABSORBED))
+		return FALSE
+	if(HAS_TRAIT(src, TRAIT_PSIONICALLY_DEAF))
+		return FALSE
 	for (var/obj/item/implant/mindshield/I in src)
 		if (I.implanted)
 			return SPAN_WARNING("[src]'s mind is inaccessible, like hitting a brick wall.")