diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 992546b5..67658748 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -37,7 +37,8 @@ /obj/item/screwdriver, /obj/item/valentine, /obj/item/stamp, - /obj/item/condom)) + /obj/item/condom, + /obj/item/stack/credits)) /obj/item/storage/wallet/Exited(atom/movable/AM) . = ..() diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 07f7d25b..f880a7c5 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -341,6 +341,7 @@ item_state = "upindwelder" max_fuel = 80 materials = list(MAT_METAL=70, MAT_GLASS=120) + price = 10 /obj/item/weldingtool/experimental name = "experimental welding tool" diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm index 30d3d1ed..c0a2aa00 100644 --- a/code/modules/jobs/job_types/job.dm +++ b/code/modules/jobs/job_types/job.dm @@ -96,7 +96,7 @@ bank_account.account_job = src bank_account.account_id = rand(111111,999999) //give account ID! //bank_account.account_pin = rand(1000,9999) //give random pin! - bank_account.account_balance = 50 + bank_account.account_balance = 80 H.account_id = bank_account.account_id if(CONFIG_GET(flag/enforce_human_authority) && (title in GLOB.command_positions)) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index ec152330..a49efde2 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -487,6 +487,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C var/datum/data/vending_product/R = locate(href_list["vend"]) buying = R + if(!R || !istype(R) || !R.product_path) + vend_ready = 1 + return + //check if they can afford it, if not open the next menu if(R.price > credits) menu = 2 //second menu @@ -508,42 +512,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C credits -= R.price menu = 1 - if(!R || !istype(R) || !R.product_path) - vend_ready = 1 - return - if(R in hidden_records) if(!extended_inventory) vend_ready = 1 return - else if(R in coin_records) - if(!(coin || bill)) - to_chat(usr, "You need to insert money to get this item!") - vend_ready = 1 - return - if(coin && coin.string_attached) - if(prob(50)) - if(usr.CanReach(src)) - if(usr.put_in_hands(coin)) - to_chat(usr, "You successfully pull [coin] out before [src] could swallow it.") - coin = null - else - to_chat(usr, "You couldn't pull [coin] out because your hands are full!") - QDEL_NULL(coin) - else - to_chat(usr, "You successfully pull [coin] out of [src] to the floor.") - coin = null - else - to_chat(usr, "You weren't able to pull [coin] out fast enough, the machine ate it, string and all!") - QDEL_NULL(coin) - else - QDEL_NULL(coin) - QDEL_NULL(bill) - - else if (!(R in product_records)) - vend_ready = 1 - message_admins("Vending machine exploit attempted by [ADMIN_LOOKUPFLW(usr)]!") - return if (R.amount <= 0) to_chat(usr, "Sold out.")