From 7e6eb5c1bd0cc2713f723b6066563a023ac5bda8 Mon Sep 17 00:00:00 2001 From: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Date: Mon, 28 Mar 2022 23:44:50 -0400 Subject: [PATCH] Vending Machines no longer charge for their products (#922) Co-authored-by: Mark Suckerberg --- code/modules/mining/machine_vending.dm | 5 +++++ code/modules/vending/_vending.dm | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index c272d3be4697..c72737d22997 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -16,6 +16,7 @@ mining_point_vendor = TRUE default_price = 100 extra_price = 200 + all_items_free = FALSE // Mining products are handled differently, because I am too lazy to convert this list stolen from the old vendor. products = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. /obj/item/stack/marker_beacon/thirty = 6, @@ -86,6 +87,10 @@ return return ..() +/obj/machinery/vending/mining_equipment/freebie(mob/fatty, freebies) + message_admins("proc freebie was called on [src] which should never happen. I am causing a runtime to print the stack trace. inform a maintainer") + CRASH("freebie called on [src]") + /obj/machinery/vending/mining_equipment/proc/RedeemVoucher(obj/item/mining_voucher/voucher, mob/redeemer) var/selection = show_radial_menu(redeemer, src, voucher_items, require_near = TRUE, tooltips = TRUE) if(!selection || !Adjacent(redeemer) || QDELETED(voucher) || voucher.loc != redeemer) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index b0e5ed266d21..db3a94c3992e 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -146,7 +146,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C var/age_restrictions = TRUE ///A variable to change on a per instance basis on the map that allows the instance to remove cost and ID requirements - var/all_items_free = FALSE //change this on the object on the map. DO NOT APPLY THIS GLOBALLY. + var/all_items_free = TRUE ///ID's that can load this vending machine wtih refills var/list/canload_access_list @@ -168,7 +168,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /// used for narcing on underages var/obj/item/radio/Radio - /** * Initialize the vending machine * @@ -953,6 +952,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C max_integrity = 400 payment_department = NO_FREEBIES refill_canister = /obj/item/vending_refill/custom + all_items_free = FALSE /// where the money is sent var/datum/bank_account/private_a /// max number of items that the custom vendor can hold