cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update client procs.dm

Browse Source
This commit is contained in:
Novacat
2020-01-21 18:56:54 -05:00
committed by GitHub
parent 44d334a37c
commit b0b60d051e
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/client/client procs.dm
View File

@@ -288,11 +288,7 @@
log_admin("Skipping IP reputation check on [key] with [address] because of player age") log_admin("Skipping IP reputation check on [key] with [address] because of player age")
else if(update_ip_reputation()) //It is set now else if(update_ip_reputation()) //It is set now
if(ip_reputation >= config.ipr_bad_score) //It's bad if(ip_reputation >= config.ipr_bad_score) //It's bad
<<<<<<< HEAD
=======
>>>>>>> ea8bf0a... Merge pull request #6630 from Novacat/nova-alerts
//Log it //Log it
if(config.paranoia_logging) //We don't block, but we want paranoia log messages if(config.paranoia_logging) //We don't block, but we want paranoia log messages
log_and_message_admins("[key] at [address] has bad IP reputation: [ip_reputation]. Will be kicked if enabled in config.") log_and_message_admins("[key] at [address] has bad IP reputation: [ip_reputation]. Will be kicked if enabled in config.")
@@ -301,11 +297,7 @@
//Take action if required //Take action if required
if(config.ipr_block_bad_ips && config.ipr_allow_existing) //We allow players of an age, but you don't meet it if(config.ipr_block_bad_ips && config.ipr_allow_existing) //We allow players of an age, but you don't meet it
<<<<<<< HEAD
to_chat(src,"Sorry, we only allow VPN/Proxy/Tor usage for players who have spent at least [config.ipr_minimum_age] days on the server. If you are unable to use the internet without your VPN/Proxy/Tor, please contact an admin out-of-game to let them know so we can accomidate this.")
=======
to_chat(src,"Sorry, we only allow VPN/Proxy/Tor usage for players who have spent at least [config.ipr_minimum_age] days on the server. If you are unable to use the internet without your VPN/Proxy/Tor, please contact an admin out-of-game to let them know so we can accommodate this.") to_chat(src,"Sorry, we only allow VPN/Proxy/Tor usage for players who have spent at least [config.ipr_minimum_age] days on the server. If you are unable to use the internet without your VPN/Proxy/Tor, please contact an admin out-of-game to let them know so we can accommodate this.")
>>>>>>> ea8bf0a... Merge pull request #6630 from Novacat/nova-alerts
qdel(src) qdel(src)
return 0 return 0
else if(config.ipr_block_bad_ips) //We don't allow players of any particular age else if(config.ipr_block_bad_ips) //We don't allow players of any particular age
@@ -315,7 +307,6 @@
else else
log_admin("Couldn't perform IP check on [key] with [address]") log_admin("Couldn't perform IP check on [key] with [address]")
<<<<<<< HEAD
// VOREStation Edit Start - Department Hours // VOREStation Edit Start - Department Hours
if(config.time_off) if(config.time_off)
var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'") var/DBQuery/query_hours = dbcon.NewQuery("SELECT department, hours FROM vr_player_hours WHERE ckey = '[sql_ckey]'")
@@ -325,8 +316,6 @@
department_hours[query_hours.item[1]] = text2num(query_hours.item[2]) department_hours[query_hours.item[1]] = text2num(query_hours.item[2])
// VOREStation Edit End - Department Hours // VOREStation Edit End - Department Hours
=======
>>>>>>> ea8bf0a... Merge pull request #6630 from Novacat/nova-alerts
if(sql_id) if(sql_id)
//Player already identified previously, we need to just update the 'lastseen', 'ip' and 'computer_id' variables //Player already identified previously, we need to just update the 'lastseen', 'ip' and 'computer_id' variables
var/DBQuery/query_update = dbcon.NewQuery("UPDATE erro_player SET lastseen = Now(), ip = '[sql_ip]', computerid = '[sql_computerid]', lastadminrank = '[sql_admin_rank]' WHERE id = [sql_id]") var/DBQuery/query_update = dbcon.NewQuery("UPDATE erro_player SET lastseen = Now(), ip = '[sql_ip]', computerid = '[sql_computerid]', lastadminrank = '[sql_admin_rank]' WHERE id = [sql_id]")