diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index e0bc53d9219..8c3982369ef 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -127,6 +127,7 @@
#define BP_AUG_FUEL_CELL "integrated fuel cell"
#define BP_AUG_AIR_ANALYZER "integrated air analyzer"
#define BP_AUG_LANGUAGE "integrated language processor"
+#define BP_AUG_PSI "psionic receiver"
//Organ defines
#define PROCESS_ACCURACY 10
diff --git a/code/modules/client/preference_setup/loadout/loadout_augments.dm b/code/modules/client/preference_setup/loadout/loadout_augments.dm
index 66e19455e85..528a4325854 100644
--- a/code/modules/client/preference_setup/loadout/loadout_augments.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_augments.dm
@@ -67,3 +67,10 @@
description = "An augment that allows the user to synthetize welding fuel into nutrients."
path = /obj/item/organ/internal/augment/fuel_cell
cost = 3
+
+/datum/gear/augment/psiaug
+ display_name = "psionic receiver"
+ description = "An augment installed into the head that functions as a surrogate for a missing zona bovinae, also functioning as a filter for the psionically-challenged."
+ path = /obj/item/organ/internal/augment/psi
+ cost = 1
+ whitelisted = list("Human", "Off-Worlder Human", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara", "Vaurca Worker", "Vaurca Warrior", "Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm
index f300249e30d..c891688a454 100644
--- a/code/modules/organs/subtypes/augment.dm
+++ b/code/modules/organs/subtypes/augment.dm
@@ -334,3 +334,10 @@
/obj/item/organ/internal/augment/language/cthur
name = "C'thur language processor"
augment_languages = list(LANGUAGE_SKRELLIAN)
+
+// Snakebitten!
+/obj/item/organ/internal/augment/psi
+ name = "psionic receiver"
+ desc = "An augment installed into the head that functions as a surrogate for a missing zona bovinae, also functioning as a filter for the psionically-challenged."
+ organ_tag = BP_AUG_PSI
+ parent_organ = BP_HEAD
\ No newline at end of file
diff --git a/code/modules/psionics/faculties/coercion.dm b/code/modules/psionics/faculties/coercion.dm
index a9c30e46796..614b77c1e84 100644
--- a/code/modules/psionics/faculties/coercion.dm
+++ b/code/modules/psionics/faculties/coercion.dm
@@ -248,18 +248,22 @@
to_chat(user, SPAN_CULT("Not even a psion of your level can speak to the dead."))
return
- if (target.isSynthetic())
- to_chat(user, SPAN_WARNING("This can only be used on living organisms."))
- return
-
+ var/obj/item/organ/internal/augment/psi/psiaug
+ for (psiaug in target)
+ if(psiaug && !psiaug.is_broken())
+ break
+ if (!psiaug)
+ if(target.isSynthetic())
+ to_chat(user, SPAN_ALIEN("Your thoughts fail to reach any mind at all."))
+ return
+ if (isvaurca(target))
+ to_chat (user, SPAN_CULT("You feel your thoughts pass right through a mind empty of psychic energy."))
+ return
+ // do normal stuff here
if (target.is_diona())
to_chat(user, SPAN_ALIEN("The creature's mind is incompatible, formless."))
return
- if (isvaurca(target))
- to_chat (user, SPAN_CULT("You feel your thoughts pass right through a mind empty of psychic energy."))
- return
-
for (var/obj/item/implant/mindshield/I in target)
if (I.implanted)
to_chat(user, SPAN_WARNING("\The [target]'s mind rejects your attempt to communicate."))
@@ -276,7 +280,7 @@
var/mob/living/carbon/human/H = target
if(H.can_commune() || H.psi)
to_chat(H, "You instinctively sense [user] sending their thoughts into your mind, hearing: [text]")
- else if(prob(25) && (target.mind && target.mind.assigned_role=="Chaplain"))
+ else if(psiaug || prob(25) && (target.mind && target.mind.assigned_role=="Chaplain"))
to_chat(H, "You sense [user]'s psyche enter your mind, whispering quietly: [text]")
else
to_chat(H, "You feel something crawl behind your eyes, hearing: [text]")
@@ -313,8 +317,12 @@
var/list/dirs = list()
for(var/mob/living/L in range(20))
var/turf/T = get_turf(L)
- if(!T || L == user || L.stat == DEAD || L.isSynthetic() || L.is_diona() || isvaurca(L) || L.invisibility == INVISIBILITY_LEVEL_TWO)
+ 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
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/paradoxspace-sonar.yml b/html/changelogs/paradoxspace-sonar.yml
new file mode 100644
index 00000000000..a11532596e4
--- /dev/null
+++ b/html/changelogs/paradoxspace-sonar.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: Snakebitten
+
+# 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:
+ - rscadd: "Adds a psionic receiver augment. This allows vaurca and IPCs to be picked up by psionic pings and telepathic messages, and allows humans and other races to not be hurt by telepathic messages."