Delete client_procs.dm.rej

2017-05-10 22:00:44 -05:00
parent 51d5c735a0
commit 746da812bf
1 changed files with 0 additions and 41 deletions
@@ -1,41 +0,0 @@
-diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
-@@ -70,8 +70,7 @@
- 			return
- 
- 	//Logs all hrefs
-	if(config && config.log_hrefs && GLOB.href_logfile)
-		GLOB.href_logfile << "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
-+	GLOB.world_href_log << "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
- 
- 	// Admin PM
- 	if(href_list["priv_msg"])
-@@ -295,7 +294,7 @@ GLOBAL_LIST(external_rsc_urls)
- 				send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
- 	else if (isnum(cached_player_age) && cached_player_age < config.notify_new_player_age)
- 		message_admins("New user: [key_name_admin(src)] just connected with an age of [cached_player_age] day[(player_age==1?"":"s")]")
-	
-+
- 	get_message_output("watchlist entry", ckey)
- 	check_ip_intel()
- 
-@@ -340,7 +339,7 @@ GLOBAL_LIST(external_rsc_urls)
- 		adminGreet(1)
- 		holder.owner = null
- 		GLOB.admins -= src
-    
-+
- 		if (!GLOB.admins.len && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
- 			if(!GLOB.admins.len) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
- 				var/cheesy_message = pick(
-@@ -357,9 +356,9 @@ GLOBAL_LIST(external_rsc_urls)
- 					"What happened? Where has everyone gone?",\
- 					"Forever alone :("\
- 				)
-				
-+
- 				send2irc("Server", "[cheesy_message] (No admins online)")
-	
-+
- 	GLOB.ahelp_tickets.ClientLogout(src)
- 	GLOB.directory -= ckey
- 	GLOB.clients -= src