diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm
index 8779d6e8860..cab30ebe8de 100644
--- a/code/__DEFINES/mob.dm
+++ b/code/__DEFINES/mob.dm
@@ -96,4 +96,8 @@
 #define I_HELP		"help"
 #define I_DISARM	"disarm"
 #define I_GRAB		"grab"
-#define I_HARM		"harm"
\ No newline at end of file
+#define I_HARM		"harm"
+
+// AI wire/radio settings
+#define AI_CHECK_WIRELESS 1
+#define AI_CHECK_RADIO 2
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 6de7b47779f..4c7d3fe57b1 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -1,6 +1,3 @@
-#define AI_CHECK_WIRELESS 1
-#define AI_CHECK_RADIO 2
-
 var/list/ai_list = list()
 var/list/ai_verbs_default = list(
 	/mob/living/silicon/ai/proc/announcement,
@@ -102,6 +99,7 @@ var/list/ai_verbs_default = list(
 	announcement = new()
 	announcement.title = "A.I. Announcement"
 	announcement.announcement_type = "A.I. Announcement"
+	announcement.announcer = name
 	announcement.newscast = 1
 	
 	var/list/possibleNames = ai_names
@@ -217,6 +215,8 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/SetName(pickedName as text)
 	..()
+	
+	announcement.announcer = name
 
 	if(eyeobj)
 		eyeobj.name = "[pickedName] (AI Eye)"
@@ -345,7 +345,7 @@ var/list/ai_verbs_default = list(
 		src << "<span class='warning'>Please allow one minute to pass between announcements.</span>"
 		return
 		
-	var/input = input(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") as text|null
+	var/input = input(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") as message|null
 	if(!input)
 		return
 
@@ -999,7 +999,3 @@ var/list/ai_verbs_default = list(
 		loc = card//Throw AI into the card.
 		src << "You have been downloaded to a mobile storage device. Remote device connection severed."
 		user << "<span class='boldnotice'>Transfer successful</span>: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory."
-
-#undef AI_CHECK_WIRELESS
-#undef AI_CHECK_RADIO
-
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index acf3a2db3c0..55eed0a2570 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -35,7 +35,7 @@ var/const/VOX_PATH = "sound/vox_fem/"
 		src << "<span class='warning'>Please wait [round((announcing_vox - world.time) / 10)] seconds.</span>"
 		return
 
-	var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement) as text|null
+	var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement) as message|null
 
 	last_announcement = message