From 6c94fcb601cebb941ba83f8a22295e96dc5be0ff Mon Sep 17 00:00:00 2001 From: Roxy <75404941+TealSeer@users.noreply.github.com> Date: Wed, 30 Jul 2025 17:38:41 -0400 Subject: [PATCH] Fixes for #92205 --- modular_skyrat/modules/command_vendor/code/vending.dm | 1 + modular_skyrat/modules/deforest_medical_items/code/vendor.dm | 1 + modular_skyrat/modules/imported_vendors/code/vendors.dm | 1 + modular_skyrat/modules/mapping/code/misc.dm | 1 + .../modular_items/lewd_items/code/lewd_machinery/lustwish.dm | 1 + modular_skyrat/modules/modular_vending/code/boozeomat.dm | 1 + modular_skyrat/modules/salon/code/barbervend.dm | 1 + modular_zubbers/code/modules/debug_tools/debug_machinery.dm | 1 + modular_zubbers/code/modules/lewd_machinery/lustwish.dm | 1 + 9 files changed, 9 insertions(+) diff --git a/modular_skyrat/modules/command_vendor/code/vending.dm b/modular_skyrat/modules/command_vendor/code/vending.dm index 3b67f5a42a7..e37efecf1bd 100644 --- a/modular_skyrat/modules/command_vendor/code/vending.dm +++ b/modular_skyrat/modules/command_vendor/code/vending.dm @@ -8,6 +8,7 @@ vend_reply = "Thank you for using the CommDrobe!" auto_build_products = TRUE payment_department = ACCOUNT_CMD + allow_custom = TRUE refill_canister = /obj/item/vending_refill/wardrobe/comm_wardrobe payment_department = ACCOUNT_CMD diff --git a/modular_skyrat/modules/deforest_medical_items/code/vendor.dm b/modular_skyrat/modules/deforest_medical_items/code/vendor.dm index 94a0f1ccbd9..1e18120d876 100644 --- a/modular_skyrat/modules/deforest_medical_items/code/vendor.dm +++ b/modular_skyrat/modules/deforest_medical_items/code/vendor.dm @@ -66,6 +66,7 @@ extra_price = PAYCHECK_COMMAND * 4 payment_department = NO_FREEBIES onstation_override = 1 // No freebies if this spawns on the interlink + allow_custom = TRUE /obj/item/vending_refill/medical_deforest machine_name = "DeForest Med-Vend" diff --git a/modular_skyrat/modules/imported_vendors/code/vendors.dm b/modular_skyrat/modules/imported_vendors/code/vendors.dm index e3b2fc1195f..a31d664feaf 100644 --- a/modular_skyrat/modules/imported_vendors/code/vendors.dm +++ b/modular_skyrat/modules/imported_vendors/code/vendors.dm @@ -62,6 +62,7 @@ default_price = PAYCHECK_CREW * 0.5 extra_price = PAYCHECK_COMMAND payment_department = NO_FREEBIES + allow_custom = TRUE /obj/item/vending_refill/snack/imported machine_name = "NT Sustenance Supplier" diff --git a/modular_skyrat/modules/mapping/code/misc.dm b/modular_skyrat/modules/mapping/code/misc.dm index 1b411e87676..aace10793fb 100644 --- a/modular_skyrat/modules/mapping/code/misc.dm +++ b/modular_skyrat/modules/mapping/code/misc.dm @@ -9,6 +9,7 @@ /obj/machinery/vending/security/noaccess req_access = null + allow_custom = FALSE /obj/structure/closet/secure_closet/medical2/unlocked/Initialize(mapload) . = ..() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm index 130d8b134d9..a639fbfaa8c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm @@ -187,6 +187,7 @@ payment_department = ACCOUNT_SRV default_price = PAYCHECK_CREW * 0.6 extra_price = PAYCHECK_COMMAND * 2.5 + allow_custom = TRUE //Changes the settings on the vendor, if the user uses the discount card. /obj/machinery/vending/dorms/attackby(obj/item/used_item, mob/living/user, params) diff --git a/modular_skyrat/modules/modular_vending/code/boozeomat.dm b/modular_skyrat/modules/modular_vending/code/boozeomat.dm index 7ca78cbab3f..cb0a7d20488 100644 --- a/modular_skyrat/modules/modular_vending/code/boozeomat.dm +++ b/modular_skyrat/modules/modular_vending/code/boozeomat.dm @@ -18,3 +18,4 @@ ) extended_inventory = TRUE age_restrictions = FALSE + allow_custom = FALSE diff --git a/modular_skyrat/modules/salon/code/barbervend.dm b/modular_skyrat/modules/salon/code/barbervend.dm index 71844850e3b..602bed50e8e 100644 --- a/modular_skyrat/modules/salon/code/barbervend.dm +++ b/modular_skyrat/modules/salon/code/barbervend.dm @@ -29,6 +29,7 @@ default_price = PAYCHECK_CREW extra_price = PAYCHECK_COMMAND payment_department = ACCOUNT_SRV + allow_custom = TRUE /obj/item/vending_refill/barbervend machine_name = "barber vend resupply" diff --git a/modular_zubbers/code/modules/debug_tools/debug_machinery.dm b/modular_zubbers/code/modules/debug_tools/debug_machinery.dm index 1f750c2ed95..89f580c2c5e 100644 --- a/modular_zubbers/code/modules/debug_tools/debug_machinery.dm +++ b/modular_zubbers/code/modules/debug_tools/debug_machinery.dm @@ -18,6 +18,7 @@ extra_price = PAYCHECK_ZERO default_price = PAYCHECK_ZERO resistance_flags = INDESTRUCTIBLE + allow_custom = FALSE /obj/machinery/vending/tool/super/screwdriver_act(mob/living/user, obj/item/attack_item) return FALSE diff --git a/modular_zubbers/code/modules/lewd_machinery/lustwish.dm b/modular_zubbers/code/modules/lewd_machinery/lustwish.dm index 156f6e310a2..ac9eb0efb23 100644 --- a/modular_zubbers/code/modules/lewd_machinery/lustwish.dm +++ b/modular_zubbers/code/modules/lewd_machinery/lustwish.dm @@ -1,3 +1,4 @@ // We remove the signaler from prison because some chucklefucks keep using it to hack doors. /obj/machinery/vending/dorms/prison excluded_products = list(/obj/item/assembly/signaler) + allow_custom = FALSE