Merge remote-tracking branch 'ParadiseSS13/master' into pr/warior4356/14493

This commit is contained in:
AffectedArc07
2020-10-24 09:51:04 +01:00
20 changed files with 1135 additions and 644 deletions
+1 -1
View File
@@ -236,7 +236,7 @@
/obj/item/clothing/suit/armor/laserproof
name = "Ablative Armor Vest"
desc = "A vest that excels in protecting the wearer against energy projectiles. Projects an energy field arround the user, allowing a chance of energy projectile deflection no matter where on the user it would hit."
desc = "A vest that excels in protecting the wearer against energy projectiles. Projects an energy field around the user, allowing a chance of energy projectile deflection no matter where on the user it would hit."
icon_state = "armor_reflec"
item_state = "armor_reflec"
blood_overlay_type = "armor"
+45 -39
View File
@@ -297,25 +297,27 @@
Deletion.Cut(Deletion.len)
qdel(DL)
/datum/personal_crafting/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/topic_state/state = GLOB.not_incapacitated_turf_state)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
/datum/personal_crafting/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_not_incapacitated_turf_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "personal_crafting.tmpl", "Crafting Menu", 700, 800, state = state)
ui = new(user, src, ui_key, "PersonalCrafting", "Crafting Menu", 700, 800, master_ui, state)
ui.open()
/datum/personal_crafting/proc/close(mob/user)
var/datum/nanoui/ui = SSnanoui.get_open_ui(user, src, "main")
var/datum/nanoui/ui = SStgui.get_open_ui(user, src, "main")
if(ui)
ui.close()
/datum/personal_crafting/ui_data(mob/user)
/datum/personal_crafting/tgui_data(mob/user)
var/list/data = list()
var/list/subs = list()
var/cur_subcategory = CAT_NONE
var/cur_category = categories[viewing_category]
if(islist(subcategories[viewing_category]))
subs = subcategories[viewing_category]
cur_subcategory = subs[viewing_subcategory]
data["busy"] = busy
data["prev_cat"] = categories[prev_cat()]
data["prev_subcat"] = subs[prev_subcat()]
@@ -329,6 +331,7 @@
var/list/surroundings = get_surroundings(user)
var/list/can_craft = list()
var/list/cant_craft = list()
for(var/rec in GLOB.crafting_recipes)
var/datum/crafting_recipe/R = rec
@@ -341,49 +344,52 @@
can_craft += list(build_recipe_data(R))
else
cant_craft += list(build_recipe_data(R))
data["can_craft"] = can_craft
data["cant_craft"] = cant_craft
return data
/datum/personal_crafting/Topic(href, href_list)
/datum/personal_crafting/tgui_act(action, list/params)
if(..())
return
if(href_list["make"])
var/datum/crafting_recipe/TR = locate(href_list["make"]) in GLOB.crafting_recipes
busy = TRUE
SSnanoui.update_uis(src)
var/fail_msg = construct_item(usr, TR)
if(!fail_msg)
to_chat(usr, "<span class='notice'>[TR.name] constructed.</span>")
if(TR.alert_admins_on_craft)
message_admins("[key_name_admin(usr)] has created a [TR.name] at [ADMIN_COORDJMP(usr)]")
else
to_chat(usr, "<span class ='warning'>Construction failed[fail_msg]</span>")
busy = FALSE
SSnanoui.update_uis(src)
if(href_list["forwardCat"])
viewing_category = next_cat(FALSE)
. = TRUE
if(href_list["backwardCat"])
viewing_category = prev_cat(FALSE)
. = TRUE
if(href_list["forwardSubCat"])
viewing_subcategory = next_subcat()
. = TRUE
if(href_list["backwardSubCat"])
viewing_subcategory = prev_subcat()
. = TRUE
if(href_list["toggle_recipes"])
display_craftable_only = !display_craftable_only
. = TRUE
if(href_list["toggle_compact"])
display_compact = !display_compact
. = TRUE
. = TRUE
SSnanoui.update_uis(src)
switch(action)
if("make")
var/datum/crafting_recipe/TR = locate(params["make"]) in GLOB.crafting_recipes
if(!istype(TR))
return
busy = TRUE
SStgui.update_uis(src)
var/fail_msg = construct_item(usr, TR)
if(!fail_msg)
to_chat(usr, "<span class='notice'>[TR.name] constructed.</span>")
if(TR.alert_admins_on_craft)
message_admins("[key_name_admin(usr)] has created a [TR.name] at [ADMIN_COORDJMP(usr)]")
else
to_chat(usr, "<span class='warning'>Construction failed[fail_msg]</span>")
busy = FALSE
SStgui.update_uis(src)
if("forwardCat")
viewing_category = next_cat(FALSE)
if("backwardCat")
viewing_category = prev_cat(FALSE)
if("forwardSubCat")
viewing_subcategory = next_subcat()
if("backwardSubCat")
viewing_subcategory = prev_subcat()
if("toggle_recipes")
display_craftable_only = !display_craftable_only
if("toggle_compact")
display_compact = !display_compact
//Next works nicely with modular arithmetic
//Next works nicely with modular arithmetic
/datum/personal_crafting/proc/next_cat(readonly = TRUE)
if (!readonly)
+3 -2
View File
@@ -87,8 +87,9 @@ GLOBAL_LIST_EMPTY(all_money_accounts)
R.name = "Account information: [M.owner_name]"
var/overseer = "Unknown"
if(source_db.held_card)
overseer = source_db.held_card.registered_name
var/datum/tgui_login/L = source_db.tgui_login_get()
if(L.id)
overseer = L.id.registered_name
R.info = {"<b>Account details (confidential)</b><br><hr><br>
<i>Account holder:</i> [M.owner_name]<br>
<i>Account number:</i> [M.account_number]<br>
+175 -190
View File
@@ -1,22 +1,30 @@
GLOBAL_VAR(current_date_string)
#define AUT_ACCLST 1
#define AUT_ACCINF 2
#define AUT_ACCNEW 3
/obj/machinery/computer/account_database
name = "Accounts Uplink Terminal"
desc = "Access transaction logs, account data and all kinds of other financial records."
icon_screen = "accounts"
density = 1
req_one_access = list(ACCESS_HOP, ACCESS_CAPTAIN, ACCESS_CENT_COMMANDER)
light_color = LIGHT_COLOR_GREEN
var/receipt_num
var/machine_id = ""
var/obj/item/card/id/held_card
var/datum/money_account/detailed_account_view
var/creating_new_account = 0
var/activated = 1
var/activated = TRUE
var/const/fund_cap = 1000000
light_color = LIGHT_COLOR_GREEN
/// Current UI page
var/current_page = AUT_ACCLST
/// Next time a print can be made
var/next_print = 0
/obj/machinery/computer/account_database/New()
// Why the fuck are these not in a subsystem? They are global variables for fucks sake
// If someone ever makes a map without one of these consoles, the entire eco AND date system breaks
// This upsets me a lot
// AA Todo: SSeconomy
if(!GLOB.station_account)
create_station_account()
@@ -33,230 +41,207 @@ GLOBAL_VAR(current_date_string)
machine_id = "[station_name()] Acc. DB #[GLOB.num_financial_terminals++]"
..()
/obj/machinery/computer/account_database/proc/get_access_level(var/mob/user)
if(user.can_admin_interact())
return 2
if(!held_card)
return 0
if(ACCESS_CENT_COMMANDER in held_card.access)
return 2
else if((ACCESS_HOP in held_card.access) || (ACCESS_CAPTAIN in held_card.access))
return 1
/obj/machinery/computer/account_database/proc/accounting_letterhead(report_name)
var/datum/tgui_login/L = tgui_login_get()
return {"
<center><h1><b>[report_name]</b></h1></center>
<center><small><i>[station_name()] Accounting Report</i></small></center>
<u>Generated By:</u> [L?.id?.registered_name ? L.id.registered_name : "Unknown"], [L?.id?.assignment ? L.id.assignment : "Unknown"]<br>
<hr>
<u>Generated By:</u> [held_card.registered_name], [held_card.assignment]<br>
"}
/obj/machinery/computer/account_database/attackby(obj/O, mob/user, params)
if(!istype(O, /obj/item/card/id))
return ..()
if(tgui_login_attackby(O, user))
return
return ..()
if(!held_card)
user.drop_item()
O.loc = src
held_card = O
/obj/machinery/computer/account_database/attack_hand(mob/user)
tgui_interact(user)
SSnanoui.update_uis(src)
attack_hand(user)
/obj/machinery/computer/account_database/attack_hand(mob/user as mob)
ui_interact(user)
/obj/machinery/computer/account_database/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
user.set_machine(src)
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
/obj/machinery/computer/account_database/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "accounts_terminal.tmpl", src.name, 400, 640)
ui = new(user, src, ui_key, "AccountsUplinkTerminal", name, 800, 600, master_ui, state)
ui.open()
/obj/machinery/computer/account_database/ui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/data[0]
/obj/machinery/computer/account_database/tgui_data(mob/user, ui_key = "main", datum/topic_state/state = GLOB.default_state)
var/list/data = list()
data["currentPage"] = current_page
data["is_printing"] = (next_print > world.time)
tgui_login_data(data, user)
if(data["loginState"]["logged_in"])
switch(current_page)
if(AUT_ACCLST)
var/list/accounts = list()
for(var/i in 1 to length(GLOB.all_money_accounts))
var/datum/money_account/D = GLOB.all_money_accounts[i]
accounts.Add(list(list(
"account_number" = D.account_number,
"owner_name" = D.owner_name,
"suspended" = D.suspended ? "SUSPENDED" : "Active",
"account_index" = i)))
data["src"] = UID()
data["id_inserted"] = !!held_card
data["id_card"] = held_card ? text("[held_card.registered_name], [held_card.assignment]") : "-----"
data["access_level"] = get_access_level(user)
data["machine_id"] = machine_id
data["creating_new_account"] = creating_new_account
data["detailed_account_view"] = !!detailed_account_view
data["station_account_number"] = GLOB.station_account.account_number
data["transactions"] = null
data["accounts"] = null
data["accounts"] = accounts
if(detailed_account_view)
data["account_number"] = detailed_account_view.account_number
data["owner_name"] = detailed_account_view.owner_name
data["money"] = detailed_account_view.money
data["suspended"] = detailed_account_view.suspended
if(AUT_ACCINF)
data["account_number"] = detailed_account_view.account_number
data["owner_name"] = detailed_account_view.owner_name
data["money"] = detailed_account_view.money
data["suspended"] = detailed_account_view.suspended
var/list/trx[0]
for(var/datum/transaction/T in detailed_account_view.transaction_log)
trx.Add(list(list(\
"date" = T.date, \
"time" = T.time, \
"target_name" = T.target_name, \
"purpose" = T.purpose, \
"amount" = T.amount, \
"source_terminal" = T.source_terminal)))
if(trx.len > 0)
data["transactions"] = trx
var/list/accounts[0]
for(var/i=1, i<=GLOB.all_money_accounts.len, i++)
var/datum/money_account/D = GLOB.all_money_accounts[i]
accounts.Add(list(list(\
"account_number"=D.account_number,\
"owner_name"=D.owner_name,\
"suspended"=D.suspended ? "SUSPENDED" : "",\
"account_index"=i)))
if(accounts.len > 0)
data["accounts"] = accounts
var/list/transactions = list()
for(var/datum/transaction/T in detailed_account_view.transaction_log)
transactions.Add(list(list(
"date" = T.date,
"time" = T.time,
"target_name" = T.target_name,
"purpose" = T.purpose,
"amount" = T.amount,
"source_terminal" = T.source_terminal)))
data["transactions"] = transactions
return data
/obj/machinery/computer/account_database/Topic(href, href_list)
/obj/machinery/computer/account_database/tgui_act(action, list/params)
if(..())
return 1
return
if(href_list["insert_card"])
if(held_card)
held_card.forceMove(loc)
. = TRUE
if(ishuman(usr) && !usr.get_active_hand())
usr.put_in_hands(held_card)
held_card = null
if(tgui_login_act(action, params))
return
else
var/obj/item/I = usr.get_active_hand()
if(istype(I, /obj/item/card/id))
var/obj/item/card/id/C = I
usr.drop_item()
C.forceMove(src)
held_card = C
if(!tgui_login_get().logged_in)
return
if(!get_access_level(usr))
return 1
switch(action)
if("view_account_detail")
var/index = text2num(params["index"])
if(index && index > 0 && index <= length(GLOB.all_money_accounts))
detailed_account_view = GLOB.all_money_accounts[index]
current_page = AUT_ACCINF
var/datum/nanoui/ui = SSnanoui.get_open_ui(usr, src, "main")
if("back")
detailed_account_view = null
current_page = AUT_ACCLST
if(href_list["choice"])
switch(href_list["choice"])
if("create_account")
creating_new_account = 1
if("toggle_suspension")
if(detailed_account_view)
detailed_account_view.suspended = !detailed_account_view.suspended
if("toggle_suspension")
if(detailed_account_view)
detailed_account_view.suspended = !detailed_account_view.suspended
if("create_new_account")
current_page = AUT_ACCNEW
if("finalise_create_account")
var/account_name = href_list["holder_name"]
var/starting_funds = max(text2num(href_list["starting_funds"]), 0)
if("finalise_create_account")
var/account_name = params["holder_name"]
var/starting_funds = max(text2num(params["starting_funds"]), 0)
if(!account_name || !starting_funds)
return
starting_funds = clamp(starting_funds, 0, GLOB.station_account.money) // Not authorized to put the station in debt.
starting_funds = min(starting_funds, fund_cap) // Not authorized to give more than the fund cap.
starting_funds = clamp(starting_funds, 0, GLOB.station_account.money) // Not authorized to put the station in debt.
starting_funds = min(starting_funds, fund_cap) // Not authorized to give more than the fund cap.
var/datum/money_account/M = create_account(account_name, starting_funds, src)
if(starting_funds > 0)
GLOB.station_account.charge(starting_funds, null, "New account activation",
"", "New account activation", M.owner_name)
var/datum/money_account/M = create_account(account_name, starting_funds, src)
if(starting_funds > 0)
GLOB.station_account.charge(starting_funds, null, "New account activation", "", "New account activation", M.owner_name)
creating_new_account = 0
ui.close()
current_page = AUT_ACCLST
creating_new_account = 0
if("view_account_detail")
var/index = text2num(href_list["account_index"])
if(index && index <= GLOB.all_money_accounts.len)
detailed_account_view = GLOB.all_money_accounts[index]
if("print_records")
// Anti spam measures
if(next_print > world.time)
to_chat(usr, "<span class='warning'>The printer is busy spooling. It will be ready in [(next_print - world.time) / 10] seconds.")
return
var/text
playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
var/obj/item/paper/P = new(loc)
P.name = "financial account list"
text = {"
[accounting_letterhead("Financial Account List")]
if("view_accounts_list")
detailed_account_view = null
creating_new_account = 0
<table>
<thead>
<tr>
<td>Account Number</td>
<td>Holder</td>
<td>Balance</td>
<td>Status</td>
</tr>
</thead>
<tbody>
"}
if("print")
var/text
playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
var/obj/item/paper/P = new(loc)
if(detailed_account_view)
P.name = "account #[detailed_account_view.account_number] details"
var/title = "Account #[detailed_account_view.account_number] Details"
text = {"
[accounting_letterhead(title)]
<u>Holder:</u> [detailed_account_view.owner_name]<br>
<u>Balance:</u> $[detailed_account_view.money]<br>
<u>Status:</u> [detailed_account_view.suspended ? "Suspended" : "Active"]<br>
<u>Transactions:</u> ([detailed_account_view.transaction_log.len])<br>
<table>
<thead>
<tr>
<td>Timestamp</td>
<td>Target</td>
<td>Reason</td>
<td>Value</td>
<td>Terminal</td>
</tr>
</thead>
<tbody>
"}
for(var/i in 1 to length(GLOB.all_money_accounts))
var/datum/money_account/D = GLOB.all_money_accounts[i]
text += {"
<tr>
<td>#[D.account_number]</td>
<td>[D.owner_name]</td>
<td>$[D.money]</td>
<td>[D.suspended ? "Suspended" : "Active"]</td>
</tr>
"}
for(var/datum/transaction/T in detailed_account_view.transaction_log)
text += {"
<tr>
<td>[T.date] [T.time]</td>
<td>[T.target_name]</td>
<td>[T.purpose]</td>
<td>[T.amount]</td>
<td>[T.source_terminal]</td>
</tr>
"}
text += {"
</tbody>
</table>
"}
text += {"
</tbody>
</table>
"}
P.info = text
visible_message("<span class='notice'>[src] prints out a report.</span>")
next_print = world.time + 30 SECONDS
else
P.name = "financial account list"
text = {"
[accounting_letterhead("Financial Account List")]
if("print_account_details")
// Anti spam measures
if(next_print > world.time)
to_chat(usr, "<span class='warning'>The printer is busy spooling. It will be ready in [(next_print - world.time) / 10] seconds.")
return
var/text
playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
var/obj/item/paper/P = new(loc)
P.name = "account #[detailed_account_view.account_number] details"
var/title = "Account #[detailed_account_view.account_number] Details"
text = {"
[accounting_letterhead(title)]
<u>Holder:</u> [detailed_account_view.owner_name]<br>
<u>Balance:</u> $[detailed_account_view.money]<br>
<u>Status:</u> [detailed_account_view.suspended ? "Suspended" : "Active"]<br>
<u>Transactions:</u> ([detailed_account_view.transaction_log.len])<br>
<table>
<thead>
<tr>
<td>Timestamp</td>
<td>Target</td>
<td>Reason</td>
<td>Value</td>
<td>Terminal</td>
</tr>
</thead>
<tbody>
"}
<table>
<thead>
<tr>
<td>Account Number</td>
<td>Holder</td>
<td>Balance</td>
<td>Status</td>
</tr>
</thead>
<tbody>
for(var/datum/transaction/T in detailed_account_view.transaction_log)
text += {"
<tr>
<td>[T.date] [T.time]</td>
<td>[T.target_name]</td>
<td>[T.purpose]</td>
<td>[T.amount]</td>
<td>[T.source_terminal]</td>
</tr>
"}
for(var/i=1, i<=GLOB.all_money_accounts.len, i++)
var/datum/money_account/D = GLOB.all_money_accounts[i]
text += {"
<tr>
<td>#[D.account_number]</td>
<td>[D.owner_name]</td>
<td>$[D.money]</td>
<td>[D.suspended ? "Suspended" : "Active"]</td>
</tr>
"}
text += {"
</tbody>
</table>
"}
text += {"
</tbody>
</table>
"}
P.info = text
visible_message("<span class='notice'>[src] prints out a report.</span>")
next_print = world.time + 30 SECONDS
P.info = text
visible_message("<span class='notice'>[src] prints out a report.</span>")
return 1
#undef AUT_ACCLST
#undef AUT_ACCINF
#undef AUT_ACCNEW
@@ -41,7 +41,7 @@
GLOB.human_list += src
/mob/living/carbon/human/OpenCraftingMenu()
handcrafting.ui_interact(src)
handcrafting.tgui_interact(src)
/mob/living/carbon/human/prepare_data_huds()
//Update med hud images...
@@ -146,7 +146,7 @@
result_amount = 5
mix_message = "The mixture curdles up."
/datum/chemical_reaction/cheese/on_reaction(datum/reagents/holder)
/datum/chemical_reaction/fake_cheese/on_reaction(datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("<span class='notice'>A faint cheese-ish smell drifts through the air...</span>")
+3
View File
@@ -130,6 +130,9 @@ GLOBAL_LIST(tgui_logins)
state.name = state.id.registered_name
state.rank = state.id.assignment
state.access = state.id.access
else
to_chat(usr, "<span class='warning'>Access Denied</span>")
return
else if(login_type == LOGIN_TYPE_AI && isAI(usr))
state.name = usr.name
state.rank = "AI"