From 80174ca2dc9a33e2d9a011e8babe438ee340c8a1 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 31 Dec 2023 21:41:10 +0100 Subject: [PATCH] [MIRROR] Fixes perma sustenance vendor not selling to people [MDB IGNORE] (#25930) * Fixes perma sustenance vendor not selling to people (#80666) ## About The Pull Request Fixes #80568 Makes the whole asking for labour points only apply to the labour camp sustenance vendor instead of all sustenance vendors Changes the text you get for trying to buy from the sustenance vendor without prisoner ID to clarify it only sells to prisoners ## Why It's Good For The Game Billions of prisoners must eat moldy tofu ## Changelog :cl: fix: The sustenance vendor in perma actually serves food now /:cl: * Fixes perma sustenance vendor not selling to people --------- Co-authored-by: uaioy <114047053+uaioy@users.noreply.github.com> --- code/modules/vending/sustenance.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm index 1a2589fcdf1..d8229121490 100644 --- a/code/modules/vending/sustenance.dm +++ b/code/modules/vending/sustenance.dm @@ -44,11 +44,11 @@ if(isliving(user)) var/mob/living/living_user = user if(!(machine_stat & NOPOWER) && !istype(living_user.get_idcard(TRUE), /obj/item/card/id/advanced/prisoner)) - speak("No valid labor points account found. Vending is not permitted.") + speak("No valid prisoner account found. Vending is not permitted.") return return ..() -/obj/machinery/vending/sustenance/proceed_payment(obj/item/card/id/paying_id_card, datum/data/vending_product/product_to_vend, price_to_use) +/obj/machinery/vending/sustenance/labor_camp/proceed_payment(obj/item/card/id/paying_id_card, datum/data/vending_product/product_to_vend, price_to_use) if(!istype(paying_id_card, /obj/item/card/id/advanced/prisoner)) speak("I don't take bribes! Pay with labor points!") return FALSE @@ -66,7 +66,7 @@ paying_scum_id.points -= price_to_use return TRUE -/obj/machinery/vending/sustenance/fetch_balance_to_use(obj/item/card/id/passed_id) +/obj/machinery/vending/sustenance/labor_camp/fetch_balance_to_use(obj/item/card/id/passed_id) if(!istype(passed_id, /obj/item/card/id/advanced/prisoner)) return null //no points balance - no balance at all var/obj/item/card/id/advanced/prisoner/paying_scum_id = passed_id