diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index 0f37cb4effb..925b709d727 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -334,3 +334,5 @@
 			return
 		if(P.focused_conv)
 			P.focused_conv.cl_send(P, text, M)
+	if(listening)
+		registered_message = text
diff --git a/code/modules/modular_computers/computers/modular_computer/variables.dm b/code/modules/modular_computers/computers/modular_computer/variables.dm
index 384d4e77413..ec755a319d1 100644
--- a/code/modules/modular_computers/computers/modular_computer/variables.dm
+++ b/code/modules/modular_computers/computers/modular_computer/variables.dm
@@ -82,4 +82,7 @@
 
 	var/listener/listener	//Listener needed for things
 
+	var/listening = FALSE //For listening to mob say.
+	var/registered_message = ""
+
 	charge_failure_message = " does not have a battery installed."
diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm
index b6d2abe0302..d4e113ba68d 100644
--- a/code/modules/modular_computers/file_system/programs/command/comm.dm
+++ b/code/modules/modular_computers/file_system/programs/command/comm.dm
@@ -172,8 +172,11 @@
 				if(!input || !can_still_topic())
 					SSnanoui.update_uis(src)
 					return
+				program.computer.listening = TRUE
+				usr.say(input)
+				program.computer.listening = FALSE
 				var/affected_zlevels = GetConnectedZlevels(GET_Z(program.computer))
-				crew_announcement.Announce(input, zlevels = affected_zlevels)
+				crew_announcement.Announce(program.computer.registered_message, zlevels = affected_zlevels)
 				set_announcement_cooldown(TRUE)
 				addtimer(CALLBACK(src, .proc/set_announcement_cooldown, FALSE), 600) //One minute cooldown
 		if("message")
diff --git a/html/changelogs/mattatlas-publicserviceannouncement.yml b/html/changelogs/mattatlas-publicserviceannouncement.yml
new file mode 100644
index 00000000000..a1529310d23
--- /dev/null
+++ b/html/changelogs/mattatlas-publicserviceannouncement.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: MattAtlas
+
+# 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: "When you input a message to announce through the Command console, your character now speaks the message, which gets recorded and then replayed as the announcement. This means that auto-hiss will translate over to your announcements!"