diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index 9d6841b56fd..93b0678581a 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -15,10 +15,7 @@ ///Paygrade for Heads of Staff. #define PAYCHECK_COMMAND 100 -//How many credits a player is charged if they print something from a departmental lathe they shouldn't have access to. -#define LATHE_TAX 10 -//How much POWER a borg's cell is taxed if they print something from a departmental lathe. -#define SILICON_LATHE_TAX 2000 + #define STATION_TARGET_BUFFER 25 diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 0067b05fd14..8bf9c0051d0 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -10,7 +10,7 @@ /// The material storage used by this fabricator. var/datum/component/remote_materials/materials - /// Which departments forego the lathe tax when using this lathe. + /// Which departments are allowed to process this design var/allowed_department_flags = ALL /// What's flick()'d on print. @@ -249,33 +249,6 @@ power = min(active_power_usage, power) use_power(power) - // Charge the lathe tax at least once per ten items. - var/total_cost = LATHE_TAX * max(round(print_quantity / 10), 1) - if(!charges_tax) - total_cost = 0 - if(isliving(user)) - var/mob/living/living_user = user - var/obj/item/card/id/card = living_user.get_idcard(TRUE) - - if(!card && istype(user.pulling, /obj/item/card/id)) - card = user.pulling - - if(card && card.registered_account) - var/datum/bank_account/our_acc = card.registered_account - if(our_acc.account_job.departments_bitflags & allowed_department_flags) - total_cost = 0 // We are not charging crew for printing their own supplies and equipment. - - if(total_cost) - if(iscyborg(user)) - var/mob/living/silicon/robot/borg = user - if(!borg.cell) - return FALSE - borg.cell.use(SILICON_LATHE_TAX) - - else if(attempt_charge(src, user, total_cost) & COMPONENT_OBJ_CANCEL_CHARGE) - say("Insufficient funds to complete prototype. Please present a holochip or valid ID card.") - return FALSE - if(production_animation) flick(production_animation, src)