cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] some smaller cleanup (#12353)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-02-02 01:57:18 +01:00
committed by GitHub
co-authored by Kashargul
parent a02e343047
commit ad7616b0eb
17 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client procs.dm
+13 -2
View File
@@ -462,7 +462,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/sql_ckey = sql_sanitize_text(src.ckey)
var/datum/db_query/query = SSdbcore.NewQuery("SELECT id, datediff(Now(),firstseen) as age FROM erro_player WHERE ckey = '[sql_ckey]'")
query.Execute()
if(!query.Execute())
qdel(query)
return
var/sql_id = 0
player_age = 0 // New players won't have an entry so knowing we have a connection we set this to zero to be updated if their is a record.
while(query.NextRow())
@@ -474,11 +476,17 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
account_join_date = sanitizeSQL(findJoinDate())
if(account_join_date && SSdbcore.IsConnected())
var/datum/db_query/query_datediff = SSdbcore.NewQuery("SELECT DATEDIFF(Now(),'[account_join_date]')")
if(query_datediff.Execute() && query_datediff.NextRow())
if(!query_datediff.Execute())
qdel(query)
return
if(query_datediff.NextRow())
account_age = text2num(query_datediff.item[1])
qdel(query_datediff)
var/datum/db_query/query_ip = SSdbcore.NewQuery("SELECT ckey FROM erro_player WHERE ip = '[address]'")
if(!query_ip.Execute())
qdel(query)
return
query_ip.Execute()
related_accounts_ip = ""
while(query_ip.NextRow())
@@ -487,6 +495,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
qdel(query_ip)
var/datum/db_query/query_cid = SSdbcore.NewQuery("SELECT ckey FROM erro_player WHERE computerid = '[computer_id]'")
if(!query_cid.Execute())
qdel(query)
return
query_cid.Execute()
related_accounts_cid = ""
while(query_cid.NextRow())
code/modules/client/preference_setup/loadout/01_equipment.dm
+5 -5
View File
@@ -39,7 +39,7 @@
character.all_underwear_metadata.Cut()
for(var/underwear_category_name in pref.all_underwear)
var/datum/category_group/underwear/underwear_category = global_underwear.categories_by_name[underwear_category_name]
var/datum/category_group/underwear/underwear_category = GLOB.global_underwear.categories_by_name[underwear_category_name]
if(underwear_category)
var/underwear_item_name = pref.all_underwear[underwear_category_name]
character.all_underwear[underwear_category_name] = underwear_category.items_by_name[underwear_item_name]
@@ -65,7 +65,7 @@
if(!istype(pref.all_underwear))
pref.all_underwear = list()
for(var/datum/category_group/underwear/WRC in global_underwear.categories)
for(var/datum/category_group/underwear/WRC in GLOB.global_underwear.categories)
for(var/datum/category_item/underwear/WRI in WRC.items)
if(WRI.is_default(pref.identifying_gender ? pref.identifying_gender : MALE))
pref.all_underwear[WRC.name] = WRI.name
@@ -75,7 +75,7 @@
pref.all_underwear_metadata = list()
for(var/underwear_category in pref.all_underwear)
var/datum/category_group/underwear/UWC = global_underwear.categories_by_name[underwear_category]
var/datum/category_group/underwear/UWC = GLOB.global_underwear.categories_by_name[underwear_category]
if(!UWC)
pref.all_underwear -= underwear_category
else
@@ -95,7 +95,7 @@
var/list/data = ..()
var/list/underwear_data = list()
for(var/datum/category_group/underwear/UWC in global_underwear.categories)
for(var/datum/category_group/underwear/UWC in GLOB.global_underwear.categories)
var/item_name = LAZYACCESS(pref.all_underwear, UWC.name) || "None"
var/list/tweaks = list()
@@ -183,7 +183,7 @@
return TOPIC_REFRESH_UPDATE_PREVIEW
if("change_underwear")
var/datum/category_group/underwear/UWC = LAZYACCESS(global_underwear.categories_by_name, params["underwear"])
var/datum/category_group/underwear/UWC = LAZYACCESS(GLOB.global_underwear.categories_by_name, params["underwear"])
if(!UWC)
return
var/datum/category_item/underwear/selected_underwear = tgui_input_list(user, "Choose underwear:", "Character Preference", UWC.items, pref.all_underwear[UWC.name])