Merge pull request #1439 from quotefox/revert-1438-OOC_Notif

Revert "OOC Notifications"

code/__DEFINES/preferences.dm

@@ -16,7 +16,6 @@
 #define DISABLE_ARRIVALRATTLE	(1<<13)
 #define COMBOHUD_LIGHTING		(1<<14)
 #define ANTAG_SYNC_WITH_CHARS	(1<<15)
-#define ANNOUNCE_LOGINP			(1<<16)
 
 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
 

code/modules/client/client_procs.dm

@@ -274,17 +274,6 @@ 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 & ANNOUNCE_LOGINP)
-				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

code/modules/client/preferences.dm

@@ -981,8 +981,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<b>Play Lobby Music:</b> <a href='?_src_=prefs;preference=lobby_music'>[(toggles & SOUND_LOBBY) ? "Enabled":"Disabled"]</a><br>"
 			dat += "<b>See Pull Requests:</b> <a href='?_src_=prefs;preference=pull_requests'>[(chat_toggles & CHAT_PULLR) ? "Enabled":"Disabled"]</a><br>"
 			dat += "<br>"
-			dat += "<b>Announce Login:</b> <a href='?_src_=prefs;preference=announce_loginp'>[(toggles & ANNOUNCE_LOGINP)?"Enabled":"Disabled"]</a><br>"
-			dat += "<br>"
 			if(user.client)
 				if(unlock_content)
 					dat += "<b>BYOND Membership Publicity:</b> <a href='?_src_=prefs;preference=publicity'>[(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"]</a><br>"
@@ -2637,9 +2635,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					else
 						be_special += list(be_special_type)
 
-				if("announce_loginp")
-					toggles ^= ANNOUNCE_LOGINP
-
 				if("name")
 					be_random_name = !be_random_name
 

code/modules/client/preferences_toggles.dm

@@ -365,17 +365,6 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 		to_chat(src, "<span class='notice'>You will no longer examine things you click on.</span>")
 	SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Inquisitiveness", "[prefs.inquisitive_ghost ? "Enabled" : "Disabled"]"))
 
-/client/proc/toggleannounceloginplayer()
-	set name = "Do/Don't Announce Player Login"
-	set category = "Preferences"
-	set desc = "Toggle if you want an announcement to the server when you login during a round"
-	if(!holder)
-		return
-	prefs.toggles ^= ANNOUNCE_LOGINP
-	prefs.save_preferences()
-	to_chat(usr, "You will [(prefs.toggles & ANNOUNCE_LOGINP) ? "now" : "no longer"] have an announcement to other players when you login.")
-	SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Player Login Announcement", "[prefs.toggles & ANNOUNCE_LOGINP ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
 //Admin Preferences
 /client/proc/toggleadminhelpsound()
 	set name = "Hear/Silence Adminhelps"

code/modules/client/verbs/ooc.dm

@@ -66,10 +66,6 @@ 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))