diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 96ba948ba..0979d9dc4 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -274,6 +274,17 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 						message_admins("<font color='red'><B>Notice: </B><font color='blue'>[key_name_admin(src)] has the same [matches] as [key_name_admin(C)] (no longer logged in). </font>")
 						log_access("Notice: [key_name(src)] has the same [matches] as [key_name(C)] (no longer logged in).")
 
+	for(var/client/C in GLOB.clients)
+		if( !C )
+			continue
+
+		if(C.prefs)//supposedly fixes a runtime with the following lines. Ripped from OldPollo. I miss you, Lads. :(
+			if(C.prefs.toggles & CHAT_OOC)
+				to_chat(world, "<span class='notice'><b>[src.key] has connected to the server.</b></span>")
+
+				if(C.prefs.toggles)
+					C << sound('hyperstation/sound/effects/oocjoin.ogg')
+
 	if(GLOB.player_details[ckey])
 		player_details = GLOB.player_details[ckey]
 		player_details.byond_version = full_version
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 087c434b8..c173d0815 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -66,6 +66,10 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 	//The linkify span classes and linkify=TRUE below make ooc text get clickable chat href links if you pass in something resembling a url
 	for(var/client/C in GLOB.clients)
 		if(C.prefs.chat_toggles & CHAT_OOC)
+
+			if(C.prefs.toggles)
+				C << sound('hyperstation/sound/effects/oocalert.ogg')
+
 			if(holder)
 				if(!holder.fakekey || C.holder)
 					if(check_rights_for(src, R_ADMIN))
diff --git a/hyperstation/sound/effects/oocalert.ogg b/hyperstation/sound/effects/oocalert.ogg
new file mode 100644
index 000000000..725fff68d
Binary files /dev/null and b/hyperstation/sound/effects/oocalert.ogg differ
diff --git a/hyperstation/sound/effects/oocjoin.ogg b/hyperstation/sound/effects/oocjoin.ogg
new file mode 100644
index 000000000..f0ab01402
Binary files /dev/null and b/hyperstation/sound/effects/oocjoin.ogg differ