Skip to content

Fixes oversight with retail store money handling #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FalloutFalcon wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes oversight with retail store money handling #784

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64f93e9
yea.
FalloutFalcon Mar 20, 2026
4bee932
yea
FalloutFalcon Mar 20, 2026
22036ed
yea
FalloutFalcon Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions modular_darkpack/modules/retail/code/_retail.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
.["user"]["is_card"] = 1
.["user"]["payment_item"] = REF(held_item)
break
if(iscash(held_item))
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)
Expand Down Expand Up @@ -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(product.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)
Expand Down
Loading