From 64f93e91e584d9b5854dcf6ba391fe045b75ad18 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 20 Mar 2026 13:34:13 -0500 Subject: [PATCH 1/3] yea. --- .../modules/retail/code/_retail.dm | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/modular_darkpack/modules/retail/code/_retail.dm b/modular_darkpack/modules/retail/code/_retail.dm index 4747e3b51b38..765f28785904 100644 --- a/modular_darkpack/modules/retail/code/_retail.dm +++ b/modular_darkpack/modules/retail/code/_retail.dm @@ -113,7 +113,7 @@ .["user"]["is_card"] = 1 .["user"]["payment_item"] = REF(held_item) break - if(iscash(held_item)) + if(istype(held_item, /obj/item/stack/dollar)) var/obj/item/money = held_item .["user"]["money"] = money.get_item_credit_value() .["user"]["payment_item"] = REF(held_item) @@ -149,23 +149,27 @@ to_chat(usr, span_alert("Error: Product is out of stock!")) return - //get the money - if(is_creditcard(held_item)) - var/obj/item/card/credit/creditcard = held_item - var/datum/bank_account/used_account = creditcard.registered_account - if(!used_account) - to_chat(user, span_alert("The [creditcard] has no linked account.")) - return - if(!used_account.check_pin(user, product.price, creditcard)) - return - if(!used_account.adjust_money(-1 * product.price)) - to_chat(user, span_alert("The transaction is declined - Insufficient funds.")) - return - //used_account.process_credit_fraud(user, product.price) - - else if(istype(held_item, /obj/item/stack/dollar) && !held_item.use(product.price)) - to_chat(user, span_alert("You don't have enough money in your hand.")) - return + if(oroduct.price > 0) + //get the money + if(is_creditcard(held_item)) + var/obj/item/card/credit/creditcard = held_item + var/datum/bank_account/used_account = creditcard.registered_account + if(!used_account) + to_chat(user, span_alert("The [creditcard] has no linked account.")) + return + if(!used_account.check_pin(user, product.price, creditcard)) + return + if(!used_account.adjust_money(-1 * product.price)) + to_chat(user, span_alert("The transaction is declined - Insufficient funds.")) + return + //used_account.process_credit_fraud(user, product.price) + else if(istype(held_item, /obj/item/stack/dollar)) + if(!held_item.use(product.price)) + to_chat(user, span_alert("You don't have enough money in your hand.")) + return + else + return // We have nothing we can pay with. + playsound(get_turf(src), 'sound/effects/cashregister.ogg', 50, TRUE) new product.product_path(loc) if(product.amount > 0) From 4bee9325b66351f88ab8d36642770d30d34a73b1 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 20 Mar 2026 13:35:38 -0500 Subject: [PATCH 2/3] yea --- modular_darkpack/modules/retail/code/_retail.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_darkpack/modules/retail/code/_retail.dm b/modular_darkpack/modules/retail/code/_retail.dm index 765f28785904..a436f36da84e 100644 --- a/modular_darkpack/modules/retail/code/_retail.dm +++ b/modular_darkpack/modules/retail/code/_retail.dm @@ -113,7 +113,7 @@ .["user"]["is_card"] = 1 .["user"]["payment_item"] = REF(held_item) break - if(istype(held_item, /obj/item/stack/dollar)) + else if(istype(held_item, /obj/item/stack/dollar)) var/obj/item/money = held_item .["user"]["money"] = money.get_item_credit_value() .["user"]["payment_item"] = REF(held_item) From 22036edfe108040b6ed72562affa1258cc2a41b4 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 20 Mar 2026 13:37:45 -0500 Subject: [PATCH 3/3] yea --- modular_darkpack/modules/retail/code/_retail.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_darkpack/modules/retail/code/_retail.dm b/modular_darkpack/modules/retail/code/_retail.dm index a436f36da84e..183a80996592 100644 --- a/modular_darkpack/modules/retail/code/_retail.dm +++ b/modular_darkpack/modules/retail/code/_retail.dm @@ -149,7 +149,7 @@ to_chat(usr, span_alert("Error: Product is out of stock!")) return - if(oroduct.price > 0) + if(product.price > 0) //get the money if(is_creditcard(held_item)) var/obj/item/card/credit/creditcard = held_item