From b9ec312d94bfe7e9084b22a6456e8caee613a41c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 22 Dec 2017 03:16:28 -0600 Subject: [PATCH] Update client_procs.dm --- code/modules/client/client_procs.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index da5a1846f7..c3a6995b7a 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -199,13 +199,7 @@ GLOBAL_LIST(external_rsc_urls) prefs.parent = src prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning -<<<<<<< HEAD - if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps) - vars["fps"] = prefs.clientfps - sethotkeys(1) //set hoykeys from preferences (from_pref = 1) -======= fps = prefs.clientfps ->>>>>>> e72cfeb... code improvements from mso and co (#33485) log_access("Login: [key_name(src)] from [address ? address : "localhost"]-[computer_id] || BYOND v[byond_version]") var/alert_mob_dupe_login = FALSE