From 65d19ef84147c85a12ea846b88d879581e4d834d Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone Date: Thu, 6 Dec 2018 01:25:11 -0500 Subject: [PATCH] Update _techweb.dm --- code/modules/research/techweb/_techweb.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm index a5d3afd3fb5..2b1e8a7a511 100644 --- a/code/modules/research/techweb/_techweb.dm +++ b/code/modules/research/techweb/_techweb.dm @@ -26,7 +26,7 @@ SSresearch.techwebs += src for(var/i in SSresearch.techweb_nodes_starting) var/datum/techweb_node/DN = SSresearch.techweb_node_by_id(i) - research_node(DN, TRUE, FALSE) + research_node(DN, TRUE, FALSE, FALSE) hidden_nodes = SSresearch.techweb_nodes_hidden.Copy() return ..() @@ -38,7 +38,7 @@ . = ..() for(var/i in SSresearch.techweb_nodes) var/datum/techweb_node/TN = SSresearch.techweb_nodes[i] - research_node(TN, TRUE) + research_node(TN, TRUE, TRUE, FALSE) for(var/i in SSresearch.point_types) research_points[i] = INFINITY hidden_nodes = list() @@ -112,7 +112,7 @@ /datum/techweb/proc/copy_research_to(datum/techweb/receiver, unlock_hidden = TRUE) //Adds any missing research to theirs. for(var/i in researched_nodes) CHECK_TICK - receiver.research_node_id(i, TRUE, FALSE) + receiver.research_node_id(i, TRUE, FALSE, FALSE) for(var/i in researched_designs) CHECK_TICK receiver.add_design_by_id(i) @@ -195,10 +195,10 @@ /datum/techweb/proc/printout_points() return techweb_point_display_generic(research_points) -/datum/techweb/proc/research_node_id(id, force, auto_update_points) - return research_node(SSresearch.techweb_node_by_id(id), force, auto_update_points) +/datum/techweb/proc/research_node_id(id, force, auto_update_points, get_that_dosh_id) + return research_node(SSresearch.techweb_node_by_id(id), force, auto_update_points, get_that_dosh_id) -/datum/techweb/proc/research_node(datum/techweb_node/node, force = FALSE, auto_adjust_cost = TRUE) +/datum/techweb/proc/research_node(datum/techweb_node/node, force = FALSE, auto_adjust_cost = TRUE, get_that_dosh = TRUE) if(!istype(node)) return FALSE update_node_status(node) @@ -214,7 +214,7 @@ for(var/id in node.design_ids) add_design_by_id(id) update_node_status(node) - if(!istype(src, /datum/techweb/admin)) + if(!istype(src, /datum/techweb/admin) && get_that_dosh) var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_SCI) if(D) D.adjust_money(SSeconomy.techweb_bounty) @@ -344,7 +344,7 @@ /datum/techweb/specialized/autounlocking/proc/autounlock() for(var/id in node_autounlock_ids) - research_node_id(id, TRUE, FALSE) + research_node_id(id, TRUE, FALSE, FALSE) for(var/id in SSresearch.techweb_designs) var/datum/design/D = SSresearch.techweb_design_by_id(id) if(D.build_type & design_autounlock_buildtypes)