From 42f1bc450cf6bc8d91ef519e8e4ddef00dea4a19 Mon Sep 17 00:00:00 2001
From: Snakebittenn <Takyahasu@gmail.com>
Date: Mon, 31 Aug 2020 13:48:39 -0600
Subject: [PATCH] Psi ping fix (#9656)

---
 code/modules/psionics/faculties/coercion.dm  |  6 +--
 html/changelogs/snakebittenn-activesonar.yml | 41 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/snakebittenn-activesonar.yml

diff --git a/code/modules/psionics/faculties/coercion.dm b/code/modules/psionics/faculties/coercion.dm
index 2ddc9496812..2abd5f96bc1 100644
--- a/code/modules/psionics/faculties/coercion.dm
+++ b/code/modules/psionics/faculties/coercion.dm
@@ -300,10 +300,8 @@
 			var/turf/T = get_turf(L)
 			if(!T || L == user || L.stat == DEAD || L.invisibility == INVISIBILITY_LEVEL_TWO)
 				continue
-			if(L.isSynthetic() || L.is_diona() || isvaurca(L))
-				var/obj/item/organ/internal/augment/psiaug = locate() in L
-				if(!psiaug)
-					continue
+			if(L.is_psi_blocked())
+				continue
 			var/image/ping_image = image(icon = 'icons/effects/effects.dmi', icon_state = "sonar_ping", loc = T)
 			ping_image.plane = LIGHTING_LAYER+1
 			ping_image.layer = LIGHTING_LAYER+1
diff --git a/html/changelogs/snakebittenn-activesonar.yml b/html/changelogs/snakebittenn-activesonar.yml
new file mode 100644
index 00000000000..b1fb8c7cb85
--- /dev/null
+++ b/html/changelogs/snakebittenn-activesonar.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Snakebittenn
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Psychic ping now properly checks for psi augs."