mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 23:23:28 +01:00
Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support
This commit is contained in:
@@ -117,10 +117,16 @@
|
||||
/// Client's pAI save
|
||||
var/datum/pai_save/pai_save
|
||||
|
||||
/// List of the clients CUIs
|
||||
var/list/datum/custom_user_item/cui_entries = list()
|
||||
|
||||
/client/vv_edit_var(var_name, var_value)
|
||||
switch(var_name)
|
||||
// I know we will never be in a world where admins are editing client vars to let people bypass TOS
|
||||
// But guess what, if I have the ability to overengineer something, I am going to do it
|
||||
if("tos_consent")
|
||||
return FALSE
|
||||
// Dont fuck with this
|
||||
if("cui_entries")
|
||||
return FALSE
|
||||
return ..()
|
||||
|
||||
@@ -149,8 +149,6 @@
|
||||
karma_purchase(karma,30,"job","Nanotrasen Representative")
|
||||
if("4")
|
||||
karma_purchase(karma,30,"job","Blueshield")
|
||||
if("5")
|
||||
karma_purchase(karma,45,"job","Magistrate")
|
||||
return
|
||||
if(href_list["KarmaBuy2"])
|
||||
var/karma=verify_karma()
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
/datum/client_login_processor/cuis
|
||||
priority = 45
|
||||
|
||||
/datum/client_login_processor/cuis/get_query(client/C)
|
||||
var/datum/db_query/query = SSdbcore.NewQuery("SELECT cuiRealName, cuiPath, cuiItemName, cuiDescription, cuiJobMask FROM customuseritems WHERE cuiCKey=:ckey", list(
|
||||
"ckey" = C.ckey
|
||||
))
|
||||
return query
|
||||
|
||||
/datum/client_login_processor/cuis/process_result(datum/db_query/Q, client/C)
|
||||
while(Q.NextRow())
|
||||
var/datum/custom_user_item/cui = new()
|
||||
cui.characer_name = Q.item[1]
|
||||
cui.object_typepath = text2path(Q.item[2])
|
||||
cui.item_name_override = Q.item[3]
|
||||
cui.item_desc_override = Q.item[4]
|
||||
cui.raw_job_mask = Q.item[5]
|
||||
|
||||
if(cui.parse_info(C.ckey))
|
||||
C.cui_entries += cui
|
||||
Reference in New Issue
Block a user