diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index 746267c15b..c3c18ed06f 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -12,6 +12,9 @@ #define MAX_GRANT_SCI 5000 #define MAX_GRANT_SECMEDSRV 3000 +//What should vending machines charge when you buy something in-department. +#define VENDING_DISCOUNT 1 // 0.2 (20%) + #define ACCOUNT_CIV "CIV" #define ACCOUNT_CIV_NAME "Civil Budget" #define ACCOUNT_ENG "ENG" diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index b79d1d3cbc..692fc94e5c 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -12,7 +12,8 @@ /obj/item/stack icon = 'icons/obj/stack_objects.dmi' gender = PLURAL - material_modifier = 0.05 //5%, so that a 50 sheet stack has the effect of 5k materials instead of 100k. + material_modifier = = 0.01 + // material_modifier = 0.05 //5%, so that a 50 sheet stack has the effect of 5k materials instead of 100k. max_integrity = 100 var/list/datum/stack_recipe/recipes var/singular_name diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 3634af924c..5f39158413 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -686,6 +686,7 @@ GLOBAL_LIST_EMPTY(vending_products) . = list() .["onstation"] = onstation .["department"] = payment_department + .["jobDiscount"] = VENDING_DISCOUNT .["product_records"] = list() for (var/datum/data/vending_product/R in product_records) var/list/data = list( @@ -712,7 +713,7 @@ GLOBAL_LIST_EMPTY(vending_products) var/list/data = list( path = replacetext(replacetext("[R.product_path]", "/obj/item/", ""), "/", "-"), name = R.name, - price = R.custom_premium_price || extra_price, //may cause breakage. please note + price = R.custom_premium_price || extra_price, max_amount = R.max_amount, ref = REF(R), premium = TRUE @@ -721,21 +722,20 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/machinery/vending/ui_data(mob/user) . = list() - var/mob/living/carbon/human/H var/obj/item/card/id/C - if(ishuman(user)) - H = user - C = H.get_idcard(TRUE) - if(C?.registered_account) - .["user"] = list() - .["user"]["name"] = C.registered_account.account_holder - .["user"]["cash"] = C.registered_account.account_balance - if(C.registered_account.account_job) - .["user"]["job"] = C.registered_account.account_job.title - .["user"]["department"] = C.registered_account.account_job.paycheck_department - else - .["user"]["job"] = "No Job" - .["user"]["department"] = "No Department" + if(isliving(user)) + var/mob/living/L = user + C = L.get_idcard(TRUE) + if(C?.registered_account) + .["user"] = list() + .["user"]["name"] = C.registered_account.account_holder + .["user"]["cash"] = C.registered_account.account_balance + if(C.registered_account.account_job) + .["user"]["job"] = C.registered_account.account_job.title + .["user"]["department"] = C.registered_account.account_job.paycheck_department + else + .["user"]["job"] = "No Job" + .["user"]["department"] = "No Department" .["stock"] = list() for (var/datum/data/vending_product/R in product_records + coin_records + hidden_records) .["stock"][R.name] = R.amount