From 14b3228582510baf583f34ade80b7cfc5c4cf34c Mon Sep 17 00:00:00 2001 From: naut <55491249+nauticall@users.noreply.github.com> Date: Tue, 29 Jul 2025 02:11:58 +0800 Subject: [PATCH] Adjusts credit value to be more consistent (#20913) - Reworked prices, wages and balances of (almost) everything ingame. - Added coinage and decimal support to cash, ruthlessly sanitized to avoid floating-point errors. Reflected in cash-related things like ATMs. - Tweaked how cash bundles are made and distributed to support decimalization. - Adjusted the starting money individuals and departments receive in their accounts. - Adjusted the funding Tajara, Unathi, Diona, Vaurca, and IPCs receive in their accounts. Should earn more on average than they used to. Credit values are now roughly 1/10th what they were before, across the board. Coins were added too! These have names: - Unie: 0.01 credits - Quin: 0.05 credits - Dece: 0.10 credits - Quarter: 0.25 credits These can be seen cameo'd in the screenshots below. Values, wages, etc, are based on the wiki page https://wiki.aurorastation.org/index.php?title=Guide_to_Wages_and_Pay . Values are not anchored to any singular real-world currency. Example price differences: | Example Item | Old Price | New Price | | --- | --- | --- | | Comet Cola | 15.00 | 1.50 | | Cup Ramen | 20.00 | 2.00 | | Jyalara | 38.00 | 3.00 | | Trans-Stellar Cigarettes | 76.00 | 9.00 | | Zo'ra Soda | 29.00 | 2.50 | | Gumball | 5.00 | 0.25 | | 50x plasteel sheets | 700.00 | 120.00 | | 5x meat (cargo) | 160.00 | 55.00 | | 50x phoron crystals (cargo) | 2200.00 | 400.00 | Wages and account balances have also been tweaked: | Type | Old Amount | New Amount | | --- | --- | --- | | Ship Account | 75,000.00 | 35,000.00 | | Departmental Accounts | 10,000.00 | 15,000.00 | | Personal Account (avg) | 200.00 - 20,000.00 | 20.00 - 2,000.00 | Might break the economy; prices will likely need some adjusting depending on gameplay constraints. Can be adjusted in TMs. A little testing never hurt anyone. ![image](https://github.com/user-attachments/assets/006e78bf-bfe6-4003-a88d-7b26d6cf2e80) ![image](https://github.com/user-attachments/assets/ac365c3d-bd55-4de5-bd9f-95c7c629462a) --------- Signed-off-by: naut <55491249+nauticall@users.noreply.github.com> Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> --- code/__DEFINES/global.dm | 14 +- code/controllers/subsystems/economy.dm | 4 +- code/game/jobs/job/job.dm | 2 +- code/game/machinery/computer/slotmachine.dm | 8 +- code/game/machinery/gumball.dm | 4 +- code/game/machinery/vending_types.dm | 572 +++---- code/game/objects/items/contraband.dm | 2 +- code/modules/cargo/bounties/assistant.dm | 70 +- code/modules/cargo/bounties/bot.dm | 12 +- code/modules/cargo/bounties/chef.dm | 118 +- code/modules/cargo/bounties/engineer.dm | 66 +- code/modules/cargo/bounties/hydroponics.dm | 36 +- code/modules/cargo/bounties/reagent.dm | 18 +- code/modules/cargo/bounties/science.dm | 40 +- code/modules/cargo/bounties/security.dm | 36 +- code/modules/cargo/bounties/slime.dm | 6 +- code/modules/cargo/bounties/special.dm | 8 +- code/modules/cargo/cargo_suppliers.dm | 2 +- code/modules/cargo/delivery/package.dm | 4 +- code/modules/cargo/items/atmos.dm | 42 +- code/modules/cargo/items/cartridges.dm | 106 +- code/modules/cargo/items/custodial.dm | 22 +- code/modules/cargo/items/engineering.dm | 130 +- code/modules/cargo/items/hospitality.dm | 337 ++-- code/modules/cargo/items/hydroponics.dm | 60 +- code/modules/cargo/items/medical.dm | 98 +- code/modules/cargo/items/mining.dm | 18 +- code/modules/cargo/items/miscellaneous.dm | 6 +- code/modules/cargo/items/operations.dm | 514 +++--- code/modules/cargo/items/recreation.dm | 26 +- code/modules/cargo/items/robotics.dm | 2 +- code/modules/cargo/items/science.dm | 268 ++-- code/modules/cargo/items/security.dm | 20 +- code/modules/cargo/items/supply.dm | 36 +- code/modules/cargo/items/weaponry.dm | 106 +- code/modules/economy/cash.dm | 198 ++- code/modules/item_worth/worths_list.dm | 1428 ++++++++--------- code/modules/law/laws/low_severity.dm | 68 +- .../human/species/station/diona/diona.dm | 2 +- .../carbon/human/species/station/ipc/ipc.dm | 2 +- .../human/species/station/tajara/tajara.dm | 2 +- .../human/species/station/unathi/unathi.dm | 2 +- .../human/species/station/vaurca/vaurca.dm | 2 +- .../modular_computers/laptop_vendor.dm | 30 +- html/changelogs/nauticall-price-rebalance.yml | 62 + icons/obj/cash.dmi | Bin 2789 -> 1689 bytes tgui/packages/tgui/interfaces/ATM.tsx | 4 +- .../tgui/interfaces/AccountDatabase.tsx | 6 +- .../packages/tgui/interfaces/CargoControl.tsx | 24 +- .../tgui/interfaces/CargoDelivery.tsx | 10 +- tgui/packages/tgui/interfaces/CargoOrder.tsx | 10 +- .../tgui/interfaces/OrderTerminal.tsx | 2 +- tgui/packages/tgui/interfaces/QuikPay.tsx | 2 +- tgui/packages/tgui/interfaces/Records.tsx | 2 +- tgui/packages/tgui/interfaces/Vending.tsx | 6 +- 55 files changed, 2402 insertions(+), 2273 deletions(-) create mode 100644 html/changelogs/nauticall-price-rebalance.yml diff --git a/code/__DEFINES/global.dm b/code/__DEFINES/global.dm index cfbcb78adc0..5b97201e264 100644 --- a/code/__DEFINES/global.dm +++ b/code/__DEFINES/global.dm @@ -155,13 +155,13 @@ GLOBAL_DATUM_INIT(global_announcer, /obj/item/device/radio/all_channels, new) // the number next to it denotes how much money the department receives when its account is generated GLOBAL_LIST_INIT(department_funds, list( - "Command" = 10000, - "Medical" = 10000, - "Engineering" = 10000, - "Science" = 10000, - "Security" = 10000, - "Operations" = 5000, - "Service" = 10000, + "Command" = 15000, + "Medical" = 15000, + "Engineering" = 15000, + "Science" = 15000, + "Security" = 15000, + "Operations" = 10000, + "Service" = 15000, "Vendor" = 0 )) diff --git a/code/controllers/subsystems/economy.dm b/code/controllers/subsystems/economy.dm index 843ae73a9a0..b97e8b229b8 100644 --- a/code/controllers/subsystems/economy.dm +++ b/code/controllers/subsystems/economy.dm @@ -48,13 +48,13 @@ SUBSYSTEM_DEF(economy) if(next_account_number > 999999) //If we're hitting 7 digits, reset to the minimum and increase from there. next_account_number = 111111 + rand(1,500) station_account.remote_access_pin = rand(1111, 111111) - station_account.money = 75000 + station_account.money = 35000 //create an entry in the account transaction log for when it was created var/datum/transaction/T = new() T.target_name = station_account.owner_name T.purpose = "Account creation" - T.amount = 75000 + T.amount = 10000 T.date = "13th May, 2461" T.time = "11:24" T.source_terminal = "Idris Remote Terminal #[rand(111,11111)]" diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 329ce0540f9..29be5996a42 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -141,7 +141,7 @@ var/datum/species/human_species = GLOB.all_species[SPECIES_HUMAN] species_modifier = human_species.economic_modifier - var/money_amount = initial_funds_override ? initial_funds_override : (rand(5,50) + rand(5, 50)) * econ_status * economic_modifier * species_modifier + var/money_amount = initial_funds_override ? initial_funds_override : (rand(5,10) + rand(5, 10)) * econ_status * economic_modifier * species_modifier + (rand(0,99) / 100) var/datum/money_account/account = SSeconomy.create_and_assign_account(H, null, money_amount, public_account) to_chat(H, SPAN_BOLD(SPAN_NOTICE("Your account number is: [account.account_number], your account pin is: [account.remote_access_pin]"))) diff --git a/code/game/machinery/computer/slotmachine.dm b/code/game/machinery/computer/slotmachine.dm index a36c4a66458..52c3660ac89 100644 --- a/code/game/machinery/computer/slotmachine.dm +++ b/code/game/machinery/computer/slotmachine.dm @@ -1,7 +1,7 @@ -#define SPIN_PRICE 5 -#define SMALL_PRIZE 400 -#define BIG_PRIZE 1000 -#define JACKPOT 10000 +#define SPIN_PRICE 1 +#define SMALL_PRIZE 40 +#define BIG_PRIZE 100 +#define JACKPOT 1000 #define SPIN_TIME 65 //As always, deciseconds. #define REEL_DEACTIVATE_DELAY 7 #define SEVEN "7" diff --git a/code/game/machinery/gumball.dm b/code/game/machinery/gumball.dm index 4f3c1b2da50..4a1ac4eafeb 100644 --- a/code/game/machinery/gumball.dm +++ b/code/game/machinery/gumball.dm @@ -10,7 +10,7 @@ var/initialicon = "gumball" var/amountleft = 20 var/vendingtype = /obj/item/clothing/mask/chewable/candy/gum - var/gumprice = 5 + var/gumprice = 0.25 var/on = 1 var/broken = 0 @@ -115,4 +115,4 @@ initialicon = "sucker" amountleft = 25 vendingtype = /obj/item/clothing/mask/chewable/candy/lolli - gumprice = 10 + gumprice = 0.50 diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 603d6bcdb1e..83a46780900 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -303,13 +303,13 @@ /obj/item/reagent_containers/food/drinks/carton/soymilk = 2 ) prices = list( - /obj/item/reagent_containers/food/drinks/coffee = 20, - /obj/item/reagent_containers/food/drinks/tea = 20, - /obj/item/reagent_containers/food/drinks/greentea = 20, - /obj/item/reagent_containers/food/drinks/chaitea = 25, - /obj/item/reagent_containers/food/drinks/hotcider = 28, - /obj/item/reagent_containers/food/drinks/h_chocolate = 22, - /obj/item/reagent_containers/food/snacks/donut/normal = 6 + /obj/item/reagent_containers/food/drinks/coffee = 2, + /obj/item/reagent_containers/food/drinks/tea = 2, + /obj/item/reagent_containers/food/drinks/greentea = 2.25, + /obj/item/reagent_containers/food/drinks/chaitea = 2.50, + /obj/item/reagent_containers/food/drinks/hotcider = 2.50, + /obj/item/reagent_containers/food/drinks/h_chocolate = 2, + /obj/item/reagent_containers/food/snacks/donut/normal = 2.50, ) premium = list( /obj/item/reagent_containers/glass/beaker/teapot/ = 5 @@ -394,37 +394,39 @@ /obj/item/storage/box/fancy/food/pralinebox = 2 ) prices = list( - /obj/item/reagent_containers/food/snacks/candy = 15, - /obj/item/reagent_containers/food/drinks/dry_ramen = 20, - /obj/item/reagent_containers/food/snacks/chips = 17, - /obj/item/reagent_containers/food/snacks/sosjerky = 20, - /obj/item/reagent_containers/food/snacks/no_raisin = 12, - /obj/item/reagent_containers/food/snacks/spacetwinkie = 15, - /obj/item/reagent_containers/food/snacks/cheesiehonkers = 15, - /obj/item/reagent_containers/food/snacks/tastybread = 18, - /obj/item/storage/box/pineapple = 20, - /obj/item/reagent_containers/food/snacks/chocolatebar = 12, - /obj/item/reagent_containers/food/snacks/whitechocolate/wrapped = 12, - /obj/item/storage/box/fancy/gum = 15, - /obj/item/clothing/mask/chewable/candy/lolli = 2, - /obj/item/storage/box/fancy/admints = 12, - /obj/item/storage/box/fancy/cookiesnack = 20, - /obj/item/storage/box/fancy/vkrexitaffy = 12, - /obj/item/reagent_containers/food/snacks/skrellsnacks = 40, - /obj/item/reagent_containers/food/snacks/meatsnack = 22, - /obj/item/reagent_containers/food/snacks/maps = 23, - /obj/item/reagent_containers/food/snacks/nathisnack = 24, - /obj/item/reagent_containers/food/snacks/koisbar_clean = 60, - /obj/item/reagent_containers/food/snacks/candy/koko = 40, - /obj/item/reagent_containers/food/snacks/tuna = 23, - /obj/item/reagent_containers/food/snacks/adhomian_can = 26, - /obj/item/reagent_containers/food/snacks/ricetub = 40, - /obj/item/reagent_containers/food/snacks/riceball = 15, - /obj/item/reagent_containers/food/snacks/seaweed = 20, - /obj/item/reagent_containers/food/drinks/jyalra = 38, - /obj/item/reagent_containers/food/drinks/jyalra/cheese = 44, - /obj/item/reagent_containers/food/drinks/jyalra/apple = 44, - /obj/item/reagent_containers/food/drinks/jyalra/cherry = 44 + /obj/item/reagent_containers/food/snacks/candy = 1.50, + /obj/item/reagent_containers/food/drinks/dry_ramen = 2.00, + /obj/item/reagent_containers/food/snacks/chips = 2.50, + /obj/item/reagent_containers/food/snacks/sosjerky = 3.50, + /obj/item/reagent_containers/food/snacks/no_raisin = 2.00, + /obj/item/reagent_containers/food/snacks/spacetwinkie = 2.00, + /obj/item/reagent_containers/food/snacks/cheesiehonkers = 2.50, + /obj/item/reagent_containers/food/snacks/tastybread = 3.50, + /obj/item/storage/box/pineapple = 5.00, + /obj/item/reagent_containers/food/snacks/chocolatebar = 2.00, + /obj/item/reagent_containers/food/snacks/whitechocolate/wrapped = 3.00, + /obj/item/storage/box/fancy/cookiesnack = 4.00, + /obj/item/storage/box/fancy/gum = 2.50, + /obj/item/storage/box/fancy/vkrexitaffy = 3.50, + /obj/item/clothing/mask/chewable/candy/lolli = 1.00, + /obj/item/storage/box/fancy/admints = 2.00, + /obj/item/reagent_containers/food/snacks/skrellsnacks = 1.50, + /obj/item/reagent_containers/food/snacks/meatsnack = 3.00, + /obj/item/reagent_containers/food/snacks/maps = 3.25, + /obj/item/reagent_containers/food/snacks/nathisnack = 2.00, + /obj/item/reagent_containers/food/snacks/koisbar_clean = 4.25, + /obj/item/reagent_containers/food/snacks/candy/koko = 3.00, + /obj/item/reagent_containers/food/snacks/tuna = 2.50, + /obj/item/reagent_containers/food/snacks/adhomian_can = 2.00, + /obj/item/reagent_containers/food/snacks/ricetub = 4.50, + /obj/item/reagent_containers/food/snacks/riceball = 3.00, + /obj/item/reagent_containers/food/snacks/seaweed = 2.50, + /obj/item/reagent_containers/food/drinks/jyalra = 1.50, + /obj/item/reagent_containers/food/drinks/jyalra/cheese = 1.75, + /obj/item/reagent_containers/food/drinks/jyalra/apple = 1.75, + /obj/item/reagent_containers/food/drinks/jyalra/cherry = 1.75, + /obj/item/reagent_containers/food/snacks/syndicake = 3.50, + /obj/item/reagent_containers/food/snacks/koisbar = 12.00, ) light_color = COLOR_BABY_BLUE manufacturer = "nanotrasen" @@ -509,26 +511,26 @@ /obj/item/reagent_containers/food/drinks/bottle/space_up = 2 ) prices = list( - /obj/item/reagent_containers/food/drinks/cans/cola = 15, - /obj/item/reagent_containers/food/drinks/cans/diet_cola = 15, - /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 11, - /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 16, - /obj/item/reagent_containers/food/drinks/cans/root_beer = 13, - /obj/item/reagent_containers/food/drinks/cans/starkist = 15, - /obj/item/reagent_containers/food/drinks/waterbottle = 12, - /obj/item/reagent_containers/food/drinks/cans/dyn = 18, - /obj/item/reagent_containers/food/drinks/cans/space_up = 15, - /obj/item/reagent_containers/food/drinks/cans/iced_tea = 13, - /obj/item/reagent_containers/food/drinks/cans/grape_juice = 16, - /obj/item/reagent_containers/food/drinks/cans/peach_soda = 16, - /obj/item/reagent_containers/food/drinks/cans/koispunch = 50, - /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5, - /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 35, - /obj/item/reagent_containers/food/drinks/carton/small/milk = 18, - /obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 18, - /obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 18, - /obj/item/reagent_containers/food/drinks/cans/melon_soda = 16, - /obj/item/reagent_containers/food/drinks/zobo = 16 + /obj/item/reagent_containers/food/drinks/cans/cola = 1.50, + /obj/item/reagent_containers/food/drinks/cans/diet_cola = 1.50, + /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 1.50, + /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 1.50, + /obj/item/reagent_containers/food/drinks/cans/root_beer = 1.50, + /obj/item/reagent_containers/food/drinks/cans/starkist = 1.50, + /obj/item/reagent_containers/food/drinks/waterbottle = 1.25, + /obj/item/reagent_containers/food/drinks/cans/dyn = 1.80, + /obj/item/reagent_containers/food/drinks/cans/space_up = 1.50, + /obj/item/reagent_containers/food/drinks/cans/iced_tea = 1.40, + /obj/item/reagent_containers/food/drinks/cans/grape_juice = 1.75, + /obj/item/reagent_containers/food/drinks/cans/peach_soda = 1.75, + /obj/item/reagent_containers/food/drinks/cans/koispunch = 5.00, + /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2.25, + /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 3.00, + /obj/item/reagent_containers/food/drinks/carton/small/milk = 1.80, + /obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 1.80, + /obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 1.80, + /obj/item/reagent_containers/food/drinks/cans/melon_soda = 1.75, + /obj/item/reagent_containers/food/drinks/zobo = 1.75, ) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = 'sound/machines/vending/vending_cans.ogg' @@ -626,43 +628,43 @@ /obj/item/storage/box/fancy/cigarettes/cigar = 5 ) prices = list( - /obj/item/storage/box/fancy/cigarettes/rugged = 67, - /obj/item/storage/box/fancy/cigarettes = 76, - /obj/item/storage/box/fancy/cigarettes/dromedaryco = 82, - /obj/item/storage/box/fancy/cigarettes/nicotine = 89, - /obj/item/storage/box/fancy/cigarettes/pra = 79, - /obj/item/storage/box/fancy/cigarettes/dpra = 84, - /obj/item/storage/box/fancy/cigarettes/nka = 74, - /obj/item/storage/box/fancy/cigarettes/federation = 93, - /obj/item/storage/box/fancy/cigarettes/dyn = 84, - /obj/item/storage/box/fancy/cigarettes/oracle = 84, - /obj/item/storage/chewables/rollable = 63, - /obj/item/storage/chewables/rollable/unathi = 65, - /obj/item/storage/chewables/rollable/fine = 69, - /obj/item/storage/chewables/rollable/nico = 86, - /obj/item/storage/chewables/rollable/oracle = 66, - /obj/item/storage/chewables/rollable/vedamor = 72, - /obj/item/storage/chewables/tobacco/bad = 55, - /obj/item/storage/chewables/tobacco = 74, - /obj/item/storage/chewables/tobacco/fine = 86, - /obj/item/storage/chewables/tobacco/federation = 88, - /obj/item/storage/chewables/tobacco/dyn = 85, - /obj/item/storage/box/fancy/chewables/tobacco/nico = 91, - /obj/item/storage/chewables/oracle = 76, - /obj/item/storage/chewables/tobacco/koko = 86, - /obj/item/storage/box/fancy/matches = 12, - /obj/item/flame/lighter/random = 12, - /obj/item/storage/cigfilters = 28, - /obj/item/storage/box/fancy/cigpaper = 35, - /obj/item/storage/box/fancy/cigpaper/fine = 42, - /obj/item/spacecash/ewallet/lotto = 200, - /obj/item/clothing/mask/smokable/ecig/simple = 200, - /obj/item/clothing/mask/smokable/ecig/util = 300, - /obj/item/reagent_containers/ecig_cartridge/med_nicotine = 34, - /obj/item/reagent_containers/ecig_cartridge/high_nicotine = 38, - /obj/item/reagent_containers/ecig_cartridge/orange = 32, - /obj/item/reagent_containers/ecig_cartridge/watermelon = 30, - /obj/item/reagent_containers/ecig_cartridge/grape = 33 + /obj/item/storage/box/fancy/cigarettes/rugged = 8.00, + /obj/item/storage/box/fancy/cigarettes = 9.00, + /obj/item/storage/box/fancy/cigarettes/dromedaryco = 9.75, + /obj/item/storage/box/fancy/cigarettes/nicotine = 10.50, + /obj/item/storage/box/fancy/cigarettes/pra = 9.75, + /obj/item/storage/box/fancy/cigarettes/dpra = 10.25, + /obj/item/storage/box/fancy/cigarettes/nka = 9.25, + /obj/item/storage/box/fancy/cigarettes/federation = 11.50, + /obj/item/storage/box/fancy/cigarettes/dyn = 10.25, + /obj/item/storage/box/fancy/cigarettes/oracle = 10.25, + /obj/item/storage/chewables/rollable = 7.50, + /obj/item/storage/chewables/rollable/unathi = 7.75, + /obj/item/storage/chewables/rollable/fine = 8.00, + /obj/item/storage/chewables/rollable/nico = 10.00, + /obj/item/storage/chewables/rollable/oracle = 7.75, + /obj/item/storage/chewables/rollable/vedamor = 8.50, + /obj/item/storage/chewables/tobacco/bad = 6.50, + /obj/item/storage/chewables/tobacco = 9.00, + /obj/item/storage/chewables/tobacco/fine = 10.00, + /obj/item/storage/chewables/tobacco/federation = 10.25, + /obj/item/storage/chewables/tobacco/dyn = 9.75, + /obj/item/storage/box/fancy/chewables/tobacco/nico = 10.75, + /obj/item/storage/chewables/oracle = 11.50, + /obj/item/storage/chewables/tobacco/koko = 11.00, + /obj/item/storage/box/fancy/matches = 1.50, + /obj/item/flame/lighter/random = 1.50, + /obj/item/storage/cigfilters = 1.25, + /obj/item/storage/box/fancy/cigpaper = 2.50, + /obj/item/storage/box/fancy/cigpaper/fine = 3.50, + /obj/item/spacecash/ewallet/lotto = 5.00, + /obj/item/clothing/mask/smokable/ecig/simple = 25.00, + /obj/item/clothing/mask/smokable/ecig/util = 35.00, + /obj/item/reagent_containers/ecig_cartridge/med_nicotine = 4.50, + /obj/item/reagent_containers/ecig_cartridge/high_nicotine = 5.25, + /obj/item/reagent_containers/ecig_cartridge/orange = 4.25, + /obj/item/reagent_containers/ecig_cartridge/watermelon = 4.00, + /obj/item/reagent_containers/ecig_cartridge/grape = 4.40, ) light_color = COLOR_BLUE_GRAY @@ -901,14 +903,14 @@ /obj/item/storage/pill_bottle/rmt = 2 ) prices = list( - /obj/item/storage/pill_bottle/antidexafen = 140, - /obj/item/storage/pill_bottle/dexalin = 120, - /obj/item/storage/pill_bottle/dylovene = 150, - /obj/item/storage/pill_bottle/vitamin = 110, - /obj/item/storage/pill_bottle/cetahydramine = 120, - /obj/item/storage/pill_bottle/caffeine = 180, - /obj/item/storage/pill_bottle/nicotine = 170, - /obj/item/storage/pill_bottle/rmt = 550 + /obj/item/storage/pill_bottle/antidexafen = 7.00, + /obj/item/storage/pill_bottle/dexalin = 25.00, + /obj/item/storage/pill_bottle/dylovene = 12.00, + /obj/item/storage/pill_bottle/vitamin = 8.00, + /obj/item/storage/pill_bottle/cetahydramine = 10.00, + /obj/item/storage/pill_bottle/caffeine = 9.00, + /obj/item/storage/pill_bottle/nicotine = 15.00, + /obj/item/storage/pill_bottle/rmt = 55.00, ) contraband = list( /obj/item/reagent_containers/pill/tox = 3, @@ -1096,15 +1098,15 @@ /obj/item/reagent_containers/spray/plantbgone = 2 ) prices = list( - /obj/item/reagent_containers/glass/fertilizer/ez = 25, - /obj/item/reagent_containers/glass/fertilizer/l4z = 25, - /obj/item/reagent_containers/glass/fertilizer/rh = 50, - /obj/item/plantspray/pests = 15, - /obj/item/storage/bag/plants = 25, - /obj/item/material/minihoe = 25, - /obj/item/material/hatchet = 25, - /obj/item/wirecutters/clippers = 25, - /obj/item/reagent_containers/spray/plantbgone = 100 + /obj/item/reagent_containers/glass/fertilizer/ez = 10.00, + /obj/item/reagent_containers/glass/fertilizer/l4z = 10.00, + /obj/item/reagent_containers/glass/fertilizer/rh = 20.00, + /obj/item/plantspray/pests = 7.50, + /obj/item/storage/bag/plants = 10.00, + /obj/item/material/minihoe = 15.00, + /obj/item/material/hatchet = 15.00, + /obj/item/wirecutters/clippers = 15.00, + /obj/item/reagent_containers/spray/plantbgone = 35.00, ) premium = list( @@ -1221,73 +1223,73 @@ /obj/item/seeds/ambrosiadeusseed = 3 ) prices = list( - /obj/item/seeds/ambrosiavulgarisseed = 70, - /obj/item/seeds/appleseed = 50, - /obj/item/seeds/bananaseed = 60, - /obj/item/seeds/bellpepperseed = 40, - /obj/item/seeds/berryseed = 40, - /obj/item/seeds/blackraspberryseed = 40, - /obj/item/seeds/blizzard = 60, - /obj/item/seeds/blueberryseed = 30, - /obj/item/seeds/blueraspberryseed = 40, - /obj/item/seeds/cabbageseed = 40, - /obj/item/seeds/carrotseed = 20, - /obj/item/seeds/chantermycelium = 20, - /obj/item/seeds/cherryseed = 40, - /obj/item/seeds/chiliseed = 50, - /obj/item/seeds/cocoapodseed = 50, - /obj/item/seeds/coffeeseed = 70, - /obj/item/seeds/cornseed = 30, - /obj/item/seeds/dynseed = 80, - /obj/item/seeds/earthenroot = 70, - /obj/item/seeds/eggplantseed = 30, - /obj/item/seeds/eki = 90, - /obj/item/seeds/garlicseed = 30, - /obj/item/seeds/grapeseed = 40, - /obj/item/seeds/grassseed = 40, - /obj/item/seeds/greengrapeseed = 40, - /obj/item/seeds/guamiseed = 80, - /obj/item/seeds/harebell = 10, - /obj/item/seeds/lemonseed = 40, - /obj/item/seeds/limeseed = 50, - /obj/item/seeds/mtearseed = 60, - /obj/item/seeds/mintseed = 70, - /obj/item/seeds/dirtberries = 70, - /obj/item/seeds/onionseed = 30, - /obj/item/seeds/oracleseed = 50, - /obj/item/seeds/orangeseed = 40, - /obj/item/seeds/peanutseed = 30, - /obj/item/seeds/peaseed = 40, - /obj/item/seeds/peppercornseed = 30, - /obj/item/seeds/plastiseed = 40, - /obj/item/seeds/plumpmycelium = 20, - /obj/item/seeds/poppyseed = 10, - /obj/item/seeds/potatoseed = 30, - /obj/item/seeds/pumpkinseed = 40, - /obj/item/seeds/qlortseed = 70, - /obj/item/seeds/clam/rasval = 100, - /obj/item/seeds/raspberryseed = 40, - /obj/item/seeds/reishimycelium = 30, - /obj/item/seeds/replicapod = 200, - /obj/item/seeds/riceseed = 20, - /obj/item/seeds/richcoffeeseed = 140, - /obj/item/seeds/shandseed = 60, - /obj/item/seeds/soyaseed = 40, - /obj/item/seeds/strawberryseed = 40, - /obj/item/seeds/cranberryseed = 40, - /obj/item/seeds/sugarcaneseed = 20, - /obj/item/seeds/sunflowerseed = 20, - /obj/item/seeds/sugartree = 40, - /obj/item/seeds/teaseed = 30, - /obj/item/seeds/tobaccoseed = 40, - /obj/item/seeds/tomatoseed = 30, - /obj/item/seeds/towermycelium = 20, - /obj/item/seeds/vanilla = 30, - /obj/item/seeds/watermelonseed = 30, - /obj/item/seeds/wheatseed = 20, - /obj/item/seeds/whitebeetseed = 20, - /obj/item/seeds/wulumunushaseed = 90, - /obj/item/seeds/ylpha = 95 + /obj/item/seeds/ambrosiavulgarisseed = 12.00, + /obj/item/seeds/appleseed = 6.00, + /obj/item/seeds/bananaseed = 7.00, + /obj/item/seeds/bellpepperseed = 5.00, + /obj/item/seeds/berryseed = 5.00, + /obj/item/seeds/blackraspberryseed = 5.00, + /obj/item/seeds/blizzard = 9.00, + /obj/item/seeds/blueberryseed = 4.00, + /obj/item/seeds/blueraspberryseed = 5.00, + /obj/item/seeds/cabbageseed = 5.00, + /obj/item/seeds/carrotseed = 2.50, + /obj/item/seeds/chantermycelium = 12.50, + /obj/item/seeds/cherryseed = 5.00, + /obj/item/seeds/chiliseed = 6.00, + /obj/item/seeds/cocoapodseed = 6.00, + /obj/item/seeds/coffeeseed = 12.00, + /obj/item/seeds/cornseed = 4.00, + /obj/item/seeds/dynseed = 8.50, + /obj/item/seeds/earthenroot = 12.00, + /obj/item/seeds/eggplantseed = 4.00, + /obj/item/seeds/eki = 15.00, + /obj/item/seeds/garlicseed = 4.00, + /obj/item/seeds/grapeseed = 5.00, + /obj/item/seeds/grassseed = 2.00, + /obj/item/seeds/greengrapeseed = 5.00, + /obj/item/seeds/guamiseed = 13.50, + /obj/item/seeds/harebell = 1.50, + /obj/item/seeds/lemonseed = 5.00, + /obj/item/seeds/limeseed = 6.00, + /obj/item/seeds/mtearseed = 7.00, + /obj/item/seeds/mintseed = 6.00, + /obj/item/seeds/dirtberries = 12.00, + /obj/item/seeds/onionseed = 4.00, + /obj/item/seeds/oracleseed = 11.00, + /obj/item/seeds/orangeseed = 5.00, + /obj/item/seeds/peanutseed = 4.00, + /obj/item/seeds/peaseed = 5.00, + /obj/item/seeds/peppercornseed = 4.00, + /obj/item/seeds/plastiseed = 5.00, + /obj/item/seeds/plumpmycelium = 2.50, + /obj/item/seeds/poppyseed = 1.50, + /obj/item/seeds/potatoseed = 4.00, + /obj/item/seeds/pumpkinseed = 5.00, + /obj/item/seeds/qlortseed = 12.00, + /obj/item/seeds/clam/rasval = 18.00, + /obj/item/seeds/raspberryseed = 5.00, + /obj/item/seeds/reishimycelium = 15.00, + /obj/item/seeds/replicapod = 35.00, + /obj/item/seeds/riceseed = 2.50, + /obj/item/seeds/richcoffeeseed = 25.00, + /obj/item/seeds/shandseed = 7.00, + /obj/item/seeds/soyaseed = 5.00, + /obj/item/seeds/strawberryseed = 5.00, + /obj/item/seeds/cranberryseed = 5.00, + /obj/item/seeds/sugarcaneseed = 2.50, + /obj/item/seeds/sunflowerseed = 2.50, + /obj/item/seeds/sugartree = 5.00, + /obj/item/seeds/teaseed = 4.00, + /obj/item/seeds/tobaccoseed = 5.00, + /obj/item/seeds/tomatoseed = 4.00, + /obj/item/seeds/towermycelium = 7.50, + /obj/item/seeds/vanilla = 12.00, + /obj/item/seeds/watermelonseed = 4.00, + /obj/item/seeds/wheatseed = 2.50, + /obj/item/seeds/whitebeetseed = 2.50, + /obj/item/seeds/wulumunushaseed = 15.00, + /obj/item/seeds/ylpha = 16.00, ) restock_items = TRUE random_itemcount = 0 @@ -1715,19 +1717,19 @@ /obj/item/reagent_containers/food/drinks/cans/zorasoda/jelly = 3 ) prices = list( - /obj/item/reagent_containers/food/drinks/cans/zorasoda/cherry = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/phoron = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/klax = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/kois = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 29, - /obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz = 29, - /obj/item/reagent_containers/food/drinks/waterbottle/sedantis_water = 40 + /obj/item/reagent_containers/food/drinks/cans/zorasoda/cherry = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/phoron = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/klax = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/cthur = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/venomgrass = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/kois = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/drone = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/mixedberry = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/lemonlime = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/xuizi = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/dyn = 2.50, + /obj/item/reagent_containers/food/drinks/cans/zorasoda/buzz = 2.50, + /obj/item/reagent_containers/food/drinks/waterbottle/sedantis_water = 3.50, ) idle_power_usage = 211 temperature_setting = -1 @@ -1762,14 +1764,14 @@ /obj/item/battle_monsters/wrapped/rare = 10 ) prices = list( - /obj/item/book/manual/wiki/battlemonsters = 12, - /obj/item/battle_monsters/wrapped = 100, - /obj/item/battle_monsters/wrapped/pro = 75, - /obj/item/battle_monsters/wrapped/species = 50, - /obj/item/battle_monsters/wrapped/species/lizard = 50, - /obj/item/battle_monsters/wrapped/species/cat = 50, - /obj/item/battle_monsters/wrapped/species/ant = 50, - /obj/item/battle_monsters/wrapped/rare = 100 + /obj/item/book/manual/wiki/battlemonsters = 15.00, + /obj/item/battle_monsters/wrapped = 25.00, + /obj/item/battle_monsters/wrapped/pro = 20.00, + /obj/item/battle_monsters/wrapped/species = 15.00, + /obj/item/battle_monsters/wrapped/species/lizard = 15.00, + /obj/item/battle_monsters/wrapped/species/cat = 15.00, + /obj/item/battle_monsters/wrapped/species/ant = 15.00, + /obj/item/battle_monsters/wrapped/rare = 35.00, ) contraband = list( /obj/item/battle_monsters/wrapped/legendary = 5 @@ -1835,7 +1837,7 @@ /obj/item/clothing/suit/armor/riot/laser_tag/blue = 2 ) prices = list( - /obj/item/coin/casino = 500 + /obj/item/coin/casino = 100 ) restock_items = FALSE @@ -1862,17 +1864,17 @@ /obj/item/storage/box/fancy/mre/menu12 = 5 ) prices = list( - /obj/item/storage/box/fancy/mre = 50, - /obj/item/storage/box/fancy/mre/menu2 = 50, - /obj/item/storage/box/fancy/mre/menu3 = 50, - /obj/item/storage/box/fancy/mre/menu4 = 50, - /obj/item/storage/box/fancy/mre/menu5 = 50, - /obj/item/storage/box/fancy/mre/menu6 = 50, - /obj/item/storage/box/fancy/mre/menu7 = 50, - /obj/item/storage/box/fancy/mre/menu8 = 50, - /obj/item/storage/box/fancy/mre/menu9 = 50, - /obj/item/storage/box/fancy/mre/menu10 = 50, - /obj/item/storage/box/fancy/mre/menu12 = 50 + /obj/item/storage/box/fancy/mre = 12.00, + /obj/item/storage/box/fancy/mre/menu2 = 12.00, + /obj/item/storage/box/fancy/mre/menu3 = 12.00, + /obj/item/storage/box/fancy/mre/menu4 = 12.00, + /obj/item/storage/box/fancy/mre/menu5 = 12.00, + /obj/item/storage/box/fancy/mre/menu6 = 12.00, + /obj/item/storage/box/fancy/mre/menu7 = 12.00, + /obj/item/storage/box/fancy/mre/menu8 = 12.00, + /obj/item/storage/box/fancy/mre/menu9 = 12.00, + /obj/item/storage/box/fancy/mre/menu10 = 12.00, + /obj/item/storage/box/fancy/mre/menu12 = 12.00, ) contraband = list( /obj/item/storage/box/fancy/mre/menu11 = 5, // memes. @@ -1906,10 +1908,11 @@ /obj/item/storage/overloader/screenshaker = 5 ) prices = list( - /obj/item/storage/overloader/classic = 100, - /obj/item/storage/overloader/tranquil = 100, - /obj/item/storage/overloader/rainbow = 100, - /obj/item/storage/overloader/screenshaker = 100 + /obj/item/storage/overloader/classic = 50.00, + /obj/item/storage/overloader/tranquil = 60.00, + /obj/item/storage/overloader/rainbow = 60.00, + /obj/item/storage/overloader/screenshaker = 60.00, + /obj/item/storage/overloader/jitterbug = 85.00, ) contraband = list( /obj/item/storage/overloader/rainbow = 2 @@ -1962,25 +1965,25 @@ /obj/item/reagent_containers/food/drinks/bottle/space_up = 2 ) prices = list( - /obj/item/reagent_containers/food/drinks/cans/cola = 15, - /obj/item/reagent_containers/food/drinks/cans/diet_cola = 15, - /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 11, - /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 16, - /obj/item/reagent_containers/food/drinks/cans/root_beer = 13, - /obj/item/reagent_containers/food/drinks/cans/starkist = 15, - /obj/item/reagent_containers/food/drinks/waterbottle = 12, - /obj/item/reagent_containers/food/drinks/cans/dyn = 18, - /obj/item/reagent_containers/food/drinks/cans/space_up = 15, - /obj/item/reagent_containers/food/drinks/cans/iced_tea = 13, - /obj/item/reagent_containers/food/drinks/cans/grape_juice = 16, - /obj/item/reagent_containers/food/drinks/cans/peach_soda = 16, - /obj/item/reagent_containers/food/drinks/cans/koispunch = 50, - /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5, - /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 35, - /obj/item/reagent_containers/food/drinks/carton/small/milk = 18, - /obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 18, - /obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 18, - /obj/item/reagent_containers/food/drinks/cans/melon_soda = 16 + /obj/item/reagent_containers/food/drinks/cans/cola = 1.50, + /obj/item/reagent_containers/food/drinks/cans/diet_cola = 1.50, + /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind = 1.20, + /obj/item/reagent_containers/food/drinks/cans/dr_gibb = 1.75, + /obj/item/reagent_containers/food/drinks/cans/root_beer = 1.40, + /obj/item/reagent_containers/food/drinks/cans/starkist = 1.50, + /obj/item/reagent_containers/food/drinks/waterbottle = 1.25, + /obj/item/reagent_containers/food/drinks/cans/dyn = 1.80, + /obj/item/reagent_containers/food/drinks/cans/space_up = 1.50, + /obj/item/reagent_containers/food/drinks/cans/iced_tea = 1.40, + /obj/item/reagent_containers/food/drinks/cans/grape_juice = 1.75, + /obj/item/reagent_containers/food/drinks/cans/peach_soda = 1.75, + /obj/item/reagent_containers/food/drinks/cans/koispunch = 5.00, + /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 0.50, + /obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 3.50, + /obj/item/reagent_containers/food/drinks/carton/small/milk = 1.80, + /obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 1.80, + /obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 1.80, + /obj/item/reagent_containers/food/drinks/cans/melon_soda = 1.75, ) light_color = COLOR_BABY_BLUE @@ -2001,18 +2004,18 @@ /obj/item/reagent_containers/food/drinks/bottle/champagne = 3 ) prices = list( - /obj/item/reagent_containers/food/drinks/bottle/makgeolli = 30, - /obj/item/reagent_containers/food/drinks/bottle/soju = 15, - /obj/item/reagent_containers/food/drinks/bottle/soju/shochu = 30, - /obj/item/reagent_containers/food/drinks/bottle/sake = 40, - /obj/item/reagent_containers/food/drinks/cans/beer/rice = 20, - /obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma = 20, - /obj/item/reagent_containers/food/drinks/cans/beer/rice/moonlabor = 20, - /obj/item/reagent_containers/food/drinks/cans/beer = 20, - /obj/item/reagent_containers/food/drinks/bottle/small/beer = 20, - /obj/item/reagent_containers/food/drinks/bottle/whiskey = 30, - /obj/item/reagent_containers/food/drinks/bottle/wine = 50, - /obj/item/reagent_containers/food/drinks/bottle/champagne = 100 + /obj/item/reagent_containers/food/drinks/bottle/makgeolli = 12.00, + /obj/item/reagent_containers/food/drinks/bottle/soju = 6.00, + /obj/item/reagent_containers/food/drinks/bottle/soju/shochu = 12.00, + /obj/item/reagent_containers/food/drinks/bottle/sake = 16.00, + /obj/item/reagent_containers/food/drinks/cans/beer/rice = 8.00, + /obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma = 8.00, + /obj/item/reagent_containers/food/drinks/cans/beer/rice/moonlabor = 8.00, + /obj/item/reagent_containers/food/drinks/cans/beer = 8.00, + /obj/item/reagent_containers/food/drinks/bottle/small/beer = 8.00, + /obj/item/reagent_containers/food/drinks/bottle/whiskey = 12.00, + /obj/item/reagent_containers/food/drinks/bottle/wine = 20.00, + /obj/item/reagent_containers/food/drinks/bottle/champagne = 40.00, ) /obj/machinery/vending/frontiervend @@ -2055,32 +2058,32 @@ /obj/item/storage/box/fancy/foysnack = 4 ) prices = list( - /obj/item/reagent_containers/food/drinks/cans/himeokvass = 20, - /obj/item/reagent_containers/food/drinks/cans/boch = 15, - /obj/item/reagent_containers/food/drinks/cans/boch/buckthorn = 15, - /obj/item/reagent_containers/food/drinks/cans/xanuchai = 15, - /obj/item/reagent_containers/food/drinks/cans/xanuchai/creme = 15, - /obj/item/reagent_containers/food/drinks/cans/xanuchai/chocolate = 15, - /obj/item/reagent_containers/food/drinks/cans/xanuchai/neapolitan = 15, - /obj/item/reagent_containers/food/drinks/cans/galatea = 25, - /obj/item/reagent_containers/food/drinks/bottle/bestblend = 20, - /obj/item/reagent_containers/food/snacks/fishjerky = 20, - /obj/item/reagent_containers/food/snacks/pepperoniroll = 20, - /obj/item/reagent_containers/food/snacks/salmiak = 20, - /obj/item/reagent_containers/food/snacks/hakhspam = 25, - /obj/item/reagent_containers/food/snacks/pemmicanbar = 15, - /obj/item/reagent_containers/food/snacks/choctruffles = 20, - /obj/item/reagent_containers/food/snacks/peanutsnack = 15, - /obj/item/reagent_containers/food/snacks/peanutsnack/pepper = 15, - /obj/item/reagent_containers/food/snacks/peanutsnack/choc = 15, - /obj/item/reagent_containers/food/snacks/peanutsnack/masala = 15, - /obj/item/reagent_containers/food/snacks/chana = 18, - /obj/item/reagent_containers/food/snacks/chana/wild = 18, - /obj/item/reagent_containers/food/snacks/papad = 15, - /obj/item/reagent_containers/food/snacks/papad/garlic = 15, - /obj/item/reagent_containers/food/snacks/papad/ginger = 15, - /obj/item/reagent_containers/food/snacks/papad/apple = 15, - /obj/item/storage/box/fancy/foysnack = 25 + /obj/item/reagent_containers/food/drinks/cans/himeokvass = 3.50, + /obj/item/reagent_containers/food/drinks/cans/boch = 2.50, + /obj/item/reagent_containers/food/drinks/cans/boch/buckthorn = 2.50, + /obj/item/reagent_containers/food/drinks/cans/xanuchai = 2.50, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/creme = 2.50, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/chocolate = 2.50, + /obj/item/reagent_containers/food/drinks/cans/xanuchai/neapolitan = 2.50, + /obj/item/reagent_containers/food/drinks/cans/galatea = 4.50, + /obj/item/reagent_containers/food/drinks/bottle/bestblend = 3.50, + /obj/item/reagent_containers/food/snacks/fishjerky = 3.50, + /obj/item/reagent_containers/food/snacks/pepperoniroll = 3.50, + /obj/item/reagent_containers/food/snacks/salmiak = 3.50, + /obj/item/reagent_containers/food/snacks/hakhspam = 4.00, + /obj/item/reagent_containers/food/snacks/pemmicanbar = 2.50, + /obj/item/reagent_containers/food/snacks/choctruffles = 3.50, + /obj/item/reagent_containers/food/snacks/peanutsnack = 2.50, + /obj/item/reagent_containers/food/snacks/peanutsnack/pepper = 2.50, + /obj/item/reagent_containers/food/snacks/peanutsnack/choc = 2.50, + /obj/item/reagent_containers/food/snacks/peanutsnack/masala = 2.50, + /obj/item/reagent_containers/food/snacks/chana = 3.25, + /obj/item/reagent_containers/food/snacks/chana/wild = 3.25, + /obj/item/reagent_containers/food/snacks/papad = 2.50, + /obj/item/reagent_containers/food/snacks/papad/garlic = 2.50, + /obj/item/reagent_containers/food/snacks/papad/ginger = 2.50, + /obj/item/reagent_containers/food/snacks/papad/apple = 2.50, + /obj/item/storage/box/fancy/foysnack = 4.00, ) contraband = list() premium = list( @@ -2127,8 +2130,8 @@ /obj/item/key/bike/sport = 0, ) prices = list( - /obj/item/key/bike/moped = 50, - /obj/item/key/bike/sport = 200, + /obj/item/key/bike/moped = 15.00, + /obj/item/key/bike/sport = 50.00, ) restock_items = FALSE random_itemcount = FALSE @@ -2174,7 +2177,8 @@ /obj/item/reagent_containers/food/snacks/aoyama_ramen = 15 ) prices = list( - /obj/item/reagent_containers/food/snacks/ramenbowl = 60, + /obj/item/reagent_containers/food/snacks/ramenbowl = 7.00, + /obj/item/reagent_containers/food/snacks/aoyama_ramen = 8.25, ) light_color = COLOR_GUNMETAL @@ -2341,14 +2345,14 @@ If you want to expand this to more than primarily generic items, I recommend des icon_deny = "lavatory-deny" product_ads = "Take a shower you hippie.;Get a haircut, hippie!;Reeking of Vaurca taint? Take a shower!;You reek! Freshen up!;Hey, you dropped something!;Cleansing the world, one person at a time!" prices = list( - /obj/item/soap = 20, - /obj/item/mirror = 40, - /obj/item/haircomb/random = 40, - /obj/item/towel/random = 50, - /obj/item/reagent_containers/spray/cleaner/deodorant = 30, - /obj/item/reagent_containers/toothpaste = 40, - /obj/item/reagent_containers/toothbrush = 20, - /obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash = 30 + /obj/item/soap = 3.50, + /obj/item/mirror = 7.00, + /obj/item/haircomb/random = 7.00, + /obj/item/towel/random = 8.50, + /obj/item/reagent_containers/spray/cleaner/deodorant = 5.00, + /obj/item/reagent_containers/toothpaste = 7.00, + /obj/item/reagent_containers/toothbrush = 3.50, + /obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash = 5.00, ) products = list( /obj/item/soap = 12, diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 79b79c35a7b..88f70a3026c 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -140,7 +140,7 @@ // Proc to shove them up your nose /obj/item/reagent_containers/powder/attackby(obj/item/attacking_item, mob/user) - if(istype(attacking_item, /obj/item/paper/cig) || istype(attacking_item, /obj/item/spacecash)) + if(istype(attacking_item, /obj/item/paper/cig) || attacking_item.type == /obj/item/spacecash) var/mob/living/carbon/human/H = user var/obj/item/blocked = H.check_mouth_coverage() if(blocked) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 9ea0ffbefbf..9445afd4541 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -1,8 +1,8 @@ /datum/bounty/item/assistant/briefcase name = "Briefcase" description = "%BOSSNAME will be holding a business convention this year. Ship a few briefcases in support." - reward_low = 2000 - reward_high = 3000 + reward_low = 20 + reward_high = 30 required_count = 4 random_count = 1 wanted_types = list(/obj/item/storage/briefcase) @@ -11,29 +11,29 @@ /datum/bounty/item/assistant/lung name = "Lungs" description = "A recent explosion at %BOSSNAME has left multiple staff with punctured lungs. Ship spare lungs to be rewarded- and save some lives." - reward_low = 2500 - reward_high = 3500 + reward_low = 520 + reward_high = 635 wanted_types = list(/obj/item/organ/internal/lungs) /datum/bounty/item/assistant/appendix name = "Appendix" description = "%PERSONNAME wants our chefs to prepare a strange meal using a very special delicacy: an appendix. If you ship one, they'll pay." - reward_low = 2500 - reward_high = 3500 + reward_low = 425 + reward_high = 535 wanted_types = list(/obj/item/organ/internal/appendix) /datum/bounty/item/assistant/hand_tele name = "Hand Tele" description = "%BOSSNAME has come up with a genius idea: Why not teleport cargo rather than ship it? Send over a hand tele, receive payment, then wait 6-8 years while they deliberate." - reward_low = 3000 - reward_high = 5500 + reward_low = 300 + reward_high = 550 wanted_types = list(/obj/item/hand_tele) /datum/bounty/item/assistant/monkey_cubes name = "Monkey Cubes" description = "Due to a recent genetics accident, %BOSSNAME is in serious need of monkeys. Your mission is to ship monkey cubes." - reward_low = 1800 - reward_high = 2400 + reward_low = 180 + reward_high = 240 required_count = 4 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/monkeycube) @@ -41,8 +41,8 @@ /datum/bounty/item/assistant/curtains name = "Curtain" description = "Send us some curtains to help redecorate our offices!" - reward_low = 2200 - reward_high = 3200 + reward_low = 250 + reward_high = 270 required_count = 5 random_count = 2 wanted_types = list(/obj/structure/curtain) @@ -50,8 +50,8 @@ /datum/bounty/item/assistant/action_figures name = "Action Figures" description = "%PERSONNAME wants a few action figures for their collection, and is willing to pay any station who provides." - reward_low = 2000 - reward_high = 3000 + reward_low = 120 + reward_high = 130 required_count = 5 random_count = 3 wanted_types = list(/obj/item/toy/figure) @@ -59,8 +59,8 @@ /datum/bounty/item/assistant/water_tank name = "Water Tank" description = "Send us some water tanks that will be used for botany research, and definitely not for creating a slip 'n slide in %PERSONNAME's office." - reward_low = 1500 - reward_high = 2500 + reward_low = 115 + reward_high = 135 required_count = 3 random_count = 1 wanted_types = list(/obj/structure/reagent_dispensers/watertank) @@ -77,16 +77,16 @@ /datum/bounty/item/assistant/wheelchair name = "Wheelchairs" description = "The medical bay at the %DOCKSHORT has been busier than usual; we're requesting some spare wheelchairs for patient transport." - reward_low = 2300 - reward_high = 4000 + reward_low = 123 + reward_high = 140 required_count = 2 wanted_types = list(/obj/structure/bed/stool/chair/office/wheelchair, /obj/item/material/stool/chair/wheelchair) /datum/bounty/item/assistant/film name = "Camera Film" description = "We received a gift from a delegate on Adhomai- a group of some sort of small, fat xenofauna. Everyone thinks they're cute and we're low on film from all the pictures!" - reward_low = 1200 - reward_high = 1800 + reward_low = 55 + reward_high = 80 required_count = 3 random_count = 1 wanted_types = list(/obj/item/device/camera_film) @@ -94,8 +94,8 @@ /datum/bounty/item/assistant/trash name = "Trash" description = "It's time for the %COMPNAME cleanup initiative! Clean stations will receive a bonus; pick up the litter from around your station and send it to us as proof!" - reward_low = 1000 - reward_high = 2000 + reward_low = 100 + reward_high = 150 required_count = 15 random_count = 5 wanted_types = list(/obj/item/trash) @@ -103,15 +103,15 @@ /datum/bounty/item/assistant/heart name = "Heart" description = "%PERSONNAME is in critical condition after suffering a heart attack. Doctors say they need a new heart, fast. Ship one, pronto! Organic or mechanical, just hurry up!" - reward_low = 2500 - reward_high = 4000 + reward_low = 825 + reward_high = 840 wanted_types = list(/obj/item/organ/internal/heart) /datum/bounty/item/assistant/statue name = "Statue" description = "%BOSSNAME would like to commision an artsy statue for the lobby. Ship one out, when possible." - reward_low = 2200 - reward_high = 2800 + reward_low = 750 + reward_high = 1250 wanted_types = list(/obj/structure/sculpting_block) /datum/bounty/item/assistant/statue/applies_to(var/obj/structure/sculpting_block/O) @@ -126,16 +126,16 @@ /datum/bounty/item/assistant/tajcard name = "Collectable Card" description = "%PERSONNAME is offering a bonus to any station that can help them expand their collection of collectable tajaran cards." - reward_low = 1800 - reward_high = 2400 + reward_low = 180 + reward_high = 220 required_count = 2 wanted_types = list(/obj/item/tajcard) /datum/bounty/item/assistant/jetpack name = "Jetpacks" description = "We're engaging in an EVA training initiative for new miners. Ship us a few jetpacks for a station bonus." - reward_low = 3000 - reward_high = 4000 + reward_low = 300 + reward_high = 400 required_count = 3 random_count = 1 wanted_types = list(/obj/item/tank/jetpack) @@ -143,8 +143,8 @@ /datum/bounty/item/assistant/cleaner name = "Space Cleaner" description = "The janitorial division of the ERT is requesting some actual supplies, to insist they aren't a joke. They're putting up for a bounty, so humor them if you want." - reward_low = 1000 - reward_high = 1500 + reward_low = 55 + reward_high = 85 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/spray) @@ -154,7 +154,7 @@ return FALSE if(!istype(O)) return FALSE - if(REAGENT_VOLUME(O.reagents, /singleton/reagent/spacecleaner) >= 200) + if(REAGENT_VOLUME(O.reagents, /singleton/reagent/spacecleaner) >= 20) return TRUE return FALSE @@ -162,8 +162,8 @@ /datum/bounty/item/assistant/photograph name = "Photographs" description = "The %DOCKNAME is holding a morale project, and part of that is to display photographs from the various stations. Send us some for a participation bonus!" - reward_low = 1500 - reward_high = 2500 + reward_low = 75 + reward_high = 250 required_count = 8 random_count = 2 wanted_types = list(/obj/item/photo) diff --git a/code/modules/cargo/bounties/bot.dm b/code/modules/cargo/bounties/bot.dm index 9688af6cc94..9a21baae984 100644 --- a/code/modules/cargo/bounties/bot.dm +++ b/code/modules/cargo/bounties/bot.dm @@ -1,16 +1,16 @@ /datum/bounty/item/bot/cleanbot name = "Cleanbot" description = "There has been a incident out our crusher which resulted in the tragic death of multiple cleanbots. Ship a few replacements." - reward_low = 2700 - reward_high = 3700 + reward_low = 270 + reward_high = 370 required_count = 3 wanted_types = list(/mob/living/bot/cleanbot) /datum/bounty/item/bot/farmbot name = "Farmbot" description = "After a k'ois incident multiple botanists were hospitalized. Provide a few farmbots to handle their duties while they recover." - reward_low = 3700 - reward_high = 4300 + reward_low = 370 + reward_high = 430 required_count = 3 random_count = 1 wanted_types = list(/mob/living/bot/farmbot) @@ -18,7 +18,7 @@ /datum/bounty/item/bot/medbot name = "Medibot" description = "We were unable to recruit a sufficient number of qualified medical professionals this month. Ship us a few medibots to fill the void." - reward_low = 5500 - reward_high = 6000 + reward_low = 550 + reward_high = 600 required_count = 2 wanted_types = list(/mob/living/bot/medbot) diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 981ce1f16f8..f1e16ec7adf 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -11,8 +11,8 @@ /datum/bounty/item/chef/birthday_cake name = "Birthday Cake" description = "A birthday party for %PERSONNAME is coming up! Ship a complete birthday cake to celebrate!" - reward_low = 3000 - reward_high = 4000 + reward_low = 75 + reward_high = 100 wanted_types = list( /obj/item/reagent_containers/food/snacks/variable/cake, /obj/item/reagent_containers/food/snacks/sliceable/cake) @@ -20,8 +20,8 @@ /datum/bounty/item/chef/soup name = "Soup" description = "%COMPNAME will be serving soup to the homeless for a PR initiative. Ship any type of soup. And make sure it's soup- not just hot water." - reward_low = 2700 - reward_high = 3500 + reward_low = 55 + reward_high = 125 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/soup) @@ -30,8 +30,8 @@ /datum/bounty/item/chef/popcorn name = "Popcorn Bags" description = "%PERSONNAME wants to host a movie night. Ship bags of popcorn for the occasion." - reward_low = 2300 - reward_high = 3000 + reward_low = 45 + reward_high = 90 required_count = 4 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/popcorn) @@ -39,8 +39,8 @@ /datum/bounty/item/chef/icecream name = "Ice Cream" description = "The air conditioning system of some offices on %DOCKSHORT has failed. Ship some ice cream before we melt." - reward_low = 4000 - reward_high = 4500 + reward_low = 40 + reward_high = 60 required_count = 4 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich, @@ -62,7 +62,7 @@ /datum/bounty/item/chef/pie name = "Pie" description = "%BOSSSHORT management wants a pie! Ship one pie." - reward = 3142 + reward = 75 wanted_types = list(/obj/item/reagent_containers/food/snacks/pie, /obj/item/reagent_containers/food/snacks/meatpie, /obj/item/reagent_containers/food/snacks/tofupie, @@ -81,8 +81,8 @@ /datum/bounty/item/chef/salad name = "Salad" description = "%BOSSSHORT management is going on a health binge. Ship some tasty salads to help keep them on track." - reward_low = 2800 - reward_high = 3800 + reward_low = 45 + reward_high = 55 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/salad) @@ -90,8 +90,8 @@ /datum/bounty/item/chef/fries name = "Fries" description = "Sometimes the whole office just gets a craving for a certain food. Today, it's fries. Ship some!" - reward_low = 2800 - reward_high = 3800 + reward_low = 35 + reward_high = 45 required_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/carrotfries, /obj/item/reagent_containers/food/snacks/fries, @@ -102,8 +102,8 @@ /datum/bounty/item/chef/superbite name = "Super Bite Burger" description = "%PERSONNAME thinks they can set a competitive eating world record. All they need is a super bite burger shipped to them." - reward_low = 11500 - reward_high = 13500 + reward_low = 90 + reward_high = 120 wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite) /datum/bounty/item/chef/superbite/compatible_with(var/datum/other_bounty) @@ -114,8 +114,8 @@ /datum/bounty/item/chef/poppypretzel name = "Poppy Pretzel" description = "%BOSSNAME needs a few poppy pretzels for the drug-training of their security department." - reward_low = 2600 - reward_high = 3200 + reward_low = 45 + reward_high = 65 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/poppypretzel) @@ -123,30 +123,30 @@ /datum/bounty/item/chef/cubancarp name = "Cuban Carp" description = "A diplomat is visiting %BOSSSHORT. Ship one cuban carp for the business luncheon." - reward_low = 8200 - reward_high = 9200 + reward_low = 100 + reward_high = 150 wanted_types = list(/obj/item/reagent_containers/food/snacks/cubancarp) /datum/bounty/item/chef/hotdog name = "Hot Dog" description = "%COMPNAME is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate." - reward_low = 4000 - reward_high = 4800 + reward_low = 40 + reward_high = 60 wanted_types = list(/obj/item/reagent_containers/food/snacks/hotdog) /datum/bounty/item/chef/eggplantparm name = "Eggplant Parmigianas" description = "A famous singer will be arriving at %BOSSSHORT, and their contract demands that they only be served Eggplant Parmigiana. Ship some, please!" - reward_low = 4000 - reward_high = 4800 + reward_low = 40 + reward_high = 60 required_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/eggplantparm) /datum/bounty/item/chef/muffin name = "Muffins" description = "%BOSSSHORT needs muffins for a morning meeting! Your station will get a bonus if you ship some." - reward_low = 3500 - reward_high = 4200 + reward_low = 35 + reward_high = 42 required_count = 8 random_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/muffin, @@ -156,16 +156,16 @@ /datum/bounty/item/chef/chawanmush name = "Chawanmushi" description = "Someone from middle-management mentioned Chawanmushi. We never tried them so we need you to ship some immediately." - reward_low = 6500 - reward_high = 7500 + reward_low = 65 + reward_high = 75 required_count = 2 wanted_types = list(/obj/item/reagent_containers/food/snacks/chawanmushi) /datum/bounty/item/chef/kebab name = "Kebabs" description = "%BOSSNAME is requesting a special order; please ship some kebabs." - reward_low = 3500 - reward_high = 4200 + reward_low = 40 + reward_high = 60 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/variable/kebab, @@ -180,8 +180,8 @@ /datum/bounty/item/chef/poppers name = "Jalapeno Poppers" description = "%PERSONNAME is trying to set a system record for most jalapeno poppers held in their mouth at once. Don't ask questions, just send them." - reward_low = 4500 - reward_high = 5200 + reward_low = 45 + reward_high = 52 required_count = 8 random_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/jalapeno_poppers) @@ -189,8 +189,8 @@ /datum/bounty/item/chef/burger name = "Burger" description = "%PERSONNAME is this month's food critic for a local newsletter and they're on a deadline. Give them some burgers to review." - reward_low = 1200 - reward_high = 2000 + reward_low = 52 + reward_high = 70 required_count = 2 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/burger) @@ -203,8 +203,8 @@ /datum/bounty/item/chef/fortune name = "Fortune Cookies" description = "%PERSONNAME claims they can do divination based on fortune cookies. Send a batch so we can find out if it's true." - reward_low = 2000 - reward_high = 3000 + reward_low = 20 + reward_high = 30 required_count = 7 random_count = 2 wanted_types = list(/obj/item/reagent_containers/food/snacks/fortunecookie) @@ -212,8 +212,8 @@ /datum/bounty/item/chef/spaghetti name = "Spaghetti" description = "We're hosting a luncheon for some %COMPSHORT Academy computer programming students. We heard that they really enjoy spaghetti, so ship some!" - reward_low = 2200 - reward_high = 3200 + reward_low = 55 + reward_high = 80 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/boiledspaghetti, @@ -224,8 +224,8 @@ /datum/bounty/item/chef/dumplings name = "Meat Buns or Momo" description = "We're sick of eating vendor food; send us some meat buns or momo." - reward_low = 3200 - reward_high = 4100 + reward_low = 40 + reward_high = 60 required_count = 4 random_count = 2 wanted_types = list(/obj/item/reagent_containers/food/snacks/meatbun, @@ -235,8 +235,8 @@ /datum/bounty/item/chef/unathi name = "Unathi Delicacies" description = "We're holding a luncheon with some Hegemony representatives; send some traditional Unathi dishes!" - reward_low = 3300 - reward_high = 5300 + reward_low = 150 + reward_high = 250 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/aghrasshcake, @@ -264,8 +264,8 @@ /datum/bounty/item/chef/tajara name = "Adhomai Delicacies" description = "We're holding a luncheon with some representatives from Adhomai; send some traditional Tajaran dishes!" - reward_low = 3500 - reward_high = 5500 + reward_low = 150 + reward_high = 250 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/adhomian_porridge, @@ -314,8 +314,8 @@ /datum/bounty/item/chef/skrell name = "Federation Delicacies" description = "We're holding a luncheon with some Nralakk Federation representatives; send some Skrellian dishes!" - reward_low = 3700 - reward_high = 5700 + reward_low = 150 + reward_high = 250 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/chipplate/neaeracandy, @@ -335,8 +335,8 @@ /datum/bounty/item/chef/curry name = "Curry" description = "I forgot that I was supposed to host lunch for an upcoming meeting. Ship me some curry and I'll make sure your station gets a bonus. - %PERSONNAME" - reward_low = 3000 - reward_high = 3900 + reward_low = 40 + reward_high = 60 required_count = 4 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/redcurry, @@ -347,8 +347,8 @@ /datum/bounty/item/chef/dip name = "Dip" description = "It's time for an office party, but %PERSONNAME forgot the dip! Send us some and we'll transfer part of their upcoming bonus to your station's account." - reward_low = 2500 - reward_high = 3000 + reward_low = 50 + reward_high = 80 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/dip) @@ -356,15 +356,15 @@ /datum/bounty/item/chef/reuben name = "Reuben Sandwich" description = "%PERSONNAME had their lunch stolen from the company fridge. Send us a replacement reuben!" - reward_low = 3700 - reward_high = 4600 + reward_low = 45 + reward_high = 60 wanted_types = list(/obj/item/reagent_containers/food/snacks/reubensandwich) /datum/bounty/item/chef/ravioli name = "Ravioli" description = "Somehow, %PERSONNAME has never had Ravioli before, so we've decided to do a themed office lunch. Send us some, please." - reward_low = 2800 - reward_high = 3800 + reward_low = 80 + reward_high = 120 required_count = 4 random_count = 1 wanted_types = list( @@ -374,8 +374,8 @@ /datum/bounty/item/chef/ramen name = "Ramen Bowl" description = "%PERSONNAME thinks that Ramen is the instant, pre-packaged kind you get from machines and has never had the 'real' kind. We've allocated some morale funds to educate them, please send some good examples." - reward_low = 3000 - reward_high = 3900 + reward_low = 80 + reward_high = 120 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/ramenbowl, /obj/item/reagent_containers/food/snacks/aoyama_ramen) @@ -383,8 +383,8 @@ /datum/bounty/item/chef/matsuul name = "Matsuul" description = "After some incidents, we're running a workshop on collaborating in a multi-species workplace. We need a meal that represents collaboration between different species and cultures." - reward_low = 3000 - reward_high = 3900 + reward_low = 80 + reward_high = 120 required_count = 3 random_count = 1 wanted_types = list( @@ -393,8 +393,8 @@ /datum/bounty/item/chef/roulades name = "Roulades" description = "%PERSONNAME is retiring after many beloved years in the company and we need some tasty treats for the retirement party we're throwing them." - reward_low = 2600 - reward_high = 3500 + reward_low = 90 + reward_high = 150 required_count = 2 random_count = 1 wanted_types = list( diff --git a/code/modules/cargo/bounties/engineer.dm b/code/modules/cargo/bounties/engineer.dm index d64d2956e65..6d2f9653fcc 100644 --- a/code/modules/cargo/bounties/engineer.dm +++ b/code/modules/cargo/bounties/engineer.dm @@ -1,8 +1,8 @@ /datum/bounty/item/engineer/comfy_chair name = "Padded Chairs" description = "%PERSONNAME is unhappy with their chair. They claim it hurts their back. Have engineers craft some alternatives and ship them out to humor them." - reward_low = 2400 - reward_high = 3900 + reward_low = 240 + reward_high = 390 required_count = 4 random_count = 2 wanted_types = list(/obj/structure/bed/stool/chair) @@ -19,15 +19,15 @@ /datum/bounty/item/engineer/smes_coil name = "Superconductive magnetic coil" description = "A xenobotanist from the NSS Upsilon sent us a gigantic lemon. We're turning it into a battery; send us an SMES coil so we can contain its power." - reward_low = 4000 - reward_high = 4500 + reward_low = 400 + reward_high = 450 wanted_types = list(/obj/item/smes_coil) /datum/bounty/item/engineer/solar name = "Solar Assemblies or Trackers" description = "A meteor shower ruined some backup solar arrays on the %DOCKNAME; ship us some assemblies or tracker electronics so we can expedite repairs." - reward_low = 6500 - reward_high = 8700 + reward_low = 650 + reward_high = 870 required_count = 6 random_count = 2 wanted_types = list(/obj/item/solar_assembly, /obj/item/tracker_electronics) @@ -35,16 +35,16 @@ /datum/bounty/item/engineer/eshield name = "Emergency Shields" description = "Another station is requesting emergency energy shields. Apparently there was a baby carp migration and they want to set up a safe play area for them. Treat this as urgent." - reward_low = 7500 - reward_high = 9000 + reward_low = 750 + reward_high = 900 required_count = 2 wanted_types = list(/obj/machinery/shield) /datum/bounty/item/engineer/firesuit name = "Firesuits" description = "I'm about to drop my mixtape in our next meeting. Send some suits to protect management from this straight FIRE. - %PERSONNAME" - reward_low = 2000 - reward_high = 3200 + reward_low = 200 + reward_high = 320 required_count = 2 random_count = 1 wanted_types = list(/obj/item/clothing/suit/fire) @@ -52,8 +52,8 @@ /datum/bounty/item/engineer/fuel_tank name = "Fuel Tank" description = "After observing your engineering staff, we think it's best if you send us a few of those fuel tanks so nobody hurts themselves." - reward_low = 2500 - reward_high = 3500 + reward_low = 250 + reward_high = 350 required_count = 4 random_count = 2 wanted_types = list(/obj/structure/reagent_dispensers/fueltank) @@ -71,7 +71,7 @@ name = "Full Tank of Phoron" description = "Another station has requested supplies to test a new engine. In particular, they request a full tank of phoron. Please don't send a whole canister; they'll get... ideas." reward_low = 2200 - reward_high = 3200 + reward_high = 2800 wanted_types = list(/obj/item/tank) var/moles_required = 20 // A full tank is 28 moles, but we give some leeway. @@ -88,8 +88,8 @@ /datum/bounty/item/engineer/vending name = "Vending Machines" description = "We're researching the cause of the widespread brand intelligence virus. Send us some vending machines of any kind from your station so we can examine them. Just get permission, first." - reward_low = 3500 - reward_high = 5000 + reward_low = 1350 + reward_high = 1500 required_count = 4 random_count = 1 wanted_types = list(/obj/machinery/vending) @@ -97,17 +97,17 @@ /datum/bounty/item/engineer/coffin name = "Coffins" description = "%PERSONNAME is holding a funeral service for some brave maintenance drones. Kind of weird, but they're a nice person and willing to put up for a bounty. Ship us some urns or wooden coffins to humor them." - reward_low = 2500 - reward_high = 3000 + reward_low = 250 + reward_high = 300 required_count = 3 random_count = 1 wanted_types = list(/obj/structure/closet/crate/coffin, /obj/item/material/urn) /datum/bounty/item/engineer/pap name = "Portable Air Pumps" - description = "After a breach, some employees have been opening emergency shutters with no regard for their safety. Send us some pumps with at least 5,000kpa of air mix to get this taken care of quickly." - reward_low = 7200 - reward_high = 8800 + description = "After a breach, some employees have been opening emergency shutters with no regard for their safety. Send us some pumps with at least 5,00kpa of air mix to get this taken care of quickly." + reward_low = 720 + reward_high = 880 required_count = 3 wanted_types = list(/obj/machinery/portable_atmospherics/powered/pump) @@ -116,15 +116,15 @@ return FALSE if(!istype(O)) return FALSE - if(O.air_contents.return_pressure() >= 5000) + if(O.air_contents.return_pressure() >= 500) return TRUE return FALSE /datum/bounty/item/engineer/spaceac name = "Space A/C" description = "The A/C is out in our offices, and everyone's talking about ice cream. I'm authorizing a bounty for some actual A/C units, since that will actually solve the issue. - %PERSONNAME" - reward_low = 5000 - reward_high = 6500 + reward_low = 500 + reward_high = 650 required_count = 3 random_count = 1 wanted_types = list(/obj/machinery/space_heater) @@ -132,23 +132,23 @@ /datum/bounty/item/engineer/pipe name = "Atmospheric Pipe Dispenser" description = "We need another pipe dispenser to help expedite an atmospherics project. The station will get a bonus if you send us a pipe dispenser." - reward_low = 5000 - reward_high = 5700 + reward_low = 500 + reward_high = 570 wanted_types = list(/obj/machinery/pipedispenser) exclude_types = list(/obj/machinery/pipedispenser/disposal) /datum/bounty/item/engineer/disposal name = "Disposal Pipe Dispenser" description = "The %DOCKSHORT is undergoing an overhaul of its mail delivery chutes. Lend us a dispenser to help expedite it for a bonus." - reward_low = 5000 - reward_high = 5700 + reward_low = 500 + reward_high = 570 wanted_types = list(/obj/machinery/pipedispenser/disposal) /datum/bounty/item/engineer/bookcase name = "Bookcases" description = "We're showing some love to one of the libraries on the %DOCKSHORT. A bonus will be paid to any station who has some skilled engineers build some for us." - reward_low = 6000 - reward_high = 7000 + reward_low = 600 + reward_high = 700 required_count = 4 random_count = 1 wanted_types = list(/obj/structure/bookcase) @@ -156,8 +156,8 @@ /datum/bounty/item/engineer/generator name = "Portable Generators" description = "Another station reported some engine troubles, and needs a few portable generators to maintain critical operations. Ship any type of portable generators to receive a bonus." - reward_low = 5000 - reward_high = 6200 + reward_low = 500 + reward_high = 620 required_count = 2 random_count = 1 wanted_types = list(/obj/machinery/power/portgen/basic) @@ -165,7 +165,7 @@ /datum/bounty/item/engineer/crossbow name = "Powered Crossbow" description = "Mictlanian Democratic Forces require weaponry to assist the TCFL in quelling the unrest following peaceful takeover, please ship us some powered crossbows." - reward_low = 5000 - reward_high = 7500 + reward_low = 500 + reward_high = 750 required_count = 2 wanted_types = list(/obj/item/gun/launcher/crossbow) diff --git a/code/modules/cargo/bounties/hydroponics.dm b/code/modules/cargo/bounties/hydroponics.dm index b195953386f..bd8b3e0dfa1 100644 --- a/code/modules/cargo/bounties/hydroponics.dm +++ b/code/modules/cargo/bounties/hydroponics.dm @@ -2,8 +2,8 @@ /datum/bounty/item/hydroponicist/potato_cells name = "Potato Batteries" description = "%BOSSNAME is researching an environmentally-friendly power source on another station. Send us some potato batteries." - reward_low = 2000 - reward_high = 3000 + reward_low = 200 + reward_high = 300 required_count = 6 random_count = 3 wanted_types = list(/obj/item/cell/potato) @@ -11,8 +11,8 @@ /datum/bounty/item/hydroponicist/ert name = "Rations" description = "%BOSSSHORT is sending ERT out on a long mission. We need some long-lasting rations for them to eat!" - reward_low = 2200 - reward_high = 2800 + reward_low = 220 + reward_high = 280 required_count = 6 random_count = 2 wanted_types = list(/obj/item/reagent_containers/food/snacks/liquidfood, /obj/item/pen/crayon) @@ -20,8 +20,8 @@ /datum/bounty/item/hydroponicist/towels name = "Towels" description = "%BOSSSHORT is having the sickest pool party ever. Send us some towels for a reward, and maybe an invitation!" - reward_low = 3000 - reward_high = 3500 + reward_low = 300 + reward_high = 350 required_count = 8 random_count = 3 wanted_types = list(/obj/item/towel, /obj/item/towel_flat) @@ -29,8 +29,8 @@ /datum/bounty/item/hydroponicist/gloves name = "Botanical Gloves" description = "%BOSSNAME is participating in a massive tree-planting initiative on Biesel. Help us help the company's image by sending our volunteers some gardening gloves!" - reward_low = 2200 - reward_high = 3000 + reward_low = 50 + reward_high = 80 required_count = 4 random_count = 1 wanted_types = list(/obj/item/clothing/gloves/botanic_leather) @@ -38,8 +38,8 @@ /datum/bounty/item/hydroponicist/flower_crown name = "Flower Crowns" description = "It's time for the monthly %COMPNAME company dance. This month's theme is floral in nature, so send us some flower crowns to give to attendees." - reward_low = 3600 - reward_high = 4400 + reward_low = 360 + reward_high = 440 required_count = 6 random_count = 2 wanted_types = list(/obj/item/clothing/head/sunflower_crown, /obj/item/clothing/head/lavender_crown, /obj/item/clothing/head/poppy_crown) @@ -47,8 +47,8 @@ /datum/bounty/item/assistant/animal_cubes name = "Xeno Cubes" description = "Monkeys are very limiting for xenostudies research. Please ship some alternative cubes (wrapped) to alleviate a shortage experienced by our other labs." - reward_low = 2000 - reward_high = 2600 + reward_low = 200 + reward_high = 260 required_count = 4 random_count = 1 wanted_types = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube, @@ -59,8 +59,8 @@ /datum/bounty/item/hydroponicist/produce name = "Produce - Any" description = "%BOSSNAME is in need of a bundle of fresh produce. Send your best!" - reward_low = 3000 - reward_high = 3500 + reward_low = 250 + reward_high = 500 required_count = 18 random_count = 5 wanted_types = list(/obj/item/reagent_containers/food/snacks/grown) @@ -117,8 +117,8 @@ /datum/bounty/item/hydroponicist/goldstars name = "Stickers - Gold Stars" description = "We're getting ready for the quarterly %COMPNAME employee evaluation. Send us some gold stars so we can really let our employees know how valuable they are." - reward_low = 2600 - reward_high = 3400 + reward_low = 55 + reward_high = 75 required_count = 6 random_count = 2 wanted_types = list(/obj/item/storage/stickersheet/goldstar) @@ -126,8 +126,8 @@ /datum/bounty/item/hydroponicist/stuffedanimals name = "Toys - Stuffed Animals" description = "We had to recall some products recently for being highly carcinogenic. To help with optics, we're hosting a toy drive for the handful of children's cancer hospitals in Mendell. Get us some stuffed animals for it." - reward_low = 2800 - reward_high = 3800 + reward_low = 180 + reward_high = 280 required_count = 8 random_count = 2 wanted_types = list( diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index 62bc4fe68f3..2a17203afda 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -37,8 +37,8 @@ /datum/bounty/reagent/simple_drink name = "Simple Drink" - reward_low = 1000 - reward_high = 1800 + reward_low = 50 + reward_high = 150 /datum/bounty/reagent/simple_drink/New() ..() @@ -91,13 +91,13 @@ name = wanted_reagent.name description = "[pick(possible_descriptions)] Send a shipment of [name]." //punctuation is already in pick() required_volume = rand(2, 12) * 10 - reward += required_volume * 20 //range from +400(20u) to +2400(120u) + reward += required_volume * 20 //range from +40(20u) to +240(120u) //Complex drinks. Requires coordination with other departments for ingredients /datum/bounty/reagent/complex_drink name = "Complex Drink" - reward_low = 2000 - reward_high = 3200 + reward_low = 150 + reward_high = 250 /datum/bounty/reagent/complex_drink/New() ..() @@ -128,13 +128,13 @@ name = wanted_reagent.name description = "[pick(possible_descriptions)] Send a shipment of [name]." //punctuation is already in pick() required_volume = rand(2, 12) * 10 - reward += required_volume * 30 //range from +600(20u) to +3600(120u) + reward += required_volume * 30 //range from +60(20u) to +360(120u) //Medicines, toxins, and drugs /datum/bounty/reagent/chemical name = "Chemical" - reward_low = 2000 - reward_high = 3200 + reward_low = 150 + reward_high = 350 /datum/bounty/reagent/chemical/New() ..() @@ -175,4 +175,4 @@ name = wanted_reagent.name description = "One of our labs is in desperate need of [name]. Ship a container of it to be rewarded." required_volume = rand(2, 12) * 10 - reward += required_volume * 40 //range from +800(20u) to +4800(120u) + reward += required_volume * 40 //range from +80(20u) to +480(120u) diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index dbfc97a47e9..31b83e6e71a 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -1,8 +1,8 @@ /datum/bounty/item/science/experimental_welding_tool name = "Experimental Welding Tool" description = "A recent accident has left most of %BOSSSHORT's welding tools exploded. Ship replacements to be rewarded." - reward_low = 5200 - reward_high = 6000 + reward_low = 520 + reward_high = 600 required_count = 3 random_count = 1 wanted_types = list(/obj/item/weldingtool/experimental) @@ -10,8 +10,8 @@ /datum/bounty/item/science/cryostasis_beaker name = "Cryostasis Beaker" description = "Chemists at %BOSSNAME have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive a station bonus." - reward_low = 5200 - reward_high = 6000 + reward_low = 520 + reward_high = 600 required_count = 3 random_count = 1 wanted_types = list(/obj/item/reagent_containers/glass/beaker/noreact) @@ -19,8 +19,8 @@ /datum/bounty/item/science/borgbody name = "Robot Endoskeleton" description = "The %DOCKSHORT has decided to rely more on cyborgs for dangerous tasks. Ship us a fully assembled robot endoskeletons without a mmi/posibrain inside of it." - reward_low = 5000 - reward_high = 6500 + reward_low = 500 + reward_high = 650 required_count = 1 wanted_types = list(/obj/item/robot_parts/robot_suit) @@ -36,15 +36,15 @@ /datum/bounty/item/science/forcegloves name = "Force Gloves" description = "%PERSONNAME has been challenged to a sparring duel in the holodeck. Ship them a pair of forcegloves so there can be a fair fight." - reward_low = 2500 - reward_high = 3500 + reward_low = 250 + reward_high = 350 wanted_types = list(/obj/item/clothing/gloves/force) /datum/bounty/item/science/fossil name = "Fossil" description = "We want to set up a display in one of the libraries on the %DOCKSHORT. Ship us a unique discovery when you are done displaying it on-station." - reward_low = 7500 - reward_high = 8500 + reward_low = 750 + reward_high = 850 required_count = 1 random_count = 1 //wants one or two wanted_types = list(/obj/item/fossil, /obj/skeleton) @@ -52,8 +52,8 @@ /datum/bounty/item/science/circuitboard name = "Telecomms Monitor Circuitboard" description = "Due to a hardware failure, %COMPNAME requires a new circuit board to replace the spare that was used to fix the problem." - reward_low = 3500 - reward_high = 4500 + reward_low = 350 + reward_high = 450 required_count = 1 wanted_types = list(/obj/item/circuitboard/comm_monitor) @@ -84,8 +84,8 @@ /datum/bounty/item/science/battery name = "Heavy-Duty Power Cell" description = "%COMPNAME has requested some power cells to fill their supply closet. Please fully charge them first." - reward_low = 3500 - reward_high = 4500 + reward_low = 350 + reward_high = 450 required_count = 4 random_count = 1 wanted_types = list(/obj/item/cell/apc) @@ -101,20 +101,20 @@ /datum/bounty/item/science/battery/high name = "High-Capacity power Cell" - reward_low = 4500 - reward_high = 5000 + reward_low = 450 + reward_high = 500 wanted_types = list(/obj/item/cell/high) /datum/bounty/item/science/battery/super name = "Super-Capacity power Cell" - reward_low = 4500 - reward_high = 5000 + reward_low = 450 + reward_high = 500 required_count = 3 wanted_types = list(/obj/item/cell/super) /datum/bounty/item/science/battery/hyper name = "Hyper-Capacity power Cell" - reward_low = 5000 - reward_high = 6000 + reward_low = 500 + reward_high = 600 required_count = 3 wanted_types = list(/obj/item/cell/hyper) diff --git a/code/modules/cargo/bounties/security.dm b/code/modules/cargo/bounties/security.dm index 2d5d163b668..656506ffc66 100644 --- a/code/modules/cargo/bounties/security.dm +++ b/code/modules/cargo/bounties/security.dm @@ -1,31 +1,31 @@ /datum/bounty/item/security/headset name = "Security Headset" description = "%COMPNAME wants to ensure that their encryption is working correctly. Ship them a security headset so that they can check." - reward_low = 700 - reward_high = 1200 + reward_low = 170 + reward_high = 220 random_count = 1 wanted_types = list(/obj/item/device/radio/headset/headset_sec , /obj/item/device/radio/headset/heads/hos) /datum/bounty/item/security/securitybelt name = "Security Belt" description = "%BOSSNAME is having difficulties with their security belts. Ship one from the station to receive compensation." - reward_low = 700 - reward_high = 1200 + reward_low = 170 + reward_high = 220 random_count = 1 wanted_types = list(/obj/item/storage/belt/security) /datum/bounty/item/security/sechuds name = "Security HUDSunglasses" description = "%BOSSNAME screwed up and ordered the wrong type of security sunglasses. They request the station ship some of theirs." - reward_low = 700 - reward_high = 1200 + reward_low = 270 + reward_high = 320 wanted_types = list(/obj/item/clothing/glasses/sunglasses/sechud) /datum/bounty/item/security/voidsuit name = "Security Voidsuit" description = "The %DOCKSHORT has misplaced one of its security voidsuits, and a training exercise is about to begin. Ship a spare for a station bonus. Don't forget the helmet." - reward_low = 2500 - reward_high = 4500 + reward_low = 1250 + reward_high = 1450 wanted_types = list(/obj/item/clothing/suit/space/void/security) /datum/bounty/item/security/voidsuit/applies_to(var/obj/item/clothing/suit/space/void/security/O) @@ -40,8 +40,8 @@ /datum/bounty/item/security/maglight name = "Maglights" description = "Some civil protection agents lost their flashlights, and think the plastic ones are too lame. Send some maglights to appease their picky tastes." - reward_low = 2200 - reward_high = 3000 + reward_low = 220 + reward_high = 300 required_count = 2 random_count = 1 wanted_types = list(/obj/item/device/flashlight/maglight) @@ -49,8 +49,8 @@ /datum/bounty/item/security/handcuffs name = "Handcuffs" description = "A large influx of criminals have arrived at %BOSSNAME for processing and transfer. Now is the perfect time to ship out spare handcuffs." - reward_low = 1200 - reward_high = 1900 + reward_low = 120 + reward_high = 190 required_count = 4 random_count = 2 wanted_types = list(/obj/item/handcuffs) @@ -58,8 +58,8 @@ /datum/bounty/item/security/teargas name = "Teargas Grenades" description = "We're training some new civil protection officers, but our order for tear gas is running behind. Ship some for a bonus to your station's account." - reward_low = 2000 - reward_high = 3000 + reward_low = 400 + reward_high = 700 required_count = 3 random_count = 1 wanted_types = list(/obj/item/grenade/chem_grenade/teargas) @@ -67,8 +67,8 @@ /datum/bounty/item/security/pepper name = "Pepper Spray" description = "Time to help some civil protection troopers toughen their response to being pepper sprayed. Any station that helps will be compensated. I love this job. -%PERSONNAME" - reward_low = 1200 - reward_high = 2200 + reward_low = 220 + reward_high = 320 required_count = 4 random_count = 1 wanted_types = list(/obj/item/reagent_containers/spray/pepper) @@ -85,8 +85,8 @@ /datum/bounty/item/security/flash name = "Flashes" description = "The %DOCKSHORT has a few more new recruits than expected; we'll compensate any station that helps us provide some basic equipment. Right now, we need flashes." - reward_low = 1200 - reward_high = 2200 + reward_low = 120 + reward_high = 220 required_count = 4 random_count = 1 wanted_types = list(/obj/item/device/flash) diff --git a/code/modules/cargo/bounties/slime.dm b/code/modules/cargo/bounties/slime.dm index e9dc322fa53..7fea0ef0646 100644 --- a/code/modules/cargo/bounties/slime.dm +++ b/code/modules/cargo/bounties/slime.dm @@ -1,11 +1,11 @@ /datum/bounty/item/slime - reward_low = 4000 - reward_high = 6000 + reward_low = 400 + reward_high = 1000 /datum/bounty/item/slime/New() ..() description = "One of our science leads is hunting for a sample of [name]. A bounty has been offered for finding it." - reward += rand(0, 4) * 500 + reward += rand(0, 4) * 50 /datum/bounty/item/slime/green name = "Green Slime Extract" diff --git a/code/modules/cargo/bounties/special.dm b/code/modules/cargo/bounties/special.dm index 55e1ec51914..cd93c05f49b 100644 --- a/code/modules/cargo/bounties/special.dm +++ b/code/modules/cargo/bounties/special.dm @@ -24,8 +24,8 @@ /datum/bounty/item/phoron_sheet name = "Phoron Sheets" description = "Shipment of Phoron is considered to be a key part of the SCCV Horizon's operations. This bounty should always be prioritized." - reward_low = 2600 - reward_high = 3750 + reward_low = 2000 + reward_high = 4000 required_count = 40 random_count = 10 wanted_types = list(/obj/item/stack/material/phoron) @@ -45,8 +45,8 @@ /datum/bounty/item/solar_array name = "Assembled Solar Panels" description = "Owing to the phoron shortage continuing for over a year, longer than projected, we have decided to use solar arrays to power various facilities across our region of influence." - reward_low = 8000 - reward_high = 10000 + reward_low = 280 + reward_high = 400 required_count = 6 random_count = 2 // 4 to 8 wanted_types = list(/obj/machinery/power/solar) diff --git a/code/modules/cargo/cargo_suppliers.dm b/code/modules/cargo/cargo_suppliers.dm index ada75863854..69075b7569e 100644 --- a/code/modules/cargo/cargo_suppliers.dm +++ b/code/modules/cargo/cargo_suppliers.dm @@ -15,7 +15,7 @@ var/shuttle_time = 100 /// The additional price an order incurs for ordering a shuttle from this supplier. - var/shuttle_price = 100 + var/shuttle_price = 20 /// Whether or not this supplier is available or not. var/available = TRUE diff --git a/code/modules/cargo/delivery/package.dm b/code/modules/cargo/delivery/package.dm index 90ac3c8a713..82db30db2b7 100644 --- a/code/modules/cargo/delivery/package.dm +++ b/code/modules/cargo/delivery/package.dm @@ -51,9 +51,9 @@ /obj/item/cargo_package/Initialize(mapload, obj/structure/cargo_receptacle/delivery_point) . = ..() - pay_amount = rand(4, 7) * 1000 + pay_amount = rand(4, 7) * 100 if(prob(3)) - pay_amount = rand(12, 17) * 1000 + pay_amount = rand(12, 17) * 100 if(delivery_point) setup_delivery_point(delivery_point) accent_color = pick(COLOR_RED, COLOR_AMBER, COLOR_PINK, COLOR_YELLOW, COLOR_LIME) diff --git a/code/modules/cargo/items/atmos.dm b/code/modules/cargo/items/atmos.dm index e74f75f1e8f..ae6dd022312 100644 --- a/code/modules/cargo/items/atmos.dm +++ b/code/modules/cargo/items/atmos.dm @@ -3,7 +3,7 @@ name = "oxygen tank" supplier = "hephaestus" description = "A man-portable tank containing oxygen, the precious gas of life. Unless you're Vaurca, in which case it's pure poison." - price = 85 + price = 80 items = list( /obj/item/tank/oxygen ) @@ -17,7 +17,7 @@ name = "phoron tank" supplier = "nanotrasen" description = "A man-portable tank containing phoron, pure poison. Unless you're Vaurca, in which case it's the precious gas of life." - price = 750 + price = 1200 items = list( /obj/item/tank/phoron ) @@ -31,7 +31,7 @@ name = "hydrogen tank" supplier = "hephaestus" description = "A man-portable tank containing hydrogen. Do not inhale. Warning: extremely flammable." - price = 150 + price = 45 items = list( /obj/item/tank/hydrogen ) @@ -45,7 +45,7 @@ name = "portable air pump" supplier = "hephaestus" description = "Used to fill or drain rooms without differentiating between gasses. NOTE: Does not come pre-filled. Air sold separately." - price = 750 + price = 130 items = list( /obj/machinery/portable_atmospherics/powered/pump ) @@ -59,7 +59,7 @@ name = "portable air scrubber" supplier = "hephaestus" description = "Scrubs contaminants from the local atmosphere or the connected portable tank." - price = 850 + price = 150 items = list( /obj/machinery/portable_atmospherics/powered/scrubber ) @@ -73,7 +73,7 @@ name = "Canister (Air)" supplier = "hephaestus" description = "Holds nitrogen-oxygen breatheable air. Has a built-in valve to allow for filling portable tanks." - price = 1100 + price = 180 items = list( /obj/machinery/portable_atmospherics/canister/air ) @@ -87,7 +87,7 @@ name = "Canister (Boron)" supplier = "hephaestus" description = "Holds boron gas. Has a built-in valve to allow for filling portable tanks." - price = 1500 + price = 380 items = list( /obj/machinery/portable_atmospherics/canister/boron ) @@ -101,7 +101,7 @@ name = "Canister (CO2)" supplier = "hephaestus" description = "Holds heavy CO2 gas. Has a built-in valve to allow for filling portable tanks." - price = 800 + price = 300 items = list( /obj/machinery/portable_atmospherics/canister/carbon_dioxide ) @@ -115,7 +115,7 @@ name = "Canister (Hydrogen)" supplier = "hephaestus" description = "Holds flammable hydrogen. Has a built-in valve to allow for filling portable tanks." - price = 800 + price = 350 items = list( /obj/machinery/portable_atmospherics/canister/hydrogen ) @@ -129,7 +129,7 @@ name = "Canister (Helium)" supplier = "hephaestus" description = "Holds voice-changing helium. Has a built-in valve to allow for filling portable tanks." - price = 800 + price = 320 items = list( /obj/machinery/portable_atmospherics/canister/helium ) @@ -143,7 +143,7 @@ name = "Canister (Nitrogen)" supplier = "hephaestus" description = "Holds inert nitrogen. Has a built-in valve to allow for filling portable tanks." - price = 1000 + price = 320 items = list( /obj/machinery/portable_atmospherics/canister/nitrogen ) @@ -157,7 +157,7 @@ name = "Canister (Nitrous Oxide)" supplier = "hephaestus" description = "Holds sleepy nitrous oxide. Has a built-in valve to allow for filling portable tanks." - price = 1500 + price = 650 items = list( /obj/machinery/portable_atmospherics/canister/sleeping_agent ) @@ -171,7 +171,7 @@ name = "Canister (Oxygen)" supplier = "hephaestus" description = "Holds precious oxygen. Has a built-in valve to allow for filling portable tanks." - price = 1500 + price = 450 items = list( /obj/machinery/portable_atmospherics/canister/oxygen ) @@ -185,7 +185,7 @@ name = "Canister (Phoron)" supplier = "nanotrasen" description = "Holds valuable phoron gas. Has a built-in valve to allow for filling portable tanks." - price = 5000 + price = 5500 items = list( /obj/machinery/portable_atmospherics/canister/phoron ) @@ -199,7 +199,7 @@ name = "pipe dispenser" supplier = "hephaestus" description = "It dispenses pipes, no idea how though." - price = 500 + price = 90 items = list( /obj/machinery/pipedispenser/orderable ) @@ -213,7 +213,7 @@ name = "pipe painter" supplier = "hephaestus" description = "Its said that green pipes are safe to travel through." - price = 135 + price = 25 items = list( /obj/item/device/pipe_painter ) @@ -227,7 +227,7 @@ name = "Rapid Fabrication Device P-Class" supplier = "hephaestus" description = "A heavily modified RFD, modified to construct pipes and piping accessories." - price = 255 + price = 45 items = list( /obj/item/rfd/piping ) @@ -240,8 +240,8 @@ category = "atmos" name = "atmospherics voidsuit" supplier = "hephaestus" - description = "A special suit that protects against hazardous, low pressure environments. Has unmatched thermal protection and minor radiation." - price = 1200 + description = "A special suit that protects against hazardous, low pressure environments. Has unmatched thermal protection and minor radiation protection." + price = 800 items = list( /obj/item/clothing/suit/space/void/atmos ) @@ -254,8 +254,8 @@ category = "atmos" name = "atmospherics voidsuit helmet" supplier = "hephaestus" - description = "A special helmet designed for work in a hazardous, low pressure environments. Has unmatched thermal and minor radiation protect." - price = 850 + description = "A special helmet designed for work in a hazardous, low pressure environments. Has unmatched thermal and minor radiation protection." + price = 500 items = list( /obj/item/clothing/head/helmet/space/void/atmos ) diff --git a/code/modules/cargo/items/cartridges.dm b/code/modules/cargo/items/cartridges.dm index e56493c8bcb..9d3b7d6e6f1 100644 --- a/code/modules/cargo/items/cartridges.dm +++ b/code/modules/cargo/items/cartridges.dm @@ -3,7 +3,7 @@ name = "empty chemical cartridge" supplier = "zeng_hu" description = "A metal canister containing absolutely nothing. Fill to your heart's desire." - price = 10 + price = 5 items = list( /obj/item/reagent_containers/chem_disp_cartridge ) @@ -17,7 +17,7 @@ name = "drink cartridge - ale" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 22 items = list( /obj/item/reagent_containers/chem_disp_cartridge/ale ) @@ -31,7 +31,7 @@ name = "chemical cartridge - beer" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 22 items = list( /obj/item/reagent_containers/chem_disp_cartridge/beer ) @@ -45,7 +45,7 @@ name = "drink cartridge - champagne" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/champagne ) @@ -59,7 +59,7 @@ name = "drink cartridge - coffee" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 24 items = list( /obj/item/reagent_containers/chem_disp_cartridge/coffee ) @@ -73,7 +73,7 @@ name = "drink cartridge - cognac" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/cognac ) @@ -87,7 +87,7 @@ name = "drink cartridge - cola" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/cola ) @@ -101,7 +101,7 @@ name = "drink cartridge - cream" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/cream ) @@ -115,7 +115,7 @@ name = "drink cartridge - dr gibb" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/dr_gibb ) @@ -129,7 +129,7 @@ name = "drink cartridge - gin" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 45 items = list( /obj/item/reagent_containers/chem_disp_cartridge/gin ) @@ -143,7 +143,7 @@ name = "drink cartridge - ice" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/ice ) @@ -157,7 +157,7 @@ name = "drink cartridge - iced tea" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 21 items = list( /obj/item/reagent_containers/chem_disp_cartridge/icetea ) @@ -171,7 +171,7 @@ name = "drink cartridge - kahlua" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 35 items = list( /obj/item/reagent_containers/chem_disp_cartridge/kahlua ) @@ -185,7 +185,7 @@ name = "drink cartridge - lemon lime" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime ) @@ -199,7 +199,7 @@ name = "drink cartridge - lime juice" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/lime ) @@ -213,7 +213,7 @@ name = "drink cartridge - mead" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 30 items = list( /obj/item/reagent_containers/chem_disp_cartridge/mead ) @@ -227,7 +227,7 @@ name = "drink cartridge - orange juice" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/orange ) @@ -241,7 +241,7 @@ name = "drink cartridge - rum" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 45 items = list( /obj/item/reagent_containers/chem_disp_cartridge/rum ) @@ -255,7 +255,7 @@ name = "drink cartridge - Stellar Jolt" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/smw ) @@ -269,7 +269,7 @@ name = "drink cartridge - soda water" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/sodawater ) @@ -283,7 +283,7 @@ name = "drink cartridge - Vacuum Fizz" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/spaceup ) @@ -297,7 +297,7 @@ name = "drink cartridge - tea" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/tea ) @@ -311,7 +311,7 @@ name = "drink cartridge - tequila" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 45 items = list( /obj/item/reagent_containers/chem_disp_cartridge/tequila ) @@ -325,7 +325,7 @@ name = "drink cartridge - tonic" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 45 items = list( /obj/item/reagent_containers/chem_disp_cartridge/tonic ) @@ -339,7 +339,7 @@ name = "drink cartridge - vermouth" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 45 items = list( /obj/item/reagent_containers/chem_disp_cartridge/vermouth ) @@ -353,7 +353,7 @@ name = "drink cartridge - vodka" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 45 items = list( /obj/item/reagent_containers/chem_disp_cartridge/vodka ) @@ -367,7 +367,7 @@ name = "drink cartridge - watermelon" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 18 items = list( /obj/item/reagent_containers/chem_disp_cartridge/watermelon ) @@ -381,7 +381,7 @@ name = "drink cartridge - whiskey" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 45 items = list( /obj/item/reagent_containers/chem_disp_cartridge/whiskey ) @@ -395,7 +395,7 @@ name = "drink cartridge - wine" supplier = "getmore" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 80 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/wine ) @@ -411,7 +411,7 @@ name = "chemical cartridge - acetone" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 48 items = list( /obj/item/reagent_containers/chem_disp_cartridge/acetone ) @@ -425,7 +425,7 @@ name = "chemical cartridge - aluminum" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 42 items = list( /obj/item/reagent_containers/chem_disp_cartridge/aluminum ) @@ -439,7 +439,7 @@ name = "chemical cartridge - ammonia" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 36 items = list( /obj/item/reagent_containers/chem_disp_cartridge/ammonia ) @@ -453,7 +453,7 @@ name = "chemical cartridge - carbon" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 35 items = list( /obj/item/reagent_containers/chem_disp_cartridge/carbon ) @@ -467,7 +467,7 @@ name = "chemical cartridge - copper" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 40 items = list( /obj/item/reagent_containers/chem_disp_cartridge/copper ) @@ -495,7 +495,7 @@ name = "chemical cartridge - hydrazine" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 1200 items = list( /obj/item/reagent_containers/chem_disp_cartridge/hydrazine ) @@ -509,7 +509,7 @@ name = "chemical cartridge - hydrochloric acid" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/hclacid ) @@ -523,7 +523,7 @@ name = "chemical cartridge - iron" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 40 items = list( /obj/item/reagent_containers/chem_disp_cartridge/iron ) @@ -537,7 +537,7 @@ name = "chemical cartridge - lithium" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 450 items = list( /obj/item/reagent_containers/chem_disp_cartridge/lithium ) @@ -551,7 +551,7 @@ name = "chemical cartridge - mercury" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 65 items = list( /obj/item/reagent_containers/chem_disp_cartridge/mercury ) @@ -565,7 +565,7 @@ name = "chemical cartridge - phosphorus" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 350 items = list( /obj/item/reagent_containers/chem_disp_cartridge/phosphorus ) @@ -579,7 +579,7 @@ name = "chemical cartridge - potassium" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 55 items = list( /obj/item/reagent_containers/chem_disp_cartridge/potassium ) @@ -593,7 +593,7 @@ name = "chemical cartridge - radium" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 3000 items = list( /obj/item/reagent_containers/chem_disp_cartridge/radium ) @@ -607,7 +607,7 @@ name = "chemical cartridge - silicon" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 40 items = list( /obj/item/reagent_containers/chem_disp_cartridge/silicon ) @@ -621,7 +621,7 @@ name = "chemical cartridge - sodium" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 70 items = list( /obj/item/reagent_containers/chem_disp_cartridge/sodium ) @@ -635,7 +635,7 @@ name = "chemical cartridge - sugar" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 3.50 items = list( /obj/item/reagent_containers/chem_disp_cartridge/sugar ) @@ -649,7 +649,7 @@ name = "chemical cartridge - sulfur" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 7.50 items = list( /obj/item/reagent_containers/chem_disp_cartridge/sulfur ) @@ -663,7 +663,7 @@ name = "chemical cartridge - sulfuric acid" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 40 items = list( /obj/item/reagent_containers/chem_disp_cartridge/sacid ) @@ -677,7 +677,7 @@ name = "chemical cartridge - tungsten" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 70 items = list( /obj/item/reagent_containers/chem_disp_cartridge/tungsten ) @@ -691,7 +691,7 @@ name = "chemical cartridge - water" supplier = "zeng_hu" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 150 + price = 1.50 items = list( /obj/item/reagent_containers/chem_disp_cartridge/water ) @@ -707,7 +707,7 @@ name = "chemical cartridge - dylovene" supplier = "iac" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 350 + price = 1400 items = list( /obj/item/reagent_containers/chem_disp_cartridge/dylovene ) @@ -721,7 +721,7 @@ name = "chemical cartridge - inaprovaline" supplier = "iac" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 350 + price = 1600 items = list( /obj/item/reagent_containers/chem_disp_cartridge/inaprov ) @@ -735,7 +735,7 @@ name = "chemical cartridge - thetamycin" supplier = "iac" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 350 + price = 2500 items = list( /obj/item/reagent_containers/chem_disp_cartridge/thetamycin ) @@ -749,7 +749,7 @@ name = "chemical cartridge - perconol" supplier = "iac" description = "A metal canister containing 500 units of a substance. Mostly for use in liquid dispensers, though you can also pour it straight out of the can." - price = 350 + price = 1800 items = list( /obj/item/reagent_containers/chem_disp_cartridge/perconol ) diff --git a/code/modules/cargo/items/custodial.dm b/code/modules/cargo/items/custodial.dm index 8718c474495..16b4c7479c8 100644 --- a/code/modules/cargo/items/custodial.dm +++ b/code/modules/cargo/items/custodial.dm @@ -3,7 +3,7 @@ name = "space cleaner" supplier = "blam" description = "BLAM!-brand non-foaming space cleaner! Perfect for those pesky stains." - price = 50 + price = 12 items = list( /obj/item/reagent_containers/spray/cleaner ) @@ -17,7 +17,7 @@ name = "basic soap" supplier = "blam" description = "A basic bar of soap. It cleans, and does absolutely nothing else." - price = 8 + price = 2 items = list( /obj/item/soap ) @@ -31,7 +31,7 @@ name = "random premium soaps (x3)" supplier = "blam" description = "A selection of premium random soaps, as part of a variety pack." - price = 70 + price = 18 items = list( /obj/random/soap ) @@ -45,7 +45,7 @@ name = "trash bag (x3)" supplier = "blam" description = "Heavy duty polymer trash bags." - price = 20 + price = 5 items = list( /obj/item/storage/bag/trash ) @@ -59,7 +59,7 @@ name = "light replacer" supplier = "blam" description = "A device to automatically replace lights. Refill with working lightbulbs or sheets of glass." - price = 135 + price = 30 items = list( /obj/item/device/lightreplacer ) @@ -73,7 +73,7 @@ name = "box of replacement lights" supplier = "blam" description = "This box is shaped on the inside so that only light tubes and bulbs fit." - price = 100 + price = 22 items = list( /obj/item/storage/box/lights/mixed ) @@ -87,7 +87,7 @@ name = "wet floor sign (x5)" supplier = "blam" description = "A resupply pack of wet floor signs." - price = 20 + price = 6 items = list( /obj/item/clothing/suit/caution ) @@ -101,7 +101,7 @@ name = "mop" supplier = "blam" description = "A cleaning utensil consisting of a fabric head attached to a stick." - price = 40 + price = 12 items = list( /obj/item/mop ) @@ -115,7 +115,7 @@ name = "mop bucket" supplier = "blam" description = "Fits onto a standard janitorial cart. Fill it with water, but don't forget a mop!" - price = 40 + price = 8 items = list( /obj/structure/mopbucket ) @@ -129,7 +129,7 @@ name = "cleaner grenade" supplier = "blam" description = "Space cleaner packaged into a wide area dispersal system for rapid and efficient cleaning of surfaces. Slippery." - price = 225 + price = 50 items = list( /obj/item/grenade/chem_grenade/cleaner ) @@ -143,7 +143,7 @@ name = "custodial cart" supplier = "blam" description = "The ultimate in custodial carts. Has space for water, mops, signs, trash bags, and more." - price = 850 + price = 190 items = list( /obj/structure/janitorialcart ) diff --git a/code/modules/cargo/items/engineering.dm b/code/modules/cargo/items/engineering.dm index 46dbb393af2..11d721efa1f 100644 --- a/code/modules/cargo/items/engineering.dm +++ b/code/modules/cargo/items/engineering.dm @@ -3,7 +3,7 @@ name = "glass sheets" supplier = "hephaestus" description = "50 sheets of glass." - price = 275 + price = 55 items = list( /obj/item/stack/material/glass/full ) @@ -16,7 +16,7 @@ name = "plasteel sheets" supplier = "hephaestus" description = "50 sheets of plasteel." - price = 700 + price = 120 items = list( /obj/item/stack/material/plasteel/full ) @@ -30,7 +30,7 @@ name = "plastic sheets" supplier = "hephaestus" description = "50 sheets of plastic." - price = 250 + price = 45 items = list( /obj/item/stack/material/plastic/full ) @@ -44,7 +44,7 @@ name = "steel sheets" supplier = "hephaestus" description = "50 sheets of steel." - price = 400 + price = 75 items = list( /obj/item/stack/material/steel/full ) @@ -58,7 +58,7 @@ name = "wood planks" supplier = "hephaestus" description = "50 planks of wood." - price = 350 + price = 65 items = list( /obj/item/stack/material/wood/full ) @@ -72,7 +72,7 @@ name = "phoron crystals" supplier = "hephaestus" description = "A bunch of 50 phoron crystals. Highly valuable." - price = 2200 + price = 2250 items = list( /obj/item/stack/material/phoron/full ) @@ -85,7 +85,7 @@ name = "cardboard sheets" supplier = "orion" description = "50 sheets of cardboard." - price = 50 + price = 10 items = list( /obj/item/stack/material/cardboard/full ) @@ -99,7 +99,7 @@ name = "carpet (x10)" supplier = "hephaestus" description = "Ten carpet sheets. It is the same size as a normal floor tile!" - price = 350 + price = 60 items = list( /obj/item/stack/tile/carpet ) @@ -113,7 +113,7 @@ name = "antifuel grenade" supplier = "hephaestus" description = "This grenade is loaded with a foaming antifuel compound -- the twenty-fifth century standard for eliminating industrial spills." - price = 250 + price = 45 items = list( /obj/item/grenade/chem_grenade/antifuel ) @@ -127,7 +127,7 @@ name = "brown webbing vest" supplier = "hephaestus" description = "Worn brownish synthcotton vest with lots of pockets to unload your hands." - price = 83 + price = 15 items = list( /obj/item/clothing/accessory/storage/brown_vest ) @@ -141,7 +141,7 @@ name = "circuit board (bubble shield generator)" supplier = "hephaestus" description = "Looks like a circuit. Probably is." - price = 1500 + price = 250 items = list( /obj/item/circuitboard/shield_gen ) @@ -155,7 +155,7 @@ name = "circuit board (hull shield generator)" supplier = "hephaestus" description = "Looks like a circuit. Probably is." - price = 1500 + price = 250 items = list( /obj/item/circuitboard/shield_gen_ex ) @@ -169,7 +169,7 @@ name = "circuit board (shield capacitor)" supplier = "hephaestus" description = "Looks like a circuit. Probably is." - price = 1500 + price = 250 items = list( /obj/item/circuitboard/shield_cap ) @@ -183,7 +183,7 @@ name = "circuit board (solar control console)" supplier = "hephaestus" description = "Looks like a circuit. Probably is." - price = 1500 + price = 250 items = list( /obj/item/circuitboard/solar_control ) @@ -197,7 +197,7 @@ name = "coolant tank" supplier = "hephaestus" description = "A tank of industrial coolant." - price = 45 + price = 10 items = list( /obj/structure/reagent_dispensers/coolanttank ) @@ -211,7 +211,7 @@ name = "Disposal Pipe Dispenser" supplier = "hephaestus" description = "It dispenses bigger pipes for things to travel through. No, the pipes aren't green." - price = 150 + price = 30 items = list( /obj/machinery/pipedispenser/disposal/orderable ) @@ -225,7 +225,7 @@ name = "mechanical toolbox" supplier = "hephaestus" description = "Danger. Very robust." - price = 200 + price = 45 items = list( /obj/item/storage/toolbox/mechanical ) @@ -239,7 +239,7 @@ name = "electrical toolbox" supplier = "hephaestus" description = "Danger. Very robust." - price = 200 + price = 45 items = list( /obj/item/storage/toolbox/electrical ) @@ -253,7 +253,7 @@ name = "emergency toolbox" supplier = "hephaestus" description = "Danger. Very robust." - price = 120 + price = 42 items = list( /obj/item/storage/toolbox/emergency ) @@ -267,7 +267,7 @@ name = "EM Acceleration Chamber" supplier = "hephaestus" description = "Part of a Particle Accelerator." - price = 3000 + price = 1550 items = list( /obj/structure/particle_accelerator/fuel_chamber ) @@ -281,7 +281,7 @@ name = "EM Containment Grid Center" supplier = "hephaestus" description = "Part of a Particle Accelerator." - price = 3000 + price = 1550 items = list( /obj/structure/particle_accelerator/particle_emitter/center ) @@ -295,7 +295,7 @@ name = "EM Containment Grid Left" supplier = "hephaestus" description = "Part of a Particle Accelerator." - price = 3000 + price = 1550 items = list( /obj/structure/particle_accelerator/particle_emitter/left ) @@ -309,7 +309,7 @@ name = "EM Containment Grid Right" supplier = "hephaestus" description = "Part of a Particle Accelerator." - price = 3000 + price = 1550 items = list( /obj/structure/particle_accelerator/particle_emitter/right ) @@ -323,7 +323,7 @@ name = "emergency bluespace relay circuit" supplier = "hephaestus" description = "Looks like a circuit. Probably is." - price = 3000 + price = 620 items = list( /obj/item/circuitboard/bluespacerelay ) @@ -337,7 +337,7 @@ name = "emitter" supplier = "hephaestus" description = "It is a heavy duty industrial laser." - price = 1500 + price = 1850 items = list( /obj/machinery/power/emitter ) @@ -348,10 +348,10 @@ /singleton/cargo_item/doorlock_engineering category = "engineering" - name = "engineering magnetic door lock - engineering" + name = "magnetic door lock - engineering" supplier = "hephaestus" description = "A large, ID locked device used for completely locking down airlocks. It is painted with Engineering colors." - price = 135 + price = 48 items = list( /obj/item/device/magnetic_lock/engineering ) @@ -365,7 +365,7 @@ name = "engineering voidsuit" supplier = "hephaestus" description = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding." - price = 1200 + price = 800 items = list( /obj/item/clothing/suit/space/void/engineering ) @@ -379,7 +379,7 @@ name = "engineering voidsuit helmet" supplier = "hephaestus" description = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding." - price = 850 + price = 500 items = list( /obj/item/clothing/head/helmet/space/void/engineering ) @@ -393,7 +393,7 @@ name = "Field Generator" supplier = "hephaestus" description = "A large thermal battery that projects a high amount of energy when powered." - price = 1500 + price = 250 items = list( /obj/machinery/field_generator ) @@ -407,7 +407,7 @@ name = "fireaxe" supplier = "hephaestus" description = "The fire axe is a wooden handled axe with a heavy steel head intended for firefighting use." - price = 1500 + price = 25 items = list( /obj/item/material/twohanded/fireaxe ) @@ -421,7 +421,7 @@ name = "fuel tank" supplier = "hephaestus" description = "A tank filled with welding fuel." - price = 45 + price = 10 items = list( /obj/structure/reagent_dispensers/fueltank ) @@ -435,7 +435,7 @@ name = "gas mask" supplier = "hephaestus" description = "A face-covering mask that can be connected to an air supply. Filters harmful gases from the air." - price = 75 + price = 15 items = list( /obj/item/clothing/mask/gas ) @@ -451,7 +451,7 @@ name = "hard hat" supplier = "hephaestus" description = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight." - price = 35 + price = 7 items = list( /obj/item/clothing/head/hardhat ) @@ -465,7 +465,7 @@ name = "hazard vest" supplier = "hephaestus" description = "A high-visibility vest used in work zones." - price = 90 + price = 5 items = list( /obj/item/clothing/suit/storage/hazardvest ) @@ -479,7 +479,7 @@ name = "full toolbelt" supplier = "hephaestus" description = "A toolbelt, filled with basic mechanics' tools." - price = 500 + price = 80 items = list( /obj/item/storage/belt/utility/full ) @@ -493,7 +493,7 @@ name = "high-capacity power cell" supplier = "hephaestus" description = "A high-capacity rechargable electrochemical power cell." - price = 240 + price = 45 items = list( /obj/item/cell/high ) @@ -507,7 +507,7 @@ name = "power cell" supplier = "hephaestus" description = "A rechargable electrochemical power cell." - price = 90 + price = 20 items = list( /obj/item/cell ) @@ -521,7 +521,7 @@ name = "hoist kit" supplier = "hephaestus" description = "A setup kit for a hoist that can be used to lift things. The hoist will deploy in the direction you're facing." - price = 225 + price = 40 items = list( /obj/item/hoist_kit ) @@ -535,7 +535,7 @@ name = "inflatable barrier box" supplier = "hephaestus" description = "Contains inflatable walls and doors." - price = 360 + price = 65 items = list( /obj/item/storage/bag/inflatable ) @@ -549,7 +549,7 @@ name = "insulated gloves" supplier = "hephaestus" description = "These gloves will protect the wearer from electric shock." - price = 450 + price = 72 items = list( /obj/item/clothing/gloves/yellow ) @@ -563,7 +563,7 @@ name = "tajaran electrical gloves" supplier = "hephaestus" description = "These gloves will protect the wearer from electric shock. Made special for Tajaran use." - price = 450 + price = 74 items = list( /obj/item/clothing/gloves/yellow/specialt ) @@ -577,7 +577,7 @@ name = "unathi electrical gloves" supplier = "hephaestus" description = "These gloves will protect the wearer from electric shock. Made special for Unathi use." - price = 450 + price = 74 items = list( /obj/item/clothing/gloves/yellow/specialu ) @@ -591,7 +591,7 @@ name = "packaged antimatter reactor section" supplier = "eckharts" description = "A section of antimatter reactor shielding. Do not eat." - price = 1000 + price = 220 items = list( /obj/item/device/am_shielding_container ) @@ -605,7 +605,7 @@ name = "debugger" supplier = "hephaestus" description = "Used to debug electronic equipment." - price = 50 + price = 12 items = list( /obj/item/device/debugger ) @@ -619,7 +619,7 @@ name = "impact wrench" supplier = "hephaestus" description = "Wrenches and screws things. Faster." - price = 50 + price = 12 items = list( /obj/item/powerdrill ) @@ -633,7 +633,7 @@ name = "paint gun" supplier = "hephaestus" description = "Useful for designating areas and pissing off coworkers." - price = 135 + price = 25 items = list( /obj/item/device/paint_sprayer ) @@ -647,7 +647,7 @@ name = "Particle Accelerator Control Computer" supplier = "hephaestus" description = "This controls the density of the particles." - price = 1500 + price = 2250 items = list( /obj/machinery/particle_accelerator/control_box ) @@ -661,7 +661,7 @@ name = "Particle Focusing EM Lens" supplier = "hephaestus" description = "Part of a Particle Accelerator." - price = 3000 + price = 1250 items = list( /obj/structure/particle_accelerator/power_box ) @@ -675,7 +675,7 @@ name = "portable ladder" supplier = "hephaestus" description = "A lightweight deployable ladder, which you can use to move up or down. Or alternatively, you can bash some faces in." - price = 200 + price = 40 items = list( /obj/item/ladder_mobile ) @@ -689,7 +689,7 @@ name = "radiation Hood" supplier = "hephaestus" description = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation." - price = 375 + price = 70 items = list( /obj/item/clothing/head/radiation ) @@ -703,7 +703,7 @@ name = "radiation suit" supplier = "hephaestus" description = "A suit that protects against radiation. Label: Made with lead, do not eat insulation." - price = 675 + price = 120 items = list( /obj/item/clothing/suit/radiation ) @@ -717,7 +717,7 @@ name = "research shuttle console board" supplier = "hephaestus" description = "A replacement board for the research shuttle console, in case the original console is destroyed." - price = 500 + price = 125 items = list( /obj/item/circuitboard/research_shuttle ) @@ -731,7 +731,7 @@ name = "singularity generator" supplier = "hephaestus" description = "Used to generate a Singularity. It is not adviced to use this on the asteroid." - price = 20000 + price = 17000 items = list( /obj/machinery/the_singularitygen ) @@ -745,7 +745,7 @@ name = "superconductive magnetic coil" supplier = "hephaestus" description = "Standard superconductive magnetic coil with average capacity and I/O rating." - price = 1800 + price = 800 items = list( /obj/item/smes_coil ) @@ -759,7 +759,7 @@ name = "supermatter crystal" supplier = "hephaestus" description = "An unstable, radioactive crystal that forms the power source of several experimental ships and stations. Extremely dangerous." - price = 30000 + price = 18500 items = list( /obj/machinery/power/supermatter ) @@ -773,7 +773,7 @@ name = "thermoelectric generator kit" supplier = "hephaestus" description = "A kit that comes with a thermoelectric generator and two circulators that attach to it. For usage in high-power energy generation." - price = 7500 + price = 1200 items = list( /obj/machinery/power/generator, /obj/machinery/atmospherics/binary/circulator, @@ -789,7 +789,7 @@ name = "solar panel assembly" supplier = "hephaestus" description = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker." - price = 1020 + price = 350 items = list( /obj/item/solar_assembly ) @@ -803,7 +803,7 @@ name = "tracker electronics" supplier = "hephaestus" description = "Electronic guidance systems for a solar array." - price = 225 + price = 100 items = list( /obj/item/tracker_electronics ) @@ -817,7 +817,7 @@ name = "watertank" supplier = "hephaestus" description = "A tank filled with water." - price = 45 + price = 10 items = list( /obj/structure/reagent_dispensers/watertank ) @@ -831,7 +831,7 @@ name = "welding helmet" supplier = "hephaestus" description = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." - price = 225 + price = 20 items = list( /obj/item/clothing/head/welding ) @@ -845,7 +845,7 @@ name = "antimatter containment jar" supplier = "eckharts" description = "Holds antimatter. Warranty void if exposed to matter." - price = 1000 + price = 280 items = list( /obj/item/am_containment ) @@ -859,7 +859,7 @@ name = "antimatter control unit" supplier = "eckharts" description = "The control unit for an antimatter reactor. Probably safe." - price = 5500 + price = 1950 items = list( /obj/machinery/power/am_control_unit ) @@ -873,7 +873,7 @@ name = "Alpha Particle Generation Array" supplier = "hephaestus" description = "Part of a Particle Accelerator." - price = 3000 + price = 1550 items = list( /obj/structure/particle_accelerator/end_cap ) @@ -887,7 +887,7 @@ name = "radiation collector array" supplier = "hephaestus" description = "A radiation collector array. Used to augment the power generation of a generator that emits ionising radiation." - price = 2000 + price = 650 items = list( /obj/machinery/power/rad_collector ) diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm index fbc1dd8c22d..32ba053c720 100644 --- a/code/modules/cargo/items/hospitality.dm +++ b/code/modules/cargo/items/hospitality.dm @@ -3,7 +3,7 @@ name = "meat (x5)" supplier = "getmore" description = "Slabs of real meat, from real animals. Freshly frozen and extremely not-vegan." - price = 160 + price = 55 items = list( /obj/item/reagent_containers/food/snacks/meat ) @@ -17,7 +17,7 @@ name = "chicken breast (x5)" supplier = "getmore" description = "Boneless chicken breast fillets, for chicken-y recipes." - price = 160 + price = 65 items = list( /obj/item/reagent_containers/food/snacks/meat/chicken ) @@ -31,7 +31,7 @@ name = "synthetic meat (x5)" supplier = "getmore" description = "Slabs of synthetic meat, grown in a factory. More or less identical to the real thing, but without the animal sacrifice." - price = 140 + price = 55 items = list( /obj/item/reagent_containers/food/snacks/meat/syntiflesh ) @@ -45,7 +45,7 @@ name = "adhomian meat (x5)" supplier = "zharkov" description = "A handful of meat slices from Adhomian animals. Freshly frozen." - price = 200 + price = 75 items = list( /obj/item/reagent_containers/food/snacks/meat/adhomai ) @@ -59,7 +59,7 @@ name = "fish fillet (x5)" supplier = "getmore" description = "Raw fish fillets, sourced from an aquaponics farm. Freshly frozen." - price = 150 + price = 55 items = list( /obj/item/reagent_containers/food/snacks/fish/fishfillet ) @@ -73,7 +73,7 @@ name = "moghresian meat (x5)" supplier = "arizi" description = "Slabs of meat from animals native to Moghes. Freshly frozen." - price = 200 + price = 80 items = list( /obj/item/reagent_containers/food/snacks/meat/moghes ) @@ -87,7 +87,7 @@ name = "squid meat (x5)" supplier = "getmore" description = "Squid meat, meat from squid. Makes for some tasty calamari." - price = 150 + price = 65 items = list( /obj/item/reagent_containers/food/snacks/squidmeat ) @@ -101,7 +101,7 @@ name = "worm fillet (x5)" supplier = "nanotrasen" description = "Exotic meat from a Cavern Dweller. Mildly toxic if prepared improperly." - price = 350 + price = 90 items = list( /obj/item/reagent_containers/food/snacks/dwellermeat ) @@ -115,7 +115,7 @@ name = "roe sack (x5)" supplier = "getmore" description = "A fleshy organ filled with fish eggs." - price = 160 + price = 80 items = list( /obj/item/reagent_containers/food/snacks/fish/roe ) @@ -129,7 +129,7 @@ name = "box of Silversun crab legs" supplier = "idris" description = "A box filled with high-quality crab legs from Silversun. Shipped by popular demand!" - price = 200 + price = 120 items = list( /obj/item/storage/box/crabmeat ) @@ -143,7 +143,7 @@ name = "box of Ras'val clams" supplier = "zharkov" description = "A box filled with clams from the Ras'val sea, imported from Adhomai." - price = 200 + price = 85 items = list( /obj/item/storage/box/clams ) @@ -152,12 +152,26 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/hmatrrafillet + category = "hospitality" + name = "Hma'trra fillet" + supplier = "zharkov" + description = "A fillet of glacier worm meat." + price = 45 + items = list( + /obj/item/reagent_containers/food/snacks/hmatrrameat + ) + access = 0 + container_type = "freezer" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/producebox category = "hospitality" name = "produce box" supplier = "nanotrasen" description = "A large box of random, leftover produce." - price = 100 + price = 35 items = list( /obj/item/storage/box/produce ) @@ -171,7 +185,7 @@ name = "space spices" supplier = "getmore" description = "An exotic blend of spices for cooking. It must flow." - price = 60 + price = 15 items = list( /obj/item/reagent_containers/food/condiment/shaker/spacespice ) @@ -185,7 +199,7 @@ name = "pepper mill" supplier = "getmore" description = "Often used to flavor food or make people sneeze." - price = 20 + price = 12 items = list( /obj/item/reagent_containers/food/condiment/shaker/peppermill ) @@ -199,7 +213,7 @@ name = "salt shaker" supplier = "getmore" description = "Salt. From space oceans, presumably." - price = 10 + price = 5 items = list( /obj/item/reagent_containers/food/condiment/shaker/salt ) @@ -213,7 +227,7 @@ name = "barbecue sauce" supplier = "getmore" description = "A bottle of tangy barbecue sauce." - price = 50 + price = 8 items = list( /obj/item/reagent_containers/food/condiment/barbecue ) @@ -227,7 +241,7 @@ name = "hot sauce" supplier = "getmore" description = "A bottle of spicy hot sauce." - price = 50 + price = 8 items = list( /obj/item/reagent_containers/food/condiment/hot_sauce ) @@ -241,7 +255,7 @@ name = "garlic sauce" supplier = "getmore" description = "A bottle of pungent garlic sauce." - price = 50 + price = 8 items = list( /obj/item/reagent_containers/food/condiment/garlicsauce ) @@ -255,7 +269,7 @@ name = "honey" supplier = "vysoka" description = "A premium bottle of bee honey." - price = 200 + price = 20 items = list( /obj/item/reagent_containers/food/condiment/honey ) @@ -269,7 +283,7 @@ name = "soy sauce" supplier = "getmore" description = "Savory, savory soy sauce." - price = 50 + price = 8 items = list( /obj/item/reagent_containers/food/condiment/soysauce ) @@ -283,7 +297,7 @@ name = "ketchup" supplier = "getmore" description = "Tomato ketchup. The condiment that needs no introduction." - price = 50 + price = 6 items = list( /obj/item/reagent_containers/food/condiment/ketchup ) @@ -297,7 +311,7 @@ name = "mayonnaise" supplier = "getmore" description = "A bottle of creamy mayonnaise." - price = 50 + price = 6 items = list( /obj/item/reagent_containers/food/condiment/mayonnaise ) @@ -311,7 +325,7 @@ name = "NTella jar" supplier = "getmore" description = "A jar of popular NTella-brand hazelnut chocolate spread." - price = 40 + price = 12 items = list( /obj/item/reagent_containers/food/condiment/ntella ) @@ -325,7 +339,7 @@ name = "peanut butter jar" supplier = "getmore" description = "Simultaneously smooth and chunky." - price = 40 + price = 9 items = list( /obj/item/reagent_containers/food/condiment/peanut_butter ) @@ -339,7 +353,7 @@ name = "cherry jelly jar" supplier = "getmore" description = "A cherry jelly jar." - price = 40 + price = 11 items = list( /obj/item/reagent_containers/food/condiment/cherry_jelly ) @@ -353,7 +367,7 @@ name = "grape jelly jar" supplier = "getmore" description = "A grape jelly jar." - price = 40 + price = 11 items = list( /obj/item/reagent_containers/food/condiment/grape_jelly ) @@ -367,7 +381,7 @@ name = "triglyceride bottle" supplier = "virgo" description = "A small bottle. Contains triglyceride." - price = 50 + price = 20 items = list( /obj/item/reagent_containers/glass/bottle/triglyceride ) @@ -381,7 +395,7 @@ name = "box of drinking glasses" supplier = "virgo" description = "A box of drinking glasses, for drinking purposes." - price = 21 + price = 25 items = list( /obj/item/storage/box/drinkingglasses ) @@ -395,7 +409,7 @@ name = "egg carton" supplier = "vysoka" description = "Eggs from mostly chicken." - price = 40 + price = 25 items = list( /obj/item/storage/box/fancy/egg_box ) @@ -409,7 +423,7 @@ name = "flour sack" supplier = "getmore" description = "A big bag of flour. Good for baking!" - price = 50 + price = 25 items = list( /obj/item/reagent_containers/food/condiment/flour ) @@ -423,7 +437,7 @@ name = "sugar sack" supplier = "getmore" description = "A big bag of sugar. Highly addictive." - price = 40 + price = 20 items = list( /obj/item/reagent_containers/food/condiment/sugar ) @@ -437,7 +451,7 @@ name = "rice sack" supplier = "vysoka" description = "A big bag of rice. For all your rice needs." - price = 50 + price = 22 items = list( /obj/item/reagent_containers/food/condiment/rice ) @@ -451,7 +465,7 @@ name = "universal enzyme" supplier = "getmore" description = "Used in cooking various dishes." - price = 30 + price = 15 items = list( /obj/item/reagent_containers/food/condiment/enzyme ) @@ -465,7 +479,7 @@ name = "milk carton" supplier = "getmore" description = "It's milk. White and nutritious goodness!" - price = 10 + price = 5 items = list( /obj/item/reagent_containers/food/drinks/carton/milk ) @@ -479,7 +493,7 @@ name = "soymilk carton" supplier = "getmore" description = "It's soy milk. White and nutritious vegan goodness!" - price = 15 + price = 3.50 items = list( /obj/item/reagent_containers/food/drinks/carton/soymilk ) @@ -493,7 +507,7 @@ name = "milk cream carton" supplier = "getmore" description = "It's cream. Made from milk. What else did you think you'd find in there?" - price = 15 + price = 3.50 items = list( /obj/item/reagent_containers/food/drinks/carton/cream ) @@ -507,7 +521,7 @@ name = "fatshouters milk carton" supplier = "getmore" description = "Fatty fatshouters milk in a carton." - price = 20 + price = 8.50 items = list( /obj/item/reagent_containers/food/drinks/carton/fatshouters ) @@ -521,7 +535,7 @@ name = "orange juice carton" supplier = "getmore" description = "Full of vitamins and deliciousness!" - price = 15 + price = 4 items = list( /obj/item/reagent_containers/food/drinks/carton/orangejuice ) @@ -535,7 +549,7 @@ name = "tomato juice carton" supplier = "getmore" description = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." - price = 15 + price = 4 items = list( /obj/item/reagent_containers/food/drinks/carton/tomatojuice ) @@ -549,7 +563,7 @@ name = "lime juice carton" supplier = "getmore" description = "Sweet-sour goodness." - price = 15 + price = 4 items = list( /obj/item/reagent_containers/food/drinks/carton/limejuice ) @@ -563,7 +577,7 @@ name = "cranberry juice carton" supplier = "getmore" description = "Tart and sweet. A unique flavor for a unique berry." - price = 15 + price = 4 items = list( /obj/item/reagent_containers/food/drinks/carton/cranberryjuice ) @@ -577,7 +591,7 @@ name = "lemon juice carton" supplier = "getmore" description = "This juice is VERY sour." - price = 15 + price = 4 items = list( /obj/item/reagent_containers/food/drinks/carton/lemonjuice ) @@ -591,7 +605,7 @@ name = "dyn juice carton" supplier = "getmore" description = "Juice from a Skrell medicinal herb. It's supposed to be diluted." - price = 20 + price = 4 items = list( /obj/item/reagent_containers/food/drinks/carton/dynjuice ) @@ -605,7 +619,7 @@ name = "apple juice carton" supplier = "getmore" description = "Juice from an apple. Yes." - price = 15 + price = 4 items = list( /obj/item/reagent_containers/food/drinks/carton/applejuice ) @@ -619,7 +633,7 @@ name = "chip multipack crate" supplier = "getmore" description = "A Getmore supply crate of multipack chip bags." - price = 400 + price = 25 items = list( /obj/item/storage/box/fancy/chips, /obj/item/storage/box/fancy/chips/cucumber, @@ -638,7 +652,7 @@ name = "dry rags (x5)" supplier = "blam" description = "For cleaning up messes, you suppose." - price = 20 + price = 10 items = list( /obj/item/reagent_containers/glass/rag, ) @@ -652,7 +666,7 @@ name = "flask" supplier = "virgo" description = "For those who can't be bothered to hang out at the bar to drink." - price = 55 + price = 15 items = list( /obj/item/reagent_containers/food/drinks/flask/barflask ) @@ -666,7 +680,7 @@ name = "Goldschlager" supplier = "zharkov" description = "A gold laced drink imported from noble houses within S'rand'marr." - price = 460 + price = 40 items = list( /obj/item/reagent_containers/food/drinks/bottle/goldschlager ) @@ -680,7 +694,7 @@ name = "Silverport champagne" supplier = "idris" description = "A rather fancy bottle of champagne, fit for collecting and storing in a cellar for decades." - price = 450 + price = 40 items = list( /obj/item/reagent_containers/food/drinks/bottle/champagne ) @@ -694,7 +708,7 @@ name = "Wrapp Artiste patron" supplier = "idris" description = "Silver laced tequila, served in space night clubs across the galaxy." - price = 510 + price = 45 items = list( /obj/item/reagent_containers/food/drinks/bottle/patron ) @@ -708,7 +722,7 @@ name = "Sarezhi Wine" supplier = "arizi" description = "A premium Moghean wine made from Sareszhi berries. Bottled by the Arizi Guild for over 200 years." - price = 400 + price = 35 items = list( /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine ) @@ -722,7 +736,7 @@ name = "shaker" supplier = "virgo" description = "A metal shaker to mix drinks in." - price = 85 + price = 20 items = list( /obj/item/reagent_containers/food/drinks/shaker ) @@ -736,7 +750,7 @@ name = "pizza box, margherita" supplier = "orion" description = "Classic Orion Express Pizza, delivered across the galaxy piping hot and ready to eat." - price = 50 + price = 10 items = list( /obj/item/pizzabox/margherita ) @@ -750,7 +764,7 @@ name = "pizza box, meat" supplier = "orion" description = "Meaty Orion Express Pizza, delivered across the galaxy piping hot and ready to eat." - price = 50 + price = 10 items = list( /obj/item/pizzabox/meat ) @@ -764,7 +778,7 @@ name = "pizza box, mushroom" supplier = "orion" description = "Earthy Orion Express Pizza, delivered across the galaxy piping hot and ready to eat." - price = 50 + price = 10 items = list( /obj/item/pizzabox/mushroom ) @@ -778,7 +792,7 @@ name = "pizza box, pineapple" supplier = "orion" description = "Tropical Orion Express Pizza, delivered across the galaxy piping hot and ready to eat." - price = 50 + price = 10 items = list( /obj/item/pizzabox/pineapple ) @@ -791,7 +805,7 @@ name = "pizza box, vegetable" supplier = "orion" description = "Vegetarian Orion Express Pizza, delivered across the galaxy piping hot and ready to eat." - price = 50 + price = 10 items = list( /obj/item/pizzabox/vegetable ) @@ -805,7 +819,7 @@ name = "pizza box, random" supplier = "orion" description = "An order of Orion Express ready-to-eat pizza with special instructions, 'Surprise Me'." - price = 40 + price = 10 items = list( /obj/random/pizzabox ) @@ -819,7 +833,7 @@ name = "red lipstick" supplier = "nanotrasen" description = "A generic brand of lipstick." - price = 8 + price = 5 items = list( /obj/item/lipstick/random ) @@ -833,7 +847,7 @@ name = "xuizi juice keg" supplier = "virgo" description = "A keg full of Xuizi juice, blended flower buds from the Moghean Xuizi cactus. The export stamp of the Arizi Guild is imprinted on the side." - price = 200 + price = 80 items = list( /obj/structure/reagent_dispensers/keg/xuizikeg ) @@ -847,7 +861,7 @@ name = "beer keg" supplier = "virgo" description = "A keg of refreshing, intoxicating beer." - price = 500 + price = 220 items = list( /obj/structure/reagent_dispensers/keg/beerkeg ) @@ -861,7 +875,7 @@ name = "mead barrel" supplier = "virgo" description = "A wooden mead barrel." - price = 650 + price = 300 items = list( /obj/structure/reagent_dispensers/keg/mead ) @@ -875,7 +889,7 @@ name = "Virklunder beer (x6)" supplier = "getmore" description = "A 6-pack yoke of Virklunder beers, for cracking open a cold one." - price = 220 + price = 18 items = list( /obj/item/storage/box/fancy/yoke/beer ) @@ -888,7 +902,7 @@ name = "Ebisu Super Dry rice beer (x6)" supplier = "getmore" description = "A 6-pack yoke of Ebisu Super Dry rice beer, for cracking open a cold one." - price = 220 + price = 22 items = list( /obj/item/storage/box/fancy/yoke/ebisu ) @@ -901,7 +915,7 @@ name = "Shimauma Ichiban rice beer (x6)" supplier = "getmore" description = "A 6-pack yoke of Shimauma Ichiban rice beer, for cracking open a cold one." - price = 220 + price = 20 items = list( /obj/item/storage/box/fancy/yoke/shimauma ) @@ -914,20 +928,7 @@ name = "Moonlabor Malt's rice beer (x6)" supplier = "getmore" description = "A 6-pack yoke of Moonlabor Malt's rice beer, for cracking open a cold one." - price = 220 - items = list( - /obj/item/storage/box/fancy/yoke/moonlabor - ) - access = 0 - container_type = "crate" - groupable = TRUE - -/singleton/cargo_item/moonlabor - category = "hospitality" - name = "Moonlabor Malt's rice beer (x6)" - supplier = "getmore" - description = "A 6-pack yoke of Moonlabor Malt's rice beer, for cracking open a cold one." - price = 220 + price = 18 items = list( /obj/item/storage/box/fancy/yoke/moonlabor ) @@ -940,7 +941,7 @@ name = "Inverkeithing Imports Earthmover ale (x6)" supplier = "getmore" description = "A 6-pack yoke of Inverkeithing Imports Earthmover ale, for cracking open a cold one." - price = 250 + price = 21 items = list( /obj/item/storage/box/fancy/yoke/earthmover ) @@ -953,7 +954,7 @@ name = "Whistling Forest Pale Ale (x6)" supplier = "getmore" description = "A 6-pack yoke of Whistling Forest Pale Ale, for cracking open a cold one." - price = 250 + price = 23 items = list( /obj/item/storage/box/fancy/yoke/whistlingforest ) @@ -966,7 +967,7 @@ name = "Comet Cola (x6)" supplier = "getmore" description = "A 6-pack yoke of Comet Cola for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/cola ) @@ -979,7 +980,7 @@ name = "Stellar Jolt (x6)" supplier = "getmore" description = "A 6-pack yoke of Stellar Jolt for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/space_mountain_wind ) @@ -987,38 +988,12 @@ container_type = "crate" groupable = TRUE -/singleton/cargo_item/thirteenloko - category = "hospitality" - name = "Stellar Jolt (x6)" - supplier = "getmore" - description = "A 6-pack yoke of Stellar Jolt for cracking open a cold one." - price = 80 - items = list( - /obj/item/storage/box/fancy/yoke/thirteenloko - ) - access = 0 - container_type = "crate" - groupable = TRUE - /singleton/cargo_item/thirteenloko category = "hospitality" name = "Getmore Energy (x6)" supplier = "getmore" description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." - price = 80 - items = list( - /obj/item/storage/box/fancy/yoke/thirteenloko - ) - access = 0 - container_type = "crate" - groupable = TRUE - -/singleton/cargo_item/thirteenloko - category = "hospitality" - name = "Getmore Energy (x6)" - supplier = "getmore" - description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/thirteenloko ) @@ -1030,21 +1005,8 @@ category = "hospitality" name = "Getmore Root-Cola (x6)" supplier = "getmore" - description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." - price = 80 - items = list( - /obj/item/storage/box/fancy/yoke/dr_gibb - ) - access = 0 - container_type = "crate" - groupable = TRUE - -/singleton/cargo_item/dr_gibb - category = "hospitality" - name = "Getmore Root-Cola (x6)" - supplier = "getmore" - description = "A 6-pack yoke of Getmore Energy for cracking open a cold one." - price = 80 + description = "A 6-pack yoke of Getmore Root-Cola for cracking open a cold one." + price = 8 items = list( /obj/item/storage/box/fancy/yoke/dr_gibb ) @@ -1057,7 +1019,7 @@ name = "Orange Starshine (x6)" supplier = "getmore" description = "A 6-pack yoke of Orange Starshine for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/starkist ) @@ -1065,12 +1027,12 @@ container_type = "crate" groupable = TRUE -/singleton/cargo_item/space_up +/singleton/cargo_item/vacuum_fizz category = "hospitality" name = "Vacuum Fizz (x6)" supplier = "getmore" description = "A 6-pack yoke of Vacuum Fizz for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/space_up ) @@ -1078,14 +1040,14 @@ container_type = "crate" groupable = TRUE -/singleton/cargo_item/space_up +/singleton/cargo_item/lemon_lime category = "hospitality" - name = "Lemon-Lime (x6)" + name = "Lemon-Lime soda (x6)" supplier = "getmore" description = "A 6-pack yoke of Lemon-Lime for cracking open a cold one." - price = 80 + price = 8 items = list( - /obj/item/storage/box/fancy/yoke/space_up + /obj/item/storage/box/fancy/yoke/lemon_lime ) access = 0 container_type = "crate" @@ -1096,7 +1058,7 @@ name = "Silversun Wave Iced Tea (x6)" supplier = "getmore" description = "A 6-pack yoke of Silversun Wave Iced Tea for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/iced_tea ) @@ -1109,7 +1071,7 @@ name = "Grapel Juice (x6)" supplier = "getmore" description = "A 6-pack yoke of Grapel Juice for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/grape_juice ) @@ -1122,7 +1084,7 @@ name = "T-Borg's Tonic Water (x6)" supplier = "getmore" description = "A 6-pack yoke of T-Borg's Tonic Water for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/tonic ) @@ -1135,7 +1097,7 @@ name = "Soda Water (x6)" supplier = "getmore" description = "A 6-pack yoke of Soda Water for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/sodawater ) @@ -1148,7 +1110,7 @@ name = "Getmore Root Beer (x6)" supplier = "getmore" description = "A 6-pack yoke of Getmore Root Beer for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/root_beer ) @@ -1161,7 +1123,7 @@ name = "Diet Comet Cola (x6)" supplier = "getmore" description = "A 6-pack yoke of Diet Comet Cola for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/diet_cola ) @@ -1174,7 +1136,7 @@ name = "Xanu Rush! Peach Soda (x6)" supplier = "getmore" description = "A 6-pack yoke of Xanu Rush! Peach Soda for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/peach_soda ) @@ -1187,7 +1149,7 @@ name = "Kansumi Melon Soda (x6)" supplier = "getmore" description = "A 6-pack yoke of Kansumi Melon Soda for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/melon_soda ) @@ -1200,7 +1162,7 @@ name = "Dorshafen Deluxe Kvass (x6)" supplier = "getmore" description = "A 6-pack yoke of Dorshafen Deluxe Kvass for cracking open a cold one." - price = 220 + price = 22 items = list( /obj/item/storage/box/fancy/yoke/himeokvass ) @@ -1213,7 +1175,7 @@ name = "Brown Palace Champion Chai (x6)" supplier = "getmore" description = "A 6-pack yoke of Brown Palace Champion Chai for cracking open a cold one." - price = 100 + price = 10 items = list( /obj/item/storage/box/fancy/yoke/xanuchai ) @@ -1226,7 +1188,7 @@ name = "Hakhma Beetle Milk (x6)" supplier = "getmore" description = "A 6-pack yoke of Hakhma Beetle Milk for cracking open a cold one." - price = 80 + price = 8 items = list( /obj/item/storage/box/fancy/yoke/beetle_milk ) @@ -1239,7 +1201,7 @@ name = "Burszi-ale (x6)" supplier = "getmore" description = "A half-dozen pack of Burszi-ale bottles, for cracking open a cold one." - price = 220 + price = 22 items = list( /obj/item/storage/box/ale ) @@ -1252,7 +1214,7 @@ name = "Virklunder Beer (x6)" supplier = "getmore" description = "A half-dozen pack of Virklunder beers, for cracking open a cold one." - price = 220 + price = 17 items = list( /obj/item/storage/box/beer ) @@ -1265,7 +1227,7 @@ name = "Qel'Zvol Hospitality's Prestige Dyn Beer (x6)" supplier = "getmore" description = "A half-dozen pack of Qel'Zvol Hospitality's Prestige dyn beers, for cracking open a cold one." - price = 220 + price = 21 items = list( /obj/item/storage/box/skrellbeerdyn ) @@ -1278,7 +1240,7 @@ name = "Xuizi Juice (x6)" supplier = "getmore" description = "A half-dozen pack of Xuiji Juice, for cracking open a cold one." - price = 220 + price = 14 items = list( /obj/item/storage/box/xuizijuice ) @@ -1291,7 +1253,7 @@ name = "Khlibnyz (x6)" supplier = "getmore" description = "A half-dozen pack of Khlibnyz, for cracking open a cold one." - price = 120 + price = 12 items = list( /obj/item/storage/box/khlibnyz ) @@ -1304,7 +1266,7 @@ name = "Comet Cola Bottles (x6)" supplier = "getmore" description = "A half-dozen pack of Comet Cola, for cracking open a cold one." - price = 100 + price = 8 items = list( /obj/item/storage/box/cola ) @@ -1317,7 +1279,7 @@ name = "Stellar Jolt Bottles (x6)" supplier = "getmore" description = "A half-dozen pack of Stellar Jolt, for cracking open a cold one." - price = 100 + price = 8 items = list( /obj/item/storage/box/space_mountain_wind ) @@ -1330,7 +1292,7 @@ name = "Space Up Bottles (x6)" supplier = "getmore" description = "A half-dozen pack of Space Up, for cracking open a cold one." - price = 100 + price = 8 items = list( /obj/item/storage/box/space_up ) @@ -1343,7 +1305,7 @@ name = "Hrozamal Soda (x6)" supplier = "getmore" description = "A half-dozen pack of Hrozamal Soda, for cracking open a cold one." - price = 100 + price = 12 items = list( /obj/item/storage/box/hrozamal_soda ) @@ -1356,7 +1318,7 @@ name = "Midynhr Water (x6)" supplier = "getmore" description = "A half-dozen pack of Midynhr Water, for cracking open a cold one." - price = 100 + price = 18 items = list( /obj/item/storage/box/midynhr_water ) @@ -1369,7 +1331,7 @@ name = "Dental Hygiene Kit" supplier = "getmore" description = "A box containing a toothbrush, a tube of toothpaste, and a bottle of mouthwash." - price = 150 + price = 25 items = list( /obj/item/storage/box/toothpaste ) @@ -1382,20 +1344,7 @@ name = "Sencha Tins (x7)" supplier = "getmore" description = "A box containing some tins of green tea leaves." - price = 100 - items = list( - /obj/item/storage/box/tea - ) - access = 0 - container_type = "crate" - groupable = TRUE - -/singleton/cargo_item/sencha - category = "hospitality" - name = "Sencha-cha Tins (x7)" - supplier = "getmore" - description = "A box containing some tins of green tea leaves." - price = 100 + price = 20 items = list( /obj/item/storage/box/tea ) @@ -1408,7 +1357,7 @@ name = "Tieguanyin-cha Tins (x7)" supplier = "getmore" description = "A box containing some tins of oolong tea leaves." - price = 100 + price = 20 items = list( /obj/item/storage/box/tea/tieguanyin ) @@ -1421,7 +1370,7 @@ name = "Jaeksol-cha Tins (x7)" supplier = "getmore" description = "A box containing some tins of black tea leaves." - price = 100 + price = 20 items = list( /obj/item/storage/box/tea/jaekseol ) @@ -1429,12 +1378,12 @@ container_type = "crate" groupable = TRUE -/singleton/cargo_item/jaekseol +/singleton/cargo_item/vkrexi_organ category = "hospitality" name = "V'krexi Swollen Organ" supplier = "getmore" description = "A traditional Sedantian alcoholic drink, packaged in the stomach it's fermented in." - price = 150 + price = 50 items = list( /obj/item/storage/box/fancy/vkrexi_swollen_organ ) @@ -1447,7 +1396,7 @@ name = "Jadrani Consecrated Geneboosted Wine" supplier = "getmore" description = "A bottle of artisanally-crafted, highly sought-after Dominian red wine. Sanctified and exported via House Caladius." - price = 500 + price = 50 items = list( /obj/item/reagent_containers/food/drinks/bottle/dominian_wine ) @@ -1461,7 +1410,7 @@ name = "Reacher's Triumph 2423 Algae Wine" supplier = "getmore" description = "A bottle of wine, brewed from algae, made in the traditional style of the Imperial Viceroyalty of Sun Reach, a Dominian frontier-world." - price = 500 + price = 50 items = list( /obj/item/reagent_containers/food/drinks/bottle/algae_wine ) @@ -1475,21 +1424,7 @@ name = "\improper Assunzioni Sera Stellata di Dalyan Wine" supplier = "getmore" description = "A bottle of velvety smooth red wine from the underground vineyards of Dalyan, Assunzione." - price = 500 - items = list( - /obj/item/reagent_containers/food/drinks/bottle/assunzione_wine - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/assunzione_wine - category = "hospitality" - name = "\improper Assunzioni Sera Stellata di Dalyan Wine" - supplier = "getmore" - description = "A bottle of velvety smooth red wine from the underground vineyards of Dalyan, Assunzione." - price = 500 + price = 50 items = list( /obj/item/reagent_containers/food/drinks/bottle/assunzione_wine ) @@ -1503,7 +1438,7 @@ name = "Federation's Finest Ylpha Wine" supplier = "getmore" description = "A popular type of Skrell wine made from fermented ylpha berries." - price = 300 + price = 30 items = list( /obj/item/reagent_containers/food/drinks/bottle/skrellwineylpha ) @@ -1517,7 +1452,7 @@ name = "Inverkeithing Import Mushroom Vodka" supplier = "getmore" description = "A mushroom-based vodka imported from the breweries of Inverkeithing on Himeo." - price = 300 + price = 35 items = list( /obj/item/reagent_containers/food/drinks/bottle/vodka/mushroom ) @@ -1531,7 +1466,7 @@ name = "Victory Gin" supplier = "getmore" description = "A Tajaran gin considered to be the official drink of the People's Republic of Adhomai." - price = 200 + price = 25 items = list( /obj/item/reagent_containers/food/drinks/bottle/victorygin ) @@ -1545,7 +1480,7 @@ name = "Sugar Tree Liquor" supplier = "getmore" description = "Called Nm'shaan Liquor in native Siik'maas, this strong Adhomian liquor is reserved for special occasions. A label on the bottle recommends diluting it with icy water before drinking." - price = 200 + price = 35 items = list( /obj/item/reagent_containers/food/drinks/bottle/sugartree_liquor ) @@ -1559,7 +1494,7 @@ name = "messa's mead" supplier = "getmore" description = "A bottle of Messa's mead. Bottled somewhere in the icy world of Adhomai." - price = 200 + price = 30 items = list( /obj/item/reagent_containers/food/drinks/bottle/messa_mead ) @@ -1573,7 +1508,7 @@ name = "Neubach Original Kvass" supplier = "getmore" description = "A bottle of authentic Fisanduhian kvass, a cereal alcohol." - price = 200 + price = 20 items = list( /obj/item/reagent_containers/food/drinks/bottle/kvass ) @@ -1587,7 +1522,7 @@ name = "Frostdancer Distillery Tarasun" supplier = "getmore" description = "A bottle of Lyodii tarasun, an alcoholic beverage made from tenelote milk." - price = 200 + price = 25 items = list( /obj/item/reagent_containers/food/drinks/bottle/tarasun ) @@ -1601,7 +1536,7 @@ name = "Frostdancer Distillery Valokki Wine" supplier = "getmore" description = "A bottle of wine distilled from the Morozi cloudberry." - price = 400 + price = 42 items = list( /obj/item/reagent_containers/food/drinks/bottle/valokki_wine ) @@ -1615,7 +1550,7 @@ name = "2275 Classic Brandy" supplier = "getmore" description = "A bottle of Xanan mid-range brandy." - price = 350 + price = 35 items = list( /obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive ) @@ -1629,7 +1564,7 @@ name = "Saint-Jacques Black Label Cognac" supplier = "getmore" description = "An expensive bottle of Saint-Jacques Black Label, a Xanan luxury cognac." - price = 400 + price = 40 items = list( /obj/item/reagent_containers/food/drinks/bottle/saintjacques ) @@ -1643,7 +1578,7 @@ name = "Vrozka Farms Ne'miik" supplier = "getmore" description = "A bottle of Ne'miik under the label 'Vrozka Farms' from Caprice. The Vaurcan analogue for milk." - price = 100 + price = 12 items = list( /obj/item/reagent_containers/food/drinks/bottle/nemiik ) @@ -1657,7 +1592,7 @@ name = "Ogogoro Jar" supplier = "getmore" description = "A traditional Eridani palm wine drink, stored in a mason jar." - price = 150 + price = 16 items = list( /obj/item/reagent_containers/food/drinks/bottle/ogogoro ) diff --git a/code/modules/cargo/items/hydroponics.dm b/code/modules/cargo/items/hydroponics.dm index 7cb8d4e0ae3..b4d01b762d3 100644 --- a/code/modules/cargo/items/hydroponics.dm +++ b/code/modules/cargo/items/hydroponics.dm @@ -3,7 +3,7 @@ name = "ammonia bottle" supplier = "getmore" description = "A small bottle." - price = 90 + price = 15 items = list( /obj/item/reagent_containers/glass/bottle/ammonia ) @@ -17,7 +17,7 @@ name = "apron" supplier = "getmore" description = "A basic blue apron." - price = 25 + price = 20 items = list( /obj/item/clothing/accessory/apron/blue ) @@ -31,7 +31,7 @@ name = "bee net" supplier = "vysoka" description = "A needed tool to maintain bee imprisonment." - price = 55 + price = 24 items = list( /obj/item/bee_net ) @@ -45,7 +45,7 @@ name = "bee smoker" supplier = "vysoka" description = "For when you need to show those bees whos boss." - price = 120 + price = 60 items = list( /obj/item/bee_smoker ) @@ -59,7 +59,7 @@ name = "beehive assembly" supplier = "vysoka" description = "Beehive frame, some assembly required." - price = 75 + price = 40 items = list( /obj/item/beehive_assembly ) @@ -73,7 +73,7 @@ name = "cat" supplier = "molinaris" description = "A domesticated, feline pet. Has a tendency to adopt crewmembers." - price = 300 + price = 150 items = list( /mob/living/simple_animal/cat ) @@ -87,7 +87,7 @@ name = "chicken" supplier = "molinaris" description = "Adorable! They make such a racket though." - price = 150 + price = 30 items = list( /mob/living/simple_animal/chick ) @@ -101,7 +101,7 @@ name = "corgi" supplier = "molinaris" description = "Studies have shown corgis are the most well adapted canines in space, for some reason." - price = 400 + price = 600 items = list( /obj/structure/largecrate/animal/corgi ) @@ -115,7 +115,7 @@ name = "cow" supplier = "molinaris" description = "Known for their milk, just don't tip them over." - price = 500 + price = 1200 items = list( /mob/living/simple_animal/cow ) @@ -129,7 +129,7 @@ name = "schlorrgo egg" supplier = "zharkov" description = "A large egg that will eventually grow into a Schlorrgo." - price = 700 + price = 300 items = list( /obj/item/reagent_containers/food/snacks/egg/schlorrgo ) @@ -143,7 +143,7 @@ name = "fatshouter" supplier = "zharkov" description = "A crate containing a fatshouter, an Adhomian animal." - price = 500 + price = 1500 items = list( /obj/structure/largecrate/animal/adhomai/fatshouter ) @@ -157,7 +157,7 @@ name = "flora disk box" supplier = "nanotrasen" description = "A box of flora data disks, apparently." - price = 660 + price = 120 items = list( /obj/item/storage/box/botanydisk ) @@ -171,7 +171,7 @@ name = "goat" supplier = "molinaris" description = "Not known for their pleasant disposition." - price = 400 + price = 250 items = list( /mob/living/simple_animal/hostile/retaliate/goat ) @@ -185,7 +185,7 @@ name = "hakhma" supplier = "molinaris" description = "An oversized insect breed by Scarab colony ships, known for their milk." - price = 600 + price = 300 items = list( /mob/living/simple_animal/hakhma ) @@ -199,7 +199,7 @@ name = "honey extractor" supplier = "vysoka" description = "Needed equipment to extract sweet liquid gold." - price = 300 + price = 80 items = list( /obj/machinery/honey_extractor ) @@ -213,7 +213,7 @@ name = "hydroponics tray" supplier = "nanotrasen" description = "A safe space to raise your plants." - price = 45 + price = 50 items = list( /obj/machinery/portable_atmospherics/hydroponics ) @@ -241,7 +241,7 @@ name = "leather gloves" supplier = "getmore" description = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." - price = 9 + price = 12 items = list( /obj/item/clothing/gloves/botanic_leather ) @@ -255,7 +255,7 @@ name = "packet of diona nodes" supplier = "nanotrasen" description = "It has a picture of diona pods on the front." - price = 15 + price = 25 items = list( /obj/item/seeds/replicapod ) @@ -269,7 +269,7 @@ name = "packet of kudzu seeds" supplier = "vysoka" description = "It has a picture of kudzu vines on the front." - price = 15 + price = 12 items = list( /obj/item/seeds/kudzuseed ) @@ -283,7 +283,7 @@ name = "packet of strange plant nodes" supplier = "zeng_hu" description = "It has a picture of strange plants on the front." - price = 15 + price = 12 items = list( /obj/item/seeds/random ) @@ -297,7 +297,7 @@ name = "plant analyzer" supplier = "getmore" description = "A hand-held environmental scanner which reports current gas levels." - price = 135 + price = 70 items = list( /obj/item/device/analyzer/plant_analyzer ) @@ -311,7 +311,7 @@ name = "Plant-B-Gone" supplier = "blam" description = "Kills those pesky weeds!" - price = 200 + price = 35 items = list( /obj/item/reagent_containers/spray/plantbgone ) @@ -325,7 +325,7 @@ name = "queen bee pack" supplier = "vysoka" description = "Contains one queen bee, bee kingdom not included." - price = 150 + price = 40 items = list( /obj/item/bee_pack ) @@ -339,7 +339,7 @@ name = "sample of liberty cap spores" supplier = "vysoka" description = "It's labelled as coming from liberty cap mushrooms." - price = 15 + price = 25 items = list( /obj/item/seeds/libertymycelium ) @@ -353,7 +353,7 @@ name = "sample of reishi spores" supplier = "vysoka" description = "It's labelled as coming from reishi." - price = 15 + price = 35 items = list( /obj/item/seeds/reishimycelium ) @@ -367,7 +367,7 @@ name = "wulumunusha seed" supplier = "zeng_hu" description = "A Skrellian plant used in religious ceremonies and drinks." - price = 100 + price = 45 items = list( /obj/item/seeds/wulumunushaseed ) @@ -381,7 +381,7 @@ name = "chainsaw" supplier = "nanotrasen" description = "A portable mechanical saw commonly used to fell trees." - price = 600 + price = 400 items = list( /obj/item/material/twohanded/chainsaw ) @@ -395,7 +395,7 @@ name = "steel hatchet" supplier = "nanotrasen" description = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." - price = 36 + price = 25 items = list( /obj/item/material/hatchet ) @@ -409,7 +409,7 @@ name = "steel mini hoe" supplier = "nanotrasen" description = "It's used for removing weeds or scratching your back." - price = 15 + price = 12 items = list( /obj/item/material/minihoe ) @@ -423,7 +423,7 @@ name = "weedkiller grenade" supplier = "blam" description = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." - price = 225 + price = 100 items = list( /obj/item/grenade/chem_grenade/antiweed ) diff --git a/code/modules/cargo/items/medical.dm b/code/modules/cargo/items/medical.dm index 857067943e1..51c66403b11 100644 --- a/code/modules/cargo/items/medical.dm +++ b/code/modules/cargo/items/medical.dm @@ -21,7 +21,7 @@ name = "first-aid kit" supplier = "nanotrasen" description = "A basic medical kit for those boo-boos." - price = 250 + price = 60 items = list( /obj/item/storage/firstaid/regular ) @@ -35,7 +35,7 @@ name = "advanced first-aid kit" supplier = "nanotrasen" description = "An emergency medical kit for general severe injuries." - price = 500 + price = 200 items = list( /obj/item/storage/firstaid/adv ) @@ -49,7 +49,7 @@ name = "large advanced first-aid kit" supplier = "nanotrasen" description = "A large emergency medical kit for many general severe injuries." - price = 900 + price = 500 items = list( /obj/item/storage/firstaid/large/adv ) @@ -63,7 +63,7 @@ name = "fire first-aid kit" supplier = "nanotrasen" description = "An emergency medical kit for serious burns, either chemical or temperature." - price = 450 + price = 150 items = list( /obj/item/storage/firstaid/fire ) @@ -77,7 +77,7 @@ name = "oxygen deprivation first aid" supplier = "nanotrasen" description = "An emergency medical kit for oxygen deprivation, including cardiac arrest." - price = 450 + price = 150 items = list( /obj/item/storage/firstaid/o2 ) @@ -91,7 +91,7 @@ name = "toxin first aid" supplier = "nanotrasen" description = "An emergency medical kit for toxin exposure." - price = 450 + price = 150 items = list( /obj/item/storage/firstaid/toxin ) @@ -105,7 +105,7 @@ name = "radiation first aid" supplier = "nanotrasen" description = "An emergency medical kit for severe radiation exposure." - price = 450 + price = 150 items = list( /obj/item/storage/firstaid/radiation ) @@ -119,7 +119,7 @@ name = "O- blood pack (x1)" supplier = "zeng_hu" description = "A blood pack filled with universally-compatible O- Blood." - price = 300 + price = 800 items = list( /obj/item/reagent_containers/blood/OMinus ) @@ -133,7 +133,7 @@ name = "SBS blood pack (x1)" supplier = "zeng_hu" description = "A blood pack filled with Synthetic Blood Substitute. WARNING: Not compatible with organic blood!" - price = 270 + price = 675 items = list( /obj/item/reagent_containers/blood/sbs ) @@ -161,7 +161,7 @@ name = "dexalin plus autoinjector" supplier = "nanotrasen" description = "An autoinjector designed to treat oxygen deprivation." - price = 150 + price = 550 items = list( /obj/item/reagent_containers/hypospray/autoinjector/oxygen ) @@ -175,7 +175,7 @@ name = "peridaxon autoinjector" supplier = "nanotrasen" description = "An autoinjector designed to treat broad-spectrum organ damage." - price = 300 + price = 725 items = list( /obj/item/reagent_containers/hypospray/autoinjector/peridaxon ) @@ -189,7 +189,7 @@ name = "pneumalin autoinhaler" supplier = "nanotrasen" description = "An autoinhaler used to treat lung damage." - price = 200 + price = 450 items = list( /obj/item/reagent_containers/inhaler/pneumalin ) @@ -203,7 +203,7 @@ name = "body bags boxes (x3)" supplier = "nanotrasen" description = "This box contains body bags." - price = 155 + price = 35 items = list( /obj/item/storage/box/bodybags ) @@ -217,7 +217,7 @@ name = "box of empty autoinjectors" supplier = "nanotrasen" description = "Contains empty autoinjectors." - price = 120 + price = 85 items = list( /obj/item/storage/box/autoinjectors ) @@ -231,7 +231,7 @@ name = "box of sterile gloves" supplier = "zeng_hu" description = "Contains sterile gloves." - price = 55 + price = 25 items = list( /obj/item/storage/box/gloves ) @@ -245,7 +245,7 @@ name = "box of sterile masks" supplier = "zeng_hu" description = "This box contains masks of sterility." - price = 55 + price = 28 items = list( /obj/item/storage/box/masks ) @@ -259,7 +259,7 @@ name = "box of syringes" supplier = "nanotrasen" description = "A box full of syringes." - price = 60 + price = 27 items = list( /obj/item/storage/box/syringes ) @@ -270,10 +270,10 @@ /singleton/cargo_item/butazoline_bottle category = "medical" - name = "butazoline autoinjector" + name = "butazoline bottle" supplier = "nanotrasen" description = "A bottle of butazoline, a medicine used to treat severe trauma." - price = 50 + price = 250 items = list( /obj/item/reagent_containers/glass/bottle/butazoline ) @@ -284,10 +284,10 @@ /singleton/cargo_item/dermaline_bottle category = "medical" - name = "dermaline autoinjector" + name = "dermaline bottle" supplier = "nanotrasen" description = "A bottle of dermaline, a medicine used to treat severe burns." - price = 50 + price = 250 items = list( /obj/item/reagent_containers/glass/bottle/dermaline ) @@ -301,7 +301,7 @@ name = "dylovene bottle" supplier = "nanotrasen" description = "A small bottle of dylovene, a broad-spectrum antitoxin and liver regenerative." - price = 20 + price = 180 items = list( /obj/item/reagent_containers/glass/bottle/antitoxin ) @@ -315,7 +315,7 @@ name = "hyronalin bottle" supplier = "nanotrasen" description = "A bottle containing hyronalin, used to treat radiation poisoning." - price = 35 + price = 375 items = list( /obj/item/reagent_containers/glass/bottle/hyronalin ) @@ -329,7 +329,7 @@ name = "inaprovaline bottle" supplier = "nanotrasen" description = "A bottle of inaprovaline, a broad-spectrum stimulant and cardiac stabilizer." - price = 25 + price = 205 items = list( /obj/item/reagent_containers/glass/bottle/inaprovaline ) @@ -343,7 +343,7 @@ name = "soporific bottle" supplier = "nanotrasen" description = "A bottle of soporific. Just the fumes make you sleepy." - price = 55 + price = 245 items = list( /obj/item/reagent_containers/glass/bottle/stoxin ) @@ -357,7 +357,7 @@ name = "mortaphenyl bottle" supplier = "nanotrasen" description = "A bottle of mortaphenyl, a strong non-opioid painkiller." - price = 85 + price = 455 items = list( /obj/item/reagent_containers/glass/bottle/mortaphenyl ) @@ -371,7 +371,7 @@ name = "medical belt" supplier = "nanotrasen" description = "Can hold various medical equipment." - price = 75 + price = 35 items = list( /obj/item/storage/belt/medical ) @@ -385,7 +385,7 @@ name = "medical mask" supplier = "nanotrasen" description = "A close-fitting sterile mask that can be connected to an air supply." - price = 35 + price = 25 items = list( /obj/item/clothing/mask/breath/medical ) @@ -399,7 +399,7 @@ name = "surgical cap" supplier = "nanotrasen" description = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." - price = 70 + price = 22 items = list( /obj/item/clothing/head/surgery ) @@ -413,7 +413,7 @@ name = "medical scrubs" supplier = "nanotrasen" description = "It's made of a special fiber that provides minor protection against biohazards." - price = 100 + price = 45 items = list( /obj/item/clothing/under/rank/medical/surgeon ) @@ -427,7 +427,7 @@ name = "medical gown" supplier = "nanotrasen" description = "A loose-fitting gown for medical patients." - price = 60 + price = 23 items = list( /obj/item/clothing/under/medical_gown ) @@ -441,7 +441,7 @@ name = "medical voidsuit" supplier = "nanotrasen" description = "A special suit that protects against hazardous, low pressure environments. Has minor radiation shielding." - price = 1200 + price = 780 items = list( /obj/item/clothing/suit/space/void/medical ) @@ -455,7 +455,7 @@ name = "medical voidsuit helmet" supplier = "nanotrasen" description = "A special helmet designed for work in a hazardous, low pressure environment. Has minor radiation shielding." - price = 850 + price = 480 items = list( /obj/item/clothing/head/helmet/space/void/medical ) @@ -469,7 +469,7 @@ name = "nanopaste" supplier = "zeng_hu" description = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." - price = 2000 + price = 750 items = list( /obj/item/stack/nanopaste ) @@ -483,7 +483,7 @@ name = "pill bottles" supplier = "nanotrasen" description = "A storage box containing pill bottles." - price = 155 + price = 55 items = list( /obj/item/storage/pill_bottle ) @@ -497,7 +497,7 @@ name = "stasis bag" supplier = "zeng_hu" description = "A folded, non-reusable bag designed to keep patients in stasis for transport." - price = 900 + price = 2450 items = list( /obj/item/bodybag/cryobag ) @@ -511,7 +511,7 @@ name = "stabilizer harness" supplier = "nanotrasen" description = "A specialized medical harness that gives regular compressions to the patient's ribcage for cases of urgent heart issues, and functions as an emergency artificial respirator for cases of urgent lung issues." - price = 300 + price = 2110 items = list( /obj/item/auto_cpr ) @@ -525,7 +525,7 @@ name = "hypospray" supplier = "zeng_hu" description = "A sterile, air-needle autoinjector for administration of drugs to patients." - price = 200 + price = 800 items = list( /obj/item/reagent_containers/hypospray ) @@ -541,7 +541,7 @@ name = "surgery kit" supplier = "zeng_hu" description = "A kit containing surgical tools, either for resupply or for use on-the-go." - price = 2000 + price = 3200 items = list( /obj/item/storage/firstaid/surgery ) @@ -555,7 +555,7 @@ name = "anesthetic tank" supplier = "nanotrasen" description = "A tank with an N2O/O2 gas mix." - price = 200 + price = 250 items = list( /obj/item/tank/anesthetic ) @@ -569,7 +569,7 @@ name = "scalpel" supplier = "zeng_hu" description = "Cut, cut, and once more cut." - price = 100 + price = 255 items = list( /obj/item/surgery/scalpel ) @@ -583,7 +583,7 @@ name = "retractor" supplier = "zeng_hu" description = "Retracts stuff." - price = 115 + price = 275 items = list( /obj/item/surgery/retractor ) @@ -597,7 +597,7 @@ name = "hemostat" supplier = "zeng_hu" description = "You think you have seen this before." - price = 135 + price = 275 items = list( /obj/item/surgery/hemostat ) @@ -611,7 +611,7 @@ name = "circular saw" supplier = "zeng_hu" description = "For heavy duty cutting." - price = 195 + price = 510 items = list( /obj/item/surgery/circular_saw ) @@ -625,7 +625,7 @@ name = "vascular recoupler" supplier = "zeng_hu" description = "An advanced automatic surgical instrument that operates with extreme finesse." - price = 495 + price = 850 items = list( /obj/item/surgery/fix_o_vein ) @@ -639,7 +639,7 @@ name = "cautery" supplier = "zeng_hu" description = "This stops bleeding." - price = 165 + price = 550 items = list( /obj/item/surgery/cautery ) @@ -653,7 +653,7 @@ name = "surgical drill" supplier = "zeng_hu" description = "You can drill using this item. You dig?" - price = 195 + price = 470 items = list( /obj/item/surgery/surgicaldrill ) @@ -667,7 +667,7 @@ name = "bone gel" supplier = "zeng_hu" description = "A bottle-and-nozzle applicator containing a specialized gel. When applied to bone tissue, it can reinforce and repair breakages and act as a glue to keep bones in place while they heal." - price = 495 + price = 485 items = list( /obj/item/surgery/bone_gel ) @@ -681,7 +681,7 @@ name = "bone setter" supplier = "zeng_hu" description = "Sets bones into place." - price = 225 + price = 255 items = list( /obj/item/surgery/bonesetter ) diff --git a/code/modules/cargo/items/mining.dm b/code/modules/cargo/items/mining.dm index 0adae040ea6..6b4027fc02e 100644 --- a/code/modules/cargo/items/mining.dm +++ b/code/modules/cargo/items/mining.dm @@ -3,7 +3,7 @@ name = "mining voidsuit" supplier = "nanotrasen" description = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating." - price = 1200 + price = 800 items = list( /obj/item/clothing/suit/space/void/mining ) @@ -17,7 +17,7 @@ name = "mining voidsuit helmet" supplier = "nanotrasen" description = "A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating." - price = 850 + price = 500 items = list( /obj/item/clothing/head/helmet/space/void/mining ) @@ -31,7 +31,7 @@ name = "Class A Kinetic Accelerator" supplier = "hephaestus" description = "Contains a tactical KA frame, an experimental core KA power converter, a recoil reloading KA cell, and a upgrade chip - damage increase." - price = 7999 + price = 3200 items = list( /obj/item/gun/custom_ka/frame05/prebuilt ) @@ -45,7 +45,7 @@ name = "Class B Kinetic Accelerator" supplier = "hephaestus" description = "Contains a heavy KA frame, a planet core KA power converter, a uranium recharging KA cell, and a upgrade chip - efficiency increase." - price = 5599 + price = 2850 items = list( /obj/item/gun/custom_ka/frame04/prebuilt ) @@ -59,7 +59,7 @@ name = "Class C Kinetic Accelerator" supplier = "hephaestus" description = "Contains a medium KA frame, a meteor core KA power converter, a kinetic KA cell, and a upgrade chip - focusing." - price = 3299 + price = 2200 items = list( /obj/item/gun/custom_ka/frame03/prebuilt ) @@ -73,7 +73,7 @@ name = "Class D Kinetic Accelerator" supplier = "hephaestus" description = "Contains a light KA frame, a professional core KA power converter, an advanced pump recharging KA cell, and a upgrade chip - firedelay increase." - price = 2299 + price = 1850 items = list( /obj/item/gun/custom_ka/frame02/prebuilt ) @@ -87,7 +87,7 @@ name = "Class E Kinetic Accelerator" supplier = "hephaestus" description = "Contains a compact KA frame, a standard core KA power converter, a pump recharging KA cell, and a upgrade chip - focusing." - price = 1499 + price = 1400 items = list( /obj/item/gun/custom_ka/frame01/prebuilt ) @@ -101,7 +101,7 @@ name = "mining drill" supplier = "hephaestus" description = "A large industrial drill. Its bore does not penetrate deep enough to access the sublevels." - price = 4000 + price = 5000 items = list( /obj/machinery/mining/drill, /obj/machinery/mining/brace, @@ -117,7 +117,7 @@ name = "ore box" supplier = "hephaestus" description = "Contains a box for storing ore." - price = 250 + price = 150 items = list( /obj/structure/ore_box ) diff --git a/code/modules/cargo/items/miscellaneous.dm b/code/modules/cargo/items/miscellaneous.dm index 653e268b166..44d2a7b5da2 100644 --- a/code/modules/cargo/items/miscellaneous.dm +++ b/code/modules/cargo/items/miscellaneous.dm @@ -3,7 +3,7 @@ name = "auto-chisel" supplier = "nanotrasen" description = "With an integrated AI chip and hair-trigger precision, this baby makes sculpting almost automatic!" - price = 500 + price = 125 items = list( /obj/item/autochisel ) @@ -17,7 +17,7 @@ name = "sculpting block" supplier = "nanotrasen" description = "A finely chiselled sculpting block, it is ready to be your canvas." - price = 200 + price = 750 items = list( /obj/structure/sculpting_block ) @@ -31,7 +31,7 @@ name = "space air conditioner" supplier = "nanotrasen" description = "Made by Space Amish using traditional space techniques, this A/C unit can heat or cool a room to your liking." - price = 200 + price = 150 items = list( /obj/machinery/space_heater ) diff --git a/code/modules/cargo/items/operations.dm b/code/modules/cargo/items/operations.dm index 6afa3c32577..edc03323285 100644 --- a/code/modules/cargo/items/operations.dm +++ b/code/modules/cargo/items/operations.dm @@ -3,7 +3,7 @@ name = "autakh limbs" supplier = "hephaestus" description = "A box with various autakh limbs." - price = 3000 + price = 1000 items = list( /obj/item/organ/external/hand/right/autakh/tool, /obj/item/organ/external/hand/right/autakh/tool/mining, @@ -14,68 +14,12 @@ groupable = TRUE spawn_amount = 2 -/singleton/cargo_item/battlemonstersresupplycanister - category = "operations" - name = "battlemonsters resupply canister" - supplier = "nanotrasen" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/battlemonsters - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/blackpaint - category = "operations" - name = "black paint" - supplier = "hephaestus" - description = "Black paint, the color of space." - price = 10 - items = list( - /obj/item/reagent_containers/glass/paint/black - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/bluepaint - category = "operations" - name = "blue paint" - supplier = "hephaestus" - description = "Blue paint, for when you're on a mission from god." - price = 10 - items = list( - /obj/item/reagent_containers/glass/paint/blue - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/boozeresupplycanister - category = "operations" - name = "booze resupply canister" - supplier = "orion" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/booze - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/camera category = "operations" name = "camera" supplier = "nanotrasen" description = "A polaroid camera. 10 photos left." - price = 80 + price = 45 items = list( /obj/item/device/camera ) @@ -89,7 +33,7 @@ name = "cargo train trolley" supplier = "orion" description = "A cargo trolley for carrying cargo, NOT people." - price = 1500 + price = 800 items = list( /obj/vehicle/train/cargo/trolley ) @@ -103,7 +47,7 @@ name = "cargo train tug" supplier = "orion" description = "A ridable electric car designed for pulling cargo trolleys." - price = 500 + price = 350 items = list( /obj/vehicle/train/cargo/engine ) @@ -117,7 +61,7 @@ name = "Coat Hanger" supplier = "nanotrasen" description = "To hang your coat." - price = 150 + price = 12 items = list( /obj/structure/coatrack ) @@ -126,54 +70,12 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/coffeeresupplycanister - category = "operations" - name = "coffee resupply canister" - supplier = "getmore" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/coffee - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/colaresupplycanister - category = "operations" - name = "cola resupply canister" - supplier = "idris" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/cola - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/cutleryresupplycanister - category = "operations" - name = "cutlery resupply canister" - supplier = "nanotrasen" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/cutlery - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/eftposscanner category = "operations" name = "EFTPOS scanner" supplier = "orion" description = "Swipe your ID card to make purchases electronically." - price = 45 + price = 35 items = list( /obj/item/device/eftpos ) @@ -187,7 +89,7 @@ name = "empty spray bottle" supplier = "blam" description = "A empty spray bottle." - price = 50 + price = 5 items = list( /obj/item/reagent_containers/spray ) @@ -215,7 +117,7 @@ name = "film cartridge" supplier = "nanotrasen" description = "A camera film cartridge. Insert it into a camera to reload it." - price = 15 + price = 8 items = list( /obj/item/device/camera_film ) @@ -229,7 +131,7 @@ name = "flare" supplier = "hephaestus" description = "Good for illuminating dark areas or burning someones face off." - price = 80 + price = 8 items = list( /obj/item/device/flashlight/flare ) @@ -243,7 +145,7 @@ name = "formal wear crate" supplier = "nanotrasen" description = "Formalwear for the best occasions." - price = 800 + price = 350 items = list( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that, @@ -276,48 +178,6 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/greenpaint - category = "operations" - name = "green paint" - supplier = "orion" - description = "Green paint, a aesthetic replacement for grass." - price = 10 - items = list( - /obj/item/reagent_containers/glass/paint/green - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/hmatrrafillet - category = "operations" - name = "Hma'trra fillet" - supplier = "zharkov" - description = "A fillet of glacier worm meat." - price = 45 - items = list( - /obj/item/reagent_containers/food/snacks/hmatrrameat - ) - access = 0 - container_type = "freezer" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/hydroresupplycanister - category = "operations" - name = "hydro resupply canister" - supplier = "nanotrasen" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/hydro - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/janitorialresupplyset category = "operations" name = "janitorial resupply set" @@ -358,20 +218,6 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/medsresupplycanister - category = "operations" - name = "meds resupply canister" - supplier = "zeng_hu" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/meds - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/packagewrapper category = "operations" name = "package wrapper" @@ -428,54 +274,12 @@ groupable = FALSE spawn_amount = 1 -/singleton/cargo_item/purplepaint - category = "operations" - name = "purple paint" - supplier = "orion" - description = "Purple paint, it makes you feel like royalty." - price = 10 - items = list( - /obj/item/reagent_containers/glass/paint/purple - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/redpaint - category = "operations" - name = "red paint" - supplier = "orion" - description = "Red paint, its not blood we promise." - price = 10 - items = list( - /obj/item/reagent_containers/glass/paint/red - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/robotoolsresupplycanister - category = "operations" - name = "robo-tools resupply canister" - supplier = "blam" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/robo - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/poster19 category = "operations" name = "rolled-up poster - No. 19" supplier = "orion" description = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface." - price = 38 + price = 3.50 items = list( /obj/item/contraband/poster ) @@ -484,26 +288,12 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/securityresupplycanister - category = "operations" - name = "security resupply canister" - supplier = "blam" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/robust - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/shoulderholster category = "operations" name = "shoulder holster" supplier = "zavodskoi" description = "A handgun holster." - price = 23 + price = 15 items = list( /obj/item/clothing/accessory/holster ) @@ -512,40 +302,12 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/smokesresupplycanister - category = "operations" - name = "smokes resupply canister" - supplier = "getmore" - description = "A vending machine restock cart." - price = 500 - items = list( - /obj/item/device/vending_refill/smokes - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/snacksresupplycanister - category = "operations" - name = "snacks resupply canister" - supplier = "getmore" - description = "A vending machine restock cart." - price = 967 - items = list( - /obj/item/device/vending_refill/snack - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - /singleton/cargo_item/space_bike category = "operations" name = "space-bike" supplier = "zharkov" description = "Space wheelies! Woo!" - price = 1200 + price = 800 items = list( /obj/vehicle/bike ) @@ -554,28 +316,42 @@ groupable = FALSE spawn_amount = 1 -/singleton/cargo_item/toolsresupplycanister +/singleton/cargo_item/webbing category = "operations" - name = "tools resupply canister" - supplier = "hephaestus" - description = "A vending machine restock cart." - price = 500 + name = "webbing" + supplier = "nanotrasen" + description = "Sturdy mess of synthcotton belts and buckles, ready to share your burden." + price = 43 items = list( - /obj/item/device/vending_refill/tools + /obj/item/clothing/accessory/storage/webbing ) access = 0 container_type = "crate" groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/webbing +/singleton/cargo_item/blackpaint category = "operations" - name = "webbing" - supplier = "nanotrasen" - description = "Sturdy mess of synthcotton belts and buckles, ready to share your burden." - price = 83 + name = "black paint" + supplier = "hephaestus" + description = "Black paint, the color of space." + price = 10 items = list( - /obj/item/clothing/accessory/storage/webbing + /obj/item/reagent_containers/glass/paint/black + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/bluepaint + category = "operations" + name = "blue paint" + supplier = "hephaestus" + description = "Blue paint, for when you're on a mission from god." + price = 10 + items = list( + /obj/item/reagent_containers/glass/paint/blue ) access = 0 container_type = "crate" @@ -610,12 +386,82 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/purplepaint + category = "operations" + name = "purple paint" + supplier = "orion" + description = "Purple paint, it makes you feel like royalty." + price = 10 + items = list( + /obj/item/reagent_containers/glass/paint/purple + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/redpaint + category = "operations" + name = "red paint" + supplier = "orion" + description = "Red paint, its not blood we promise." + price = 10 + items = list( + /obj/item/reagent_containers/glass/paint/red + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/greenpaint + category = "operations" + name = "green paint" + supplier = "orion" + description = "Green paint, a aesthetic replacement for grass." + price = 10 + items = list( + /obj/item/reagent_containers/glass/paint/green + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/battlemonstersresupplycanister + category = "operations" + name = "battlemonsters resupply canister" + supplier = "nanotrasen" + description = "A vending machine restock cart." + price = 2250 + items = list( + /obj/item/device/vending_refill/battlemonsters + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/boozeresupplycanister + category = "operations" + name = "booze resupply canister" + supplier = "orion" + description = "A vending machine restock cart." + price = 4500 + items = list( + /obj/item/device/vending_refill/booze + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/zorasodaresupplycanister category = "operations" name = "zora soda resupply canister" supplier = "zora" description = "A vending machine restock cart." - price = 800 + price = 1255 items = list( /obj/item/device/vending_refill/zora ) @@ -623,3 +469,143 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 + +/singleton/cargo_item/toolsresupplycanister + category = "operations" + name = "tools resupply canister" + supplier = "hephaestus" + description = "A vending machine restock cart." + price = 2450 + items = list( + /obj/item/device/vending_refill/tools + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/smokesresupplycanister + category = "operations" + name = "smokes resupply canister" + supplier = "getmore" + description = "A vending machine restock cart." + price = 2250 + items = list( + /obj/item/device/vending_refill/smokes + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/snacksresupplycanister + category = "operations" + name = "snacks resupply canister" + supplier = "getmore" + description = "A vending machine restock cart." + price = 1255 + items = list( + /obj/item/device/vending_refill/snack + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/robotoolsresupplycanister + category = "operations" + name = "robo-tools resupply canister" + supplier = "blam" + description = "A vending machine restock cart." + price = 2500 + items = list( + /obj/item/device/vending_refill/robo + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/securityresupplycanister + category = "operations" + name = "security resupply canister" + supplier = "blam" + description = "A vending machine restock cart." + price = 4500 + items = list( + /obj/item/device/vending_refill/robust + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/medsresupplycanister + category = "operations" + name = "meds resupply canister" + supplier = "zeng_hu" + description = "A vending machine restock cart." + price = 5500 + items = list( + /obj/item/device/vending_refill/meds + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/hydroresupplycanister + category = "operations" + name = "hydro resupply canister" + supplier = "nanotrasen" + description = "A vending machine restock cart." + price = 2500 + items = list( + /obj/item/device/vending_refill/hydro + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/coffeeresupplycanister + category = "operations" + name = "coffee resupply canister" + supplier = "getmore" + description = "A vending machine restock cart." + price = 1350 + items = list( + /obj/item/device/vending_refill/coffee + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/colaresupplycanister + category = "operations" + name = "cola resupply canister" + supplier = "idris" + description = "A vending machine restock cart." + price = 1250 + items = list( + /obj/item/device/vending_refill/cola + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/cutleryresupplycanister + category = "operations" + name = "cutlery resupply canister" + supplier = "nanotrasen" + description = "A vending machine restock cart." + price = 850 + items = list( + /obj/item/device/vending_refill/cutlery + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 diff --git a/code/modules/cargo/items/recreation.dm b/code/modules/cargo/items/recreation.dm index a6ae9568535..9a848c15955 100644 --- a/code/modules/cargo/items/recreation.dm +++ b/code/modules/cargo/items/recreation.dm @@ -188,7 +188,7 @@ name = "water balloons (x10)" supplier = "nanotrasen" description = "Ten empty water balloons for water balloon fights." - price = 100 + price = 3.25 items = list( /obj/item/toy/waterballoon ) @@ -202,7 +202,7 @@ name = "balloons (x10)" supplier = "nanotrasen" description = "Ten empty regular balloons. Can be filled using a tank of air or other gas. Warranty void if filled with hydrogen." - price = 80 + price = 2.50 items = list( /obj/item/toy/balloon ) @@ -216,7 +216,7 @@ name = "toy sword" supplier = "nanotrasen" description = "A cheap, plastic replica of a blue energy sword. Realistic sounds and colors! Ages 8 and up." - price = 200 + price = 12 items = list( /obj/item/toy/sword ) @@ -230,7 +230,7 @@ name = "replica katana" supplier = "nanotrasen" description = "A cheap plastic katana. Useful for pretending you're a samurai or for tabletop roleplaying sessions." - price = 200 + price = 16 items = list( /obj/item/toy/katana ) @@ -244,7 +244,7 @@ name = "foam darts (x5)" supplier = "nanotrasen" description = "It's some foam darts, for use in foam weaponry. Ages 8 and up." - price = 20 + price = 3.50 items = list( /obj/item/toy/ammo/crossbow ) @@ -258,7 +258,7 @@ name = "foam dart crossbow" supplier = "nanotrasen" description = "A weapon favored by many overactive children. Ages 8 and up." - price = 200 + price = 20 items = list( /obj/item/toy/crossbow ) @@ -272,7 +272,7 @@ name = "gravitational singularity toy" supplier = "getmore" description = "'Singulo' brand spinning toy. Certified mesmerizing since 2440." - price = 100 + price = 8 items = list( /obj/item/toy/spinningtoy ) @@ -286,7 +286,7 @@ name = "random plushies (x4)" supplier = "nanotrasen" description = "Four random surplus plushies from a local toy store's clearance sale. People grow old, apparently." - price = 250 + price = 45 items = list( /obj/random/plushie ) @@ -300,7 +300,7 @@ name = "therapy doll" supplier = "virgo" description = "A toy for therapeutic and recreational purposes." - price = 120 + price = 22 items = list( /obj/item/toy/plushie/therapy ) @@ -314,7 +314,7 @@ name = "snap pop (x5)" supplier = "nanotrasen" description = "A number of snap pops." - price = 200 + price = 12 items = list( /obj/item/toy/snappop ) @@ -328,7 +328,7 @@ name = "red laser tag equipment set" supplier = "nanotrasen" description = "A two-player set of red-team laser tag equipment consisting of a helmet, armor, and a gun." - price = 200 + price = 150 items = list( /obj/item/clothing/head/helmet/riot/laser_tag, /obj/item/clothing/suit/armor/riot/laser_tag, @@ -344,7 +344,7 @@ name = "blue laser tag equipment set" supplier = "nanotrasen" description = "A two-player set of blue-team laser blue equipment consisting of a helmet, armor, and a gun." - price = 200 + price = 150 items = list( /obj/item/clothing/head/helmet/riot/laser_tag/blue, /obj/item/clothing/suit/armor/riot/laser_tag/blue, @@ -360,7 +360,7 @@ name = "lyodii fatesayer cards" supplier = "orion" description = "A lyodii Fatesayer card deck. Exported from Moroz, used to tell your fate." - price = 300 //It's a niche novelty thing made in relatively small export quantities + price = 120 //It's a niche novelty thing made in relatively small export quantities items = list( /obj/item/storage/box/lyodii ) diff --git a/code/modules/cargo/items/robotics.dm b/code/modules/cargo/items/robotics.dm index 8c41e6d15c3..81efd4bbaad 100644 --- a/code/modules/cargo/items/robotics.dm +++ b/code/modules/cargo/items/robotics.dm @@ -3,7 +3,7 @@ name = "positronic brain" supplier = "hephaestus" description = "An IPC-grade inactivated positronic brain fresh off the factory line. These sentient, enigmatic computers are the brains of advanced synthetics across the galaxy." - price = 8000 + price = 8450 items = list( /obj/item/device/mmi/digital/posibrain ) diff --git a/code/modules/cargo/items/science.dm b/code/modules/cargo/items/science.dm index bfcf2e18c97..217d21a4c6f 100644 --- a/code/modules/cargo/items/science.dm +++ b/code/modules/cargo/items/science.dm @@ -3,7 +3,7 @@ name = "stok cube box" supplier = "nanotrasen" description = "Drymate brand stok cubes, shipped from Moghes. Just add water!" - price = 60 + price = 250 items = list( /obj/item/storage/box/monkeycubes/stokcubes ) @@ -17,7 +17,7 @@ name = "vkrexi cube box" supplier = "nanotrasen" description = "Drymate brand vkrexi cubes. Just add water!" - price = 60 + price = 250 items = list( /obj/item/storage/box/monkeycubes/vkrexicubes ) @@ -31,7 +31,7 @@ name = "farwa cube box" supplier = "nanotrasen" description = "Drymate brand farwa cubes, shipped from Adhomai. Just add water!" - price = 55 + price = 250 items = list( /obj/item/storage/box/monkeycubes/farwacubes ) @@ -45,7 +45,7 @@ name = "monkey cube box" supplier = "nanotrasen" description = "Drymate brand monkey cubes. Just add water!" - price = 60 + price = 250 items = list( /obj/item/storage/box/monkeycubes ) @@ -58,8 +58,8 @@ category = "science" name = "neaera cube box" supplier = "nanotrasen" - description = "Drymate brand neaera cubes, shipped from Qerrbalak. Just add water!" - price = 65 + description = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!" + price = 250 items = list( /obj/item/storage/box/monkeycubes/neaeracubes ) @@ -72,7 +72,7 @@ name = "hazmat hood" supplier = "nanotrasen" description = "This hood protects against biological hazards." - price = 105 + price = 165 items = list( /obj/item/clothing/head/hazmat/general ) @@ -86,7 +86,7 @@ name = "hazmat suit" supplier = "nanotrasen" description = "This suit protects against biological hazards." - price = 105 + price = 200 items = list( /obj/item/clothing/suit/hazmat/general ) @@ -95,6 +95,132 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/mindshieldfiringpin + category = "science" + name = "mindshield firing pin" + supplier = "nanotrasen" + description = "This implant - locked firing pin authorizes the weapon for only mindshield-implanted users." + price = 800 + items = list( + /obj/item/device/firing_pin/implant/loyalty + ) + access = ACCESS_HEADS + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/protohuman + category = "science" + name = "Proto-Human" + supplier = "zeng_hu" + description = "A human body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." + price = 7200 + items = list( + /mob/living/carbon/human + ) + access = ACCESS_RESEARCH + container_type = "bodybag" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/proto_skrell + category = "science" + name = "Proto-Skrell" + supplier = "zeng_hu" + description = "A Skrell body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." + price = 9100 + items = list( + /mob/living/carbon/human/skrell + ) + access = ACCESS_RESEARCH + container_type = "bodybag" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/proto_tajara + category = "science" + name = "Proto-Tajara" + supplier = "zeng_hu" + description = "A Tajara body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." + price = 7450 + items = list( + /mob/living/carbon/human/tajaran + ) + access = ACCESS_RESEARCH + container_type = "bodybag" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/proto_unathi + category = "science" + name = "Proto-Unathi" + supplier = "zeng_hu" + description = "An Unathi body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." + price = 7800 + items = list( + /mob/living/carbon/human/unathi + ) + access = ACCESS_RESEARCH + container_type = "bodybag" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/blankvaurcadrone + category = "science" + name = "Surplus Vaurca Drone" + supplier = "zora" + description = "A surplus Vaurca drone body with functioning organs but a defective brain. Thousands of these are thrown at the wayside every day. The everyman's relatively-ethical solution to organ harvesting." + price = 500 + items = list( + /mob/living/carbon/human/type_a/cargo + ) + access = ACCESS_RESEARCH + container_type = "bodybag" + groupable = FALSE + spawn_amount = 1 + +/singleton/cargo_item/proximitysensor + category = "science" + name = "proximity sensor" + supplier = "nanotrasen" + description = "Used for scanning and alerting when someone enters a certain proximity." + price = 35 + items = list( + /obj/item/device/assembly/prox_sensor + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/testrange_firingpin + category = "science" + name = "test - range firing pin" + supplier = "nanotrasen" + description = "This safety firing pin allows weapons to be fired within proximity to a firing range." + price = 200 + items = list( + /obj/item/device/firing_pin/test_range + ) + access = ACCESS_RESEARCH + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + +/singleton/cargo_item/timer + category = "science" + name = "timer" + supplier = "nanotrasen" + description = "Used to time things. Works well with contraptions which has to count down. Tick tock." + price = 22 + items = list( + /obj/item/device/assembly/timer + ) + access = 0 + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/igniter category = "science" name = "igniter" @@ -108,129 +234,3 @@ container_type = "crate" groupable = TRUE spawn_amount = 1 - -/singleton/cargo_item/mindshieldfiringpin - category = "science" - name = "mindshield firing pin" - supplier = "nanotrasen" - description = "This implant - locked firing pin authorizes the weapon for only loyalty - implanted users." - price = 2000 - items = list( - /obj/item/device/firing_pin/implant/loyalty - ) - access = ACCESS_HEADS - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/protohuman - category = "science" - name = "Proto-Human" - supplier = "zeng_hu" - description = "A human body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." - price = 2300 - items = list( - /mob/living/carbon/human - ) - access = ACCESS_RESEARCH - container_type = "bodybag" - groupable = FALSE - spawn_amount = 1 - -/singleton/cargo_item/proto_skrell - category = "science" - name = "Proto-Skrell" - supplier = "zeng_hu" - description = "A Skrell body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." - price = 4000 - items = list( - /mob/living/carbon/human/skrell - ) - access = ACCESS_RESEARCH - container_type = "bodybag" - groupable = FALSE - spawn_amount = 1 - -/singleton/cargo_item/proto_tajara - category = "science" - name = "Proto-Tajara" - supplier = "zeng_hu" - description = "A Tajara body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." - price = 1800 - items = list( - /mob/living/carbon/human/tajaran - ) - access = ACCESS_RESEARCH - container_type = "bodybag" - groupable = FALSE - spawn_amount = 1 - -/singleton/cargo_item/proto_unathi - category = "science" - name = "Proto-Unathi" - supplier = "zeng_hu" - description = "An Unathi body, vat-grown and artificially raised without a functional brain. The everyman's relatively-ethical solution to organ harvesting." - price = 2000 - items = list( - /mob/living/carbon/human/unathi - ) - access = ACCESS_RESEARCH - container_type = "bodybag" - groupable = FALSE - spawn_amount = 1 - -/singleton/cargo_item/blankvaurcadrone - category = "science" - name = "Blank Vaurca Drone" - supplier = "zora" - description = "A surplus Vaurca drone body. Thousands of these are thrown at the wayside every day. The everyman's relatively-ethical solution to organ harvesting." - price = 300 - items = list( - /mob/living/carbon/human/type_a/cargo - ) - access = ACCESS_RESEARCH - container_type = "bodybag" - groupable = FALSE - spawn_amount = 1 - -/singleton/cargo_item/proximitysensor - category = "science" - name = "proximity sensor" - supplier = "nanotrasen" - description = "Used for scanning and alerting when someone enters a certain proximity." - price = 75 - items = list( - /obj/item/device/assembly/prox_sensor - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/testrange_firingpin - category = "science" - name = "test - range firing pin" - supplier = "nanotrasen" - description = "This safety firing pin allows weapons to be fired within proximity to a firing range." - price = 500 - items = list( - /obj/item/device/firing_pin/test_range - ) - access = ACCESS_RESEARCH - container_type = "crate" - groupable = TRUE - spawn_amount = 1 - -/singleton/cargo_item/timer - category = "science" - name = "timer" - supplier = "nanotrasen" - description = "Used to time things. Works well with contraptions which has to count down. Tick tock." - price = 75 - items = list( - /obj/item/device/assembly/timer - ) - access = 0 - container_type = "crate" - groupable = TRUE - spawn_amount = 1 diff --git a/code/modules/cargo/items/security.dm b/code/modules/cargo/items/security.dm index b04424cbc88..7be8cd65bb0 100644 --- a/code/modules/cargo/items/security.dm +++ b/code/modules/cargo/items/security.dm @@ -61,7 +61,7 @@ name = "maglight" supplier = "nanotrasen" description = "A heavy flashlight designed for security personnel." - price = 150 + price = 75 items = list( /obj/item/device/flashlight/maglight ) @@ -75,7 +75,7 @@ name = "magnetic door lock - security" supplier = "nanotrasen" description = "A large, ID locked device used for completely locking down airlocks. It is painted with Security colors." - price = 135 + price = 50 items = list( /obj/item/device/magnetic_lock/security ) @@ -89,7 +89,7 @@ name = "box of handcuffs" supplier = "nanotrasen" description = "A box full of handcuffs." - price = 345 + price = 145 items = list( /obj/item/storage/box/handcuffs ) @@ -103,7 +103,7 @@ name = "box of zipties" supplier = "nanotrasen" description = "A box full of zipties." - price = 145 + price = 88 items = list( /obj/item/storage/box/zipties ) @@ -117,7 +117,7 @@ name = "Shield Generator" supplier = "nanotrasen" description = "A shield generator." - price = 1500 + price = 550 items = list( /obj/machinery/shieldwallgen ) @@ -131,7 +131,7 @@ name = "box of pepperspray grenades" supplier = "zavodskoi" description = "A box containing 7 tear gas grenades. A gas mask is printed on the label. WARNING: Exposure carries risk of serious injuries." - price = 750 + price = 450 items = list( /obj/item/storage/box/teargas ) @@ -159,7 +159,7 @@ name = "box of EMP grenades" supplier = "zavodskoi" description = "A box containing 5 military grade EMP grenades. WARNING: Do not use near unshielded electronics or biomechanical augmentations." - price = 4395 + price = 1450 items = list( /obj/item/storage/box/emps ) @@ -173,7 +173,7 @@ name = "deployable barrier" supplier = "zavodskoi" description = "A deployable barrier. Swipe your ID card to lock/unlock it." - price = 750 + price = 440 items = list( /obj/machinery/deployable/barrier ) @@ -329,7 +329,7 @@ name = "security voidsuit" supplier = "zavodskoi" description = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." - price = 1500 + price = 900 items = list( /obj/item/clothing/suit/space/void/security ) @@ -343,7 +343,7 @@ name = "security voidsuit helmet" supplier = "zavodskoi" description = "A special helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." - price = 900 + price = 550 items = list( /obj/item/clothing/head/helmet/space/void/security ) diff --git a/code/modules/cargo/items/supply.dm b/code/modules/cargo/items/supply.dm index 813e4e308b9..3eb23dfdfc9 100644 --- a/code/modules/cargo/items/supply.dm +++ b/code/modules/cargo/items/supply.dm @@ -3,7 +3,7 @@ name = "boxes (x5)" supplier = "orion" description = "Versatile cardboard boxes." - price = 45 + price = 15 items = list( /obj/item/storage/box ) @@ -17,7 +17,7 @@ name = "bucket" supplier = "blam" description = "It's a bucket." - price = 10 + price = 8 items = list( /obj/item/reagent_containers/glass/bucket ) @@ -45,7 +45,7 @@ name = "clipboard" supplier = "orion" description = "The timeless prop for looking like your working." - price = 23 + price = 12 items = list( /obj/item/clipboard ) @@ -59,7 +59,7 @@ name = "blue folder" supplier = "orion" description = "A blue folder." - price = 8 + price = 4.50 items = list( /obj/item/folder/blue ) @@ -73,7 +73,7 @@ name = "yellow folder" supplier = "orion" description = "A yellow folder." - price = 8 + price = 4.50 items = list( /obj/item/folder/yellow ) @@ -87,7 +87,7 @@ name = "red folder" supplier = "orion" description = "A red folder." - price = 8 + price = 4.50 items = list( /obj/item/folder/red ) @@ -101,7 +101,7 @@ name = "white folder" supplier = "orion" description = "A white folder." - price = 8 + price = 4.50 items = list( /obj/item/folder/white ) @@ -115,7 +115,7 @@ name = "hand labeler" supplier = "nanotrasen" description = "Yes, it has your name on it!" - price = 8 + price = 12.50 items = list( /obj/item/device/hand_labeler ) @@ -129,7 +129,7 @@ name = "inflatable duck" supplier = "nanotrasen" description = "No bother to sink or swim when you can just float!" - price = 200 + price = 4.50 items = list( /obj/item/inflatable_duck ) @@ -142,7 +142,7 @@ category = "supply" name = "paper bin" supplier = "nanotrasen" - description = "A bin filled with paper - a paper bin!" + description = "Pre-stocked stationery bin filled with paper." price = 12 items = list( /obj/item/paper_bin @@ -157,7 +157,7 @@ name = "pen" supplier = "nanotrasen" description = "A normal black ink ballpen." - price = 8 + price = 2.50 items = list( /obj/item/pen ) @@ -171,7 +171,7 @@ name = "blue pen" supplier = "nanotrasen" description = "A normal blue ink ballpen." - price = 8 + price = 2.50 items = list( /obj/item/pen/blue ) @@ -185,7 +185,7 @@ name = "red pen" supplier = "nanotrasen" description = "A normal red ink ballpen." - price = 8 + price = 2.50 items = list( /obj/item/pen/red ) @@ -199,7 +199,7 @@ name = "multicolor pen" supplier = "nanotrasen" description = "A fancy pen that has several nibs in different colors that you can slide up and down." - price = 20 + price = 4.35 items = list( /obj/item/pen/multi ) @@ -213,7 +213,7 @@ name = "fountain pen" supplier = "nanotrasen" description = "It's an expensive fountain pen." - price = 30 + price = 50 items = list( /obj/item/pen/fountain ) @@ -241,7 +241,7 @@ name = "toner cartridge (x2)" supplier = "nanotrasen" description = "Toner is the back bone of any space based litigation." - price = 135 + price = 125 items = list( /obj/item/device/toner ) @@ -255,7 +255,7 @@ name = "small potted plant" supplier = "nanotrasen" description = "A random small potted plant, for when you want to add some greenery to your desk." - price = 100 + price = 35 items = list( /obj/random/pottedplant_small ) @@ -269,7 +269,7 @@ name = "large potted plant" supplier = "nanotrasen" description = "A random large potted plant, for when you want to add some greenery to your office space." - price = 300 + price = 70 items = list( /obj/random/pottedplant ) diff --git a/code/modules/cargo/items/weaponry.dm b/code/modules/cargo/items/weaponry.dm index ac59b4045d5..c0ea2f5f134 100644 --- a/code/modules/cargo/items/weaponry.dm +++ b/code/modules/cargo/items/weaponry.dm @@ -18,7 +18,7 @@ name = "taser gun" supplier = "nanotrasen" description = "The NT Mk30 NL is a small, low capacity gun used for non-lethal takedowns." - price = 150 + price = 310 items = list( /obj/item/gun/energy/taser ) @@ -32,7 +32,7 @@ name = ".45 pistol" supplier = "nanotrasen" description = "The NanoTrasen Mk58 .45-caliber pistol. Inexpensive, reliable, and ubiquitous among security forces galaxy-wide." - price = 1100 + price = 800 items = list( /obj/item/gun/projectile/sec ) @@ -46,7 +46,7 @@ name = "machine pistol" supplier = "zavodskoi" description = "The ZI 550 Saber is a cheap self-defense weapon, mass-produced by Zavodskoi Interstellar for paramilitary and private use." - price = 1600 + price = 1200 items = list( /obj/item/gun/projectile/automatic/wt550 ) @@ -60,7 +60,7 @@ name = "ballistic carbine" supplier = "virgo" description = "A durable, rugged looking semi-automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds." - price = 2400 + price = 1500 items = list( /obj/item/gun/projectile/automatic/rifle/carbine ) @@ -74,7 +74,7 @@ name = "Z8 bullpup assault carbine" supplier = "zavodskoi" description = "The ZI Bulldog 5.56mm bullpup assault carbine, Zavodskoi Industries' answer to any problem that can be solved by an assault rifle." - price = 2650 + price = 1750 items = list( /obj/item/gun/projectile/automatic/rifle/z8 ) @@ -88,7 +88,7 @@ name = "combat shotgun" supplier = "hephaestus" description = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders." - price = 2250 + price = 1300 items = list( /obj/item/gun/projectile/shotgun/pump/combat ) @@ -102,7 +102,7 @@ name = "energy carbine" supplier = "nanotrasen" description = "An energy-based carbine with two settings: Stun and kill." - price = 1800 + price = 1200 items = list( /obj/item/gun/energy/gun ) @@ -116,7 +116,7 @@ name = "energy pistol" supplier = "nanotrasen" description = "A basic energy-based pistol gun with two settings: Stun and kill." - price = 1200 + price = 750 items = list( /obj/item/gun/energy/pistol ) @@ -130,7 +130,7 @@ name = "ion rifle" supplier = "nanotrasen" description = "The NT Mk60 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats." - price = 2500 + price = 1200 items = list( /obj/item/gun/energy/rifle/ionrifle ) @@ -143,7 +143,7 @@ name = "marksman energy rifle" supplier = "hephaestus" description = "The HI L.W.A.P. is an older design of Hephaestus Industries. A designated marksman rifle capable of shooting powerful ionized bolts." - price = 3100 + price = 2100 items = list( /obj/item/gun/energy/sniperrifle ) @@ -157,7 +157,7 @@ name = "laser rifle" supplier = "nanotrasen" description = "A common laser weapon, designed to kill with concentrated energy blasts." - price = 2200 + price = 1400 items = list( /obj/item/gun/energy/rifle/laser ) @@ -171,7 +171,7 @@ name = "point entry anti-materiel cannon" supplier = "nanotrasen" description = "An SCC-designed, man-portable cannon meant to neutralize mechanized threats. Spectacularly effective, though equally spectacularly unwieldy." - price = 3200 + price = 2200 items = list( /obj/item/gun/projectile/peac ) @@ -185,7 +185,7 @@ name = "adhomian recoilless rifle" supplier = "zharkov" description = "Shoulder-fired man-portable anti-tank recoilless rifle with a single shot. Relatively inexpensive and does its job." - price = 1300 + price = 1200 items = list( /obj/item/gun/projectile/recoilless_rifle ) @@ -199,7 +199,7 @@ name = "bolt action rifle" supplier = "zharkov" description = "An Adhomian bolt-action rifle." - price = 850 + price = 750 items = list( /obj/item/gun/projectile/shotgun/pump/rifle ) @@ -227,7 +227,7 @@ name = "silenced pistol" supplier = "zharkov" description = "Internally silenced for stealthy operations." - price = 1950 + price = 1350 items = list( /obj/item/gun/projectile/silenced ) @@ -257,7 +257,7 @@ name = "shotgun ammunition box (haywire shells)" supplier = "zavodskoi" description = "A box of EMP-inducing 'haywire' shotgun shells." - price = 120 + price = 90 items = list( /obj/item/storage/box/haywireshells ) @@ -285,7 +285,7 @@ name = "shotgun ammunition box (buckshot)" supplier = "zavodskoi" description = "A box of shotgun buckshot shells." - price = 85 + price = 70 items = list( /obj/item/storage/box/shotgunshells ) @@ -299,7 +299,7 @@ name = "shotgun ammunition box (slug)" supplier = "zavodskoi" description = "A box of shotgun slugs." - price = 100 + price = 80 items = list( /obj/item/storage/box/shotgunammo ) @@ -336,28 +336,28 @@ groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/apcarbinemagazine_556 +/singleton/cargo_item/carbinemagazine_556 category = "weaponry" - name = "C-type armor-piercing carbine magazine (5.56mm)" + name = "C-type carbine magazine (5.56mm)" supplier = "zavodskoi" description = "Civilian-issue 5.56mm magazine with reduced capacity. Fits most private-issue 5.56mm weapons." - price = 60 + price = 45 items = list( - /obj/item/ammo_magazine/a556/carbine/ap + /obj/item/ammo_magazine/a556/carbine ) access = ACCESS_SECURITY container_type = "crate" groupable = TRUE spawn_amount = 1 -/singleton/cargo_item/carbinemagazine_556 +/singleton/cargo_item/apcarbinemagazine_556 category = "weaponry" - name = "C-type carbine magazine (5.56mm)" + name = "C-type armor-piercing carbine magazine (5.56mm)" supplier = "zavodskoi" description = "Civilian-issue 5.56mm magazine with reduced capacity. Fits most private-issue 5.56mm weapons." price = 55 items = list( - /obj/item/ammo_magazine/a556/carbine + /obj/item/ammo_magazine/a556/carbine/ap ) access = ACCESS_SECURITY container_type = "crate" @@ -369,7 +369,7 @@ name = "M-type rifle magazine (5.56mm)" supplier = "zavodskoi" description = "A 5.56 ammo magazine for military assault rifles. Incompatible with weapons that take C-type magazines." - price = 65 + price = 60 items = list( /obj/item/ammo_magazine/a556 ) @@ -378,12 +378,26 @@ groupable = TRUE spawn_amount = 1 +/singleton/cargo_item/magazine_556/ap + category = "weaponry" + name = "M-type armor-piercing rifle magazine (5.56mm)" + supplier = "zavodskoi" + description = "A 5.56 AP ammo magazine for military assault rifles. Incompatible with weapons that take C-type magazines." + price = 70 + items = list( + /obj/item/ammo_magazine/a556/ap + ) + access = ACCESS_SECURITY + container_type = "crate" + groupable = TRUE + spawn_amount = 1 + /singleton/cargo_item/magazine_762 category = "weaponry" name = "rifle magazine (7.62mm)" supplier = "zharkov" description = "A 7.62mm rifle magazine." - price = 70 + price = 65 items = list( /obj/item/ammo_magazine/d762 ) @@ -397,7 +411,7 @@ name = "pistol magazine (9mm)" supplier = "zharkov" description = "A 9mm pistol magazine." - price = 40 + price = 25 items = list( /obj/item/ammo_magazine/mc9mm ) @@ -411,7 +425,7 @@ name = "pistol magazine (.45)" supplier = "nanotrasen" description = "A .45-caliber pistol magazine." - price = 50 + price = 30 items = list( /obj/item/ammo_magazine/c45m ) @@ -425,7 +439,7 @@ name = "pistol magazine (.45 flash)" supplier = "nanotrasen" description = "A .45-caliber less-lethal flash magazine." - price = 40 + price = 35 items = list( /obj/item/ammo_magazine/c45m/flash ) @@ -439,7 +453,7 @@ name = "top mounted magazine (9mm)" supplier = "zavodskoi" description = "A top-mounted 9mm magazine designed for the ZI 550 machine pistol. Contains lethal rounds." - price = 60 + price = 40 items = list( /obj/item/ammo_magazine/mc9mmt ) @@ -453,7 +467,7 @@ name = "top mounted magazine (9mm rubber)" supplier = "zavodskoi" description = "A top-mounted 9mm magazine designed for the ZI 550 machine pistol. Contains less-lethal rubber rounds." - price = 50 + price = 35 items = list( /obj/item/ammo_magazine/mc9mmt/rubber ) @@ -466,8 +480,8 @@ category = "security" name = "tranquilizer darts (.50 cal PPS)" supplier = "nanotrasen" - description = "A magazine for some kind of gun." - price = 60 + description = "A box of 50-caliber tranquilizer darts." + price = 50 items = list( /obj/item/storage/box/tranquilizer ) @@ -478,7 +492,7 @@ /singleton/cargo_item/compacttungstenslug category = "weaponry" - name = "compact tungsten slug" + name = "compact tungsten gauss slugs" supplier = "virgo" description = "A box with several compact tungsten slugs, aimed for use in gauss carbines." price = 125 @@ -495,7 +509,7 @@ name = "francisca rotary cannon AP ammunition box" supplier = "zavodskoi" description = "A box of 40mm AP ammo for the francisca rotary cannon." - price = 1200 + price = 850 items = list( /obj/item/ship_ammunition/grauwolf_bundle/ap ) @@ -509,7 +523,7 @@ name = "francisca rotary cannon FMJ ammunition box" supplier = "zavodskoi" description = "A box of 40mm FMJ ammo for a Francisca-type rotary cannon." - price = 1100 + price = 800 items = list( /obj/item/ship_ammunition/grauwolf_bundle ) @@ -523,7 +537,7 @@ name = "grauwolf AP flak shells" supplier = "zavodskoi" description = "Armor-Piercing shells for a Grauwolf-type flak battery." - price = 2500 + price = 1800 items = list( /obj/item/ship_ammunition/grauwolf_bundle/ap ) @@ -537,7 +551,7 @@ name = "grauwolf HE flak shells" supplier = "zavodskoi" description = "High-explosive shells for a Grauwolf-type flak battery." - price = 2200 + price = 1600 items = list( /obj/item/ship_ammunition/grauwolf_bundle ) @@ -551,7 +565,7 @@ name = "longbow casing" supplier = "zavodskoi" description = "A casing for a 406mm warhead, designed for a Longbow-type cannon." - price = 2000 + price = 1000 items = list( /obj/item/ship_ammunition/longbow ) @@ -565,7 +579,7 @@ name = "longbow AP warhead" supplier = "zavodskoi" description = "An armor-piercing 406mm warhead, designed for a Longbow-type cannon." - price = 3500 + price = 1800 items = list( /obj/item/warhead/longbow/ap ) @@ -579,7 +593,7 @@ name = "longbow EP warhead" supplier = "zavodskoi" description = "A bunker-buster 406mm warhead, designed for a Longbow-type cannon." - price = 3500 + price = 2200 items = list( /obj/item/warhead/longbow/bunker ) @@ -593,7 +607,7 @@ name = "longbow HE warhead" supplier = "zavodskoi" description = "A high-explosive 406mm warhead, designed for a Longbow-type cannon." - price = 3200 + price = 1650 items = list( /obj/item/warhead/longbow ) @@ -607,7 +621,7 @@ name = "high-power longbow primer" supplier = "zavodskoi" description = "A high-power primer for a 406mm warhead, designed for a Longbow-type cannon." - price = 2000 + price = 800 items = list( /obj/item/primer/high ) @@ -621,7 +635,7 @@ name = "longbow warhead primer" supplier = "zavodskoi" description = "A standard primer for a 406mm warhead, designed for a Longbow-type cannon." - price = 1200 + price = 500 items = list( /obj/item/primer ) @@ -635,7 +649,7 @@ name = "low-power longbow primer" supplier = "zavodskoi" description = "A low-power primer for a 406mm warhead, designed for a Longbow-type cannon." - price = 700 + price = 350 items = list( /obj/item/primer/low ) diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 90628f778dd..8c7cf52670c 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -41,6 +41,16 @@ to_chat(user, SPAN_NOTICE("You add [src.worth] credits worth of money to the bundles.
It holds [bundle.worth] credits now.")) qdel(src) +/proc/coin_typepath_suffix(var/amount) + // accepts 0.01, 0.05, 0.10, 0.25; returns "c001", "c005", etc. + var/cents = round(amount * 100) + if(cents < 10) + return "c00[cents]" + else if(cents < 100) + return "c0[cents]" + else + return "c[cents]" + /obj/item/spacecash/bundle name = "credit chips" icon_state = "" @@ -51,32 +61,46 @@ /obj/item/spacecash/bundle/update_icon() ClearOverlays() var/list/ovr = list() - var/sum = src.worth var/num = 0 - for(var/i in list(1000,500,200,100,50,20,10,1)) - while(sum >= i && num < 50) - sum -= i + var/cents = round(src.worth * 100) // INTEGER CENTS for splitting + // list is in cents, so 1000 = $10, 100 = $1, 25 = $0.25, 1 = $0.01 + + if(src.worth < 1) + src.name = "credit coins" + src.drop_sound = 'sound/items/drop/ring.ogg' + src.pickup_sound = 'sound/items/pickup/ring.ogg' + else + src.name = "credit chips" + + // build The Pile(TM) + for(var/denom in list(100000,50000,20000,10000,5000,2000,1000,500,100,25,10,5,1)) + while(cents >= denom && num < 50) + cents -= denom num++ - var/image/banknote = image('icons/obj/cash.dmi', "spacecash[i]") + var/image/banknote + var/denom_value = denom / 100.0 + if(denom >= 100) + // bills (>= $1.00) + banknote = image('icons/obj/cash.dmi', "spacecash[round(denom_value)]") + else + // coins (< $1.00) + // pad denom_value for icon_state, e.g. "spacecash0.05" + var/coinstr = "[denom_value]" + if(findtext(coinstr, ".") && length(copytext(coinstr, findtext(coinstr, ".")+1)) == 1) + coinstr += "0" + banknote = image('icons/obj/cash.dmi', "spacecash[coinstr]") var/matrix/M = matrix() M.Translate(rand(-6, 6), rand(-4, 8)) M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) banknote.transform = M ovr += banknote - if(num == 0) // Less than one credit, let's just make it look like 1 for ease - var/image/banknote = image('icons/obj/cash.dmi', "spacecash1") - var/matrix/M = matrix() - M.Translate(rand(-6, 6), rand(-4, 8)) - M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45)) - banknote.transform = M - ovr += banknote AddOverlays(ovr) UpdateOverlays() // The delay looks weird, so we force an update immediately. - src.desc = "A bundle of Biesel Standard Credit chips. Combined, this is worth [worth] credits." + src.desc = "A bundle of Biesel Standard Credits. Combined, this is worth [worth] credits." /obj/item/spacecash/bundle/attack_self(mob/user as mob) - var/amount = tgui_input_number(user, "How many credits do you want to take? (0 to [src.worth])", "Take Money", 20, worth, 0) + var/amount = tgui_input_number(user, "How many credits do you want to take out? (0 to [src.worth])", "Take Money", 5, worth, 0, 0, round_value = FALSE) if(QDELETED(src)) return 0 @@ -84,25 +108,58 @@ if(use_check_and_message(user,USE_FORCE_SRC_IN_USER)) return 0 - amount = round(clamp(amount, 0, src.worth)) - if(amount==0) return 0 + if(amount == 0) return 0 + + var/cents_out = round(amount * 100) + var/bundle_cents = round(src.worth * 100) + + if(cents_out > bundle_cents) + cents_out = bundle_cents + + src.worth = (bundle_cents - cents_out) / 100.0 + + // get rid of floating points + if(abs(src.worth) < 0.0001) + src.worth = 0 - src.worth -= amount src.update_icon() - if(!worth) + if(!src.worth) user.drop_from_inventory(src) - if(amount in list(1000,500,200,100,50,20,1)) - var/cashtype = text2path("/obj/item/spacecash/c[amount]") - var/obj/cash = new cashtype (user.loc) - user.put_in_hands(cash) + // bill denominations (whole creds) + if(cents_out >= 100 && cents_out % 100 == 0) + var/dollars = cents_out / 100 + var/cashtype = text2path("/obj/item/spacecash/c[dollars]") + if(isnull(cashtype)) + // fallback: spawn a bundle if something's wrong + var/obj/item/spacecash/bundle/bundle = new(user.loc) + bundle.worth = cents_out / 100.0 + bundle.update_icon() + user.put_in_hands(bundle) + else + var/obj/cash = new cashtype(user.loc) + user.put_in_hands(cash) + + // coin denominations + else if(cents_out in list(25, 10, 5, 1)) + var/cashtype = text2path("/obj/item/spacecash/coin/[coin_typepath_suffix(cents_out / 100.0)]") + if(isnull(cashtype)) + var/obj/item/spacecash/bundle/bundle = new(user.loc) + bundle.worth = cents_out / 100.0 + bundle.update_icon() + user.put_in_hands(bundle) + else + var/obj/cash = new cashtype(user.loc) + user.put_in_hands(cash) + + // fallback for weird edge cases else - var/obj/item/spacecash/bundle/bundle = new (user.loc) - bundle.worth = amount + var/obj/item/spacecash/bundle/bundle = new(user.loc) + bundle.worth = cents_out / 100.0 bundle.update_icon() user.put_in_hands(bundle) - if(!worth) + if(!src.worth) qdel(src) /obj/item/spacecash/c1 @@ -111,6 +168,12 @@ desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1 credit." worth = 1 +/obj/item/spacecash/c5 + name = "5 credit chip" + icon_state = "spacecash5" + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 5 credits." + worth = 5 + /obj/item/spacecash/c10 name = "10 credit chip" icon_state = "spacecash10" @@ -153,18 +216,81 @@ desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1000 credits." worth = 1000 +/obj/item/spacecash/coin + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + worth = 0 + var/sides = 2 + var/last_flip = 0 //spam limiter + +/obj/item/spacecash/coin/attack_self(mob/user) + if(last_flip <= world.time - 20) + last_flip = world.time + var/result = rand(1, sides) + var/comment = "" + if(result == 1) + comment = "tails" + else if(result == 2) + comment = "heads" + playsound(get_turf(src), 'sound/items/coinflip.ogg', 100, 1, -4) + user.visible_message(SPAN_NOTICE("\The [user] throws \the [src]. It lands on [comment]!"), SPAN_NOTICE("You throw \the [src]. It lands on [comment]!")) + +/obj/item/spacecash/coin/c001 + name = "1 cent unie coin" + icon_state = "spacecash0.01" + desc = "A Biesel Standard Credit coin, called a 'unie'. This is worth 0.01 credits." + worth = 0.01 + +/obj/item/spacecash/coin/c005 + name = "5 cent quin coin" + icon_state = "spacecash0.05" + desc = "A Biesel Standard Credit coin, called a 'quin'. This is worth 0.05 credits." + worth = 0.05 + +/obj/item/spacecash/coin/c010 + name = "10 cent dece coin" + icon_state = "spacecash0.10" + desc = "A Biesel Standard Credit coin, called a 'dece'. This is worth 0.10 credits." + worth = 0.10 + +/obj/item/spacecash/coin/c025 + name = "25 cent quarter coin" + icon_state = "spacecash0.25" + desc = "A Biesel Standard Credit coin, called a 'quarter'. This is worth 0.25 credits." + worth = 0.25 + /proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) - if(sum in list(1000,500,200,100,50,20,10,1)) - var/cash_type = text2path("/obj/item/spacecash/c[sum]") - var/obj/cash = new cash_type (spawnloc) - if(ishuman(human_user) && !human_user.get_active_hand()) - human_user.put_in_hands(cash) - else - var/obj/item/spacecash/bundle/bundle = new (spawnloc) - bundle.worth = sum - bundle.update_icon() - if (ishuman(human_user) && !human_user.get_active_hand()) - human_user.put_in_hands(bundle) + var/cents = round(sum * 100) + // list all bill and coin denominations (in cents) + var/list/denoms = list( + 100000,50000,20000,10000,5000,2000,1000,500,100, // Bills: $1000 ... $1 + 25,10,5,1 // Coins: $0.25, $0.10, $0.05, $0.01 + ) + + // check for a single denomination match first (bill or coin) + if(cents in denoms) + var objpath + if(cents >= 100) + var/dollars = cents / 100 + objpath = text2path("/obj/item/spacecash/c[dollars]") + else + var/coin_value = "[cents / 100.0]" + // pad to two decimals for path if needed + if(findtext(coin_value, ".") && length(copytext(coin_value, ".")+1) == 1) + coin_value += "0" + objpath = text2path("/obj/item/spacecash/coin/[coin_typepath_suffix(cents / 100.0)]") + if(!isnull(objpath)) + var/obj/cash = new objpath(spawnloc) + if(ishuman(human_user) && !human_user.get_active_hand()) + human_user.put_in_hands(cash) + return + + // spawn a bundle for mixed/odd amounts + var/obj/item/spacecash/bundle/bundle = new(spawnloc) + bundle.worth = cents / 100.0 + bundle.update_icon() + if(ishuman(human_user) && !human_user.get_active_hand()) + human_user.put_in_hands(bundle) return /obj/item/spacecash/ewallet diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index eec5ba4e9eb..445d8911368 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -4,133 +4,133 @@ var/list/worths = list( //ROBOT ASSEMBLIES, - /obj/item/farmbot_arm_assembly = 130, - /obj/item/firstaid_arm_assembly = 150, - /obj/item/bucket_sensor = 40, + /obj/item/farmbot_arm_assembly = 13, + /obj/item/firstaid_arm_assembly = 15, + /obj/item/bucket_sensor = 4, //REAGENT CONTAINERS, - /obj/item/reagent_containers/hypospray/combat = -200, - /obj/item/reagent_containers/hypospray = -90, + /obj/item/reagent_containers/hypospray/combat = -20, + /obj/item/reagent_containers/hypospray = -9, /obj/item/reagent_containers/spray = -23, /obj/item/reagent_containers/food/snacks/monkeycube = -35, - /obj/item/reagent_containers/food/snacks/human = -300, + /obj/item/reagent_containers/food/snacks/human = -30, /obj/item/reagent_containers/food/snacks/sliceable = -25, /obj/item/reagent_containers/food/snacks/monkeycube = -15, - /obj/item/reagent_containers/food/snacks = -10, + /obj/item/reagent_containers/food/snacks = -1, /obj/item/reagent_containers/food/drinks/bottle = -11, /obj/item/reagent_containers/food/drinks = -8, /obj/item/reagent_containers/glass/rag = -5, - /obj/item/reagent_containers/glass = -60, + /obj/item/reagent_containers/glass = -6, /obj/item/reagent_containers = -1, //ENERGY GUNS, - /obj/item/gun/energy/rifle/pulse/destroyer = 9000, - /obj/item/gun/energy/rifle/pulse = 7000, - /obj/item/gun/energy/rifle/icelance = 800, - /obj/item/gun/energy/rifle/laser/heavy = 6500, - /obj/item/gun/energy/rifle/laser/xray = 4500, - /obj/item/gun/energy/rifle = 1500, - /obj/item/gun/energy/gun/nuclear = 2800, - /obj/item/gun/energy/gun = 700, - /obj/item/gun/energy/pistol = 550, - /obj/item/gun/energy/laser/shotgun = 4800, - /obj/item/gun/energy/laser/practice = 500, - /obj/item/gun/energy/laser = 1000, - /obj/item/gun/energy/retro = 1400, - /obj/item/gun/energy/captain = 8500, - /obj/item/gun/energy/xray = 3500, - /obj/item/gun/energy/sniperrifle = 6400, - /obj/item/gun/energy/lasertag = 10, - /obj/item/gun/energy/pulse/pistol = 4500, - /obj/item/gun/energy/pulse = 5000, - /obj/item/gun/energy/rifle/ionrifle = 2000, - /obj/item/gun/energy/decloner = 6500, - /obj/item/gun/energy/floragun = 1500, - /obj/item/gun/energy/mindflayer = 4500, - /obj/item/gun/energy/toxgun = 3500, - /obj/item/gun/energy/mousegun = 2000, - /obj/item/gun/energy/net = 3500, - /obj/item/gun/energy/vaurca/bfg = 20000, - /obj/item/gun/energy/vaurca/gatlinglaser = 6000, - /obj/item/gun/energy/vaurca/blaster = 4500, - /obj/item/gun/energy/vaurca/thermaldrill = 5000, - /obj/item/gun/energy/vaurca = 3000, - /obj/item/gun/energy/taser = 500, - /obj/item/gun/energy/crossbow/largecrossbow = 1600, - /obj/item/gun/energy/crossbow = 750, - /obj/item/gun/energy/temperature = 3000, - /obj/item/gun/energy/lawgiver = 7000, - /obj/item/gun/custom_ka/frame01/prebuilt = 2500, - /obj/item/gun/custom_ka/frame02/prebuilt = 3500, - /obj/item/gun/custom_ka/frame03/prebuilt = 4500, - /obj/item/gun/custom_ka/frame04/prebuilt = 5500, - /obj/item/gun/custom_ka/frame05/prebuilt = 6500, - /obj/item/gun/energy/plasmacutter = 6000, - /obj/item/gun/energy/stunrevolver = 650, - /obj/item/gun/energy/tesla = 7000, - /obj/item/gun/energy/gravity_gun = 4500, - /obj/item/gun/energy = 2100, + /obj/item/gun/energy/rifle/pulse/destroyer = 900, + /obj/item/gun/energy/rifle/pulse = 700, + /obj/item/gun/energy/rifle/icelance = 80, + /obj/item/gun/energy/rifle/laser/heavy = 650, + /obj/item/gun/energy/rifle/laser/xray = 450, + /obj/item/gun/energy/rifle = 150, + /obj/item/gun/energy/gun/nuclear = 280, + /obj/item/gun/energy/gun = 70, + /obj/item/gun/energy/pistol = 55, + /obj/item/gun/energy/laser/shotgun = 480, + /obj/item/gun/energy/laser/practice = 50, + /obj/item/gun/energy/laser = 100, + /obj/item/gun/energy/retro = 140, + /obj/item/gun/energy/captain = 850, + /obj/item/gun/energy/xray = 350, + /obj/item/gun/energy/sniperrifle = 640, + /obj/item/gun/energy/lasertag = 1, + /obj/item/gun/energy/pulse/pistol = 450, + /obj/item/gun/energy/pulse = 500, + /obj/item/gun/energy/rifle/ionrifle = 200, + /obj/item/gun/energy/decloner = 650, + /obj/item/gun/energy/floragun = 150, + /obj/item/gun/energy/mindflayer = 450, + /obj/item/gun/energy/toxgun = 350, + /obj/item/gun/energy/mousegun = 200, + /obj/item/gun/energy/net = 350, + /obj/item/gun/energy/vaurca/bfg = 2000, + /obj/item/gun/energy/vaurca/gatlinglaser = 600, + /obj/item/gun/energy/vaurca/blaster = 450, + /obj/item/gun/energy/vaurca/thermaldrill = 500, + /obj/item/gun/energy/vaurca = 300, + /obj/item/gun/energy/taser = 50, + /obj/item/gun/energy/crossbow/largecrossbow = 160, + /obj/item/gun/energy/crossbow = 75, + /obj/item/gun/energy/temperature = 300, + /obj/item/gun/energy/lawgiver = 700, + /obj/item/gun/custom_ka/frame01/prebuilt = 250, + /obj/item/gun/custom_ka/frame02/prebuilt = 350, + /obj/item/gun/custom_ka/frame03/prebuilt = 450, + /obj/item/gun/custom_ka/frame04/prebuilt = 550, + /obj/item/gun/custom_ka/frame05/prebuilt = 650, + /obj/item/gun/energy/plasmacutter = 600, + /obj/item/gun/energy/stunrevolver = 65, + /obj/item/gun/energy/tesla = 700, + /obj/item/gun/energy/gravity_gun = 450, + /obj/item/gun/energy = 210, //LAUNCHERS, - /obj/item/gun/launcher/spikethrower = 3500, - /obj/item/gun/launcher/rocket = 8000, - /obj/item/gun/launcher/crossbow = 120, - /obj/item/gun/launcher/pneumatic = 200, - /obj/item/gun/launcher/syringe = 150, - /obj/item/gun/launcher = 300, + /obj/item/gun/launcher/spikethrower = 350, + /obj/item/gun/launcher/rocket = 800, + /obj/item/gun/launcher/crossbow = 12, + /obj/item/gun/launcher/pneumatic = 20, + /obj/item/gun/launcher/syringe = 15, + /obj/item/gun/launcher = 30, //AUTOMATICS, - /obj/item/gun/projectile/automatic/rifle/sts35 = 3800, - /obj/item/gun/projectile/automatic/rifle/carbine = 3000, - /obj/item/gun/projectile/automatic/rifle/z8 = 3100, - /obj/item/gun/projectile/automatic/rifle/l6_saw = 13400, - /obj/item/gun/projectile/automatic/rifle/shotgun = 8500, - /obj/item/gun/projectile/automatic/rifle/w556 = 7500, - /obj/item/gun/projectile/automatic/c20r = 3250, - /obj/item/gun/projectile/automatic/wt550 = 2200, - /obj/item/gun/projectile/automatic/tommygun = 4000, - /obj/item/gun/projectile/automatic/mini_uzi = 2000, - /obj/item/gun/projectile/automatic/railgun = 8000, - /obj/item/gun/projectile/automatic/x9 = 2500, - /obj/item/gun/projectile/automatic/terminator = 15000, - /obj/item/gun/projectile/automatic = 2000, + /obj/item/gun/projectile/automatic/rifle/sts35 = 380, + /obj/item/gun/projectile/automatic/rifle/carbine = 300, + /obj/item/gun/projectile/automatic/rifle/z8 = 310, + /obj/item/gun/projectile/automatic/rifle/l6_saw = 1340, + /obj/item/gun/projectile/automatic/rifle/shotgun = 850, + /obj/item/gun/projectile/automatic/rifle/w556 = 750, + /obj/item/gun/projectile/automatic/c20r = 325, + /obj/item/gun/projectile/automatic/wt550 = 220, + /obj/item/gun/projectile/automatic/tommygun = 400, + /obj/item/gun/projectile/automatic/mini_uzi = 200, + /obj/item/gun/projectile/automatic/railgun = 800, + /obj/item/gun/projectile/automatic/x9 = 250, + /obj/item/gun/projectile/automatic/terminator = 1500, + /obj/item/gun/projectile/automatic = 200, //PROJECTILE, - /obj/item/gun/projectile/shotgun/pump/combat = 5500, - /obj/item/gun/projectile/shotgun/pump/rifle = 1200, - /obj/item/gun/projectile/shotgun/pump = 3500, - /obj/item/gun/projectile/shotgun/doublebarrel = 2500, - /obj/item/gun/projectile/shotgun/improvised = 1000, - /obj/item/gun/projectile/improvised_handgun = 650, - /obj/item/gun/projectile/revolver/lemat = 1500, - /obj/item/gun/projectile/revolver/derringer = 1700, - /obj/item/gun/projectile/revolver/detective = 1500, - /obj/item/gun/projectile/revolver = 3500, - /obj/item/gun/projectile/colt = 1700, - /obj/item/gun/projectile/sec = 1650, - /obj/item/gun/projectile/tanto = 2500, - /obj/item/gun/projectile/deagle = 5600, - /obj/item/gun/projectile/gyropistol = 7500, - /obj/item/gun/projectile/heavysniper/tranq = 6000, - /obj/item/gun/projectile/heavysniper = 12000, - /obj/item/gun/projectile/silenced = 1700, - /obj/item/gun/projectile/dragunov = 2500, - /obj/item/gun/projectile/contender = 1300, - /obj/item/gun/projectile/leyon = 500, - /obj/item/gun/projectile/cannon = 2100, - /obj/item/gun/projectile/nuke = 15000, - /obj/item/gun/projectile = 1500, + /obj/item/gun/projectile/shotgun/pump/combat = 550, + /obj/item/gun/projectile/shotgun/pump/rifle = 120, + /obj/item/gun/projectile/shotgun/pump = 350, + /obj/item/gun/projectile/shotgun/doublebarrel = 250, + /obj/item/gun/projectile/shotgun/improvised = 100, + /obj/item/gun/projectile/improvised_handgun = 65, + /obj/item/gun/projectile/revolver/lemat = 150, + /obj/item/gun/projectile/revolver/derringer = 170, + /obj/item/gun/projectile/revolver/detective = 150, + /obj/item/gun/projectile/revolver = 350, + /obj/item/gun/projectile/colt = 170, + /obj/item/gun/projectile/sec = 165, + /obj/item/gun/projectile/tanto = 250, + /obj/item/gun/projectile/deagle = 560, + /obj/item/gun/projectile/gyropistol = 750, + /obj/item/gun/projectile/heavysniper/tranq = 600, + /obj/item/gun/projectile/heavysniper = 1200, + /obj/item/gun/projectile/silenced = 170, + /obj/item/gun/projectile/dragunov = 250, + /obj/item/gun/projectile/contender = 130, + /obj/item/gun/projectile/leyon = 50, + /obj/item/gun/projectile/cannon = 210, + /obj/item/gun/projectile/nuke = 1500, + /obj/item/gun/projectile = 150, //GUN, - /obj/item/gun/bang = 200, - /obj/item/gun = 500, + /obj/item/gun/bang = 20, + /obj/item/gun = 50, //MATERIAL STACKS, - /obj/item/stack/material/marble = -20, - /obj/item/stack/material/diamond = -60, - /obj/item/stack/material/uranium = -120, + /obj/item/stack/material/marble = -2, + /obj/item/stack/material/diamond = -6, + /obj/item/stack/material/uranium = -12, /obj/item/stack/material/plastic = -15, /obj/item/stack/material/gold = -55, /obj/item/stack/material/silver = -45, /obj/item/stack/material/platinum = -95, - /obj/item/stack/material/mhydrogen = -110, - /obj/item/stack/material/tritium = -100, - /obj/item/stack/material/osmium = -100, - /obj/item/stack/material/plasteel = -100, - /obj/item/stack/material/phoron = -70, + /obj/item/stack/material/mhydrogen = -11, + /obj/item/stack/material/tritium = -10, + /obj/item/stack/material/osmium = -10, + /obj/item/stack/material/plasteel = -10, + /obj/item/stack/material/phoron = -7, /obj/item/stack/material/wood = -2, /obj/item/stack/material/cloth = -3, /obj/item/stack/material/cardboard = -1, @@ -139,723 +139,723 @@ var/list/worths = list( /obj/item/stack/material/glass/phoronrglass = -65, /obj/item/stack/material = -5, //STACKS, - /obj/item/stack/medical/advanced/bruise_pack = -30, - /obj/item/stack/medical/advanced/ointment = -40, + /obj/item/stack/medical/advanced/bruise_pack = -3, + /obj/item/stack/medical/advanced/ointment = -4, /obj/item/stack/medical/splint = -25, /obj/item/stack/medical = -15, - /obj/item/stack/nanopaste = -30, + /obj/item/stack/nanopaste = -3, /obj/item/stack/rods = -5, - /obj/item/stack/telecrystal = -1000, + /obj/item/stack/telecrystal = -100, /obj/item/stack/wax = -5, /obj/item/stack = -5, //STORAGE, - /obj/item/storage/briefcase/crimekit = -50, - /obj/item/storage/belt/military = 700, - /obj/item/storage/belt/security/tactical = 500, - /obj/item/storage/belt/soulstone = 800, - /obj/item/storage/belt = -50, - /obj/item/storage/belt/medical/paramedic/combat = 650, - /obj/item/storage/backpack/holding = -3000, - /obj/item/storage = -30, + /obj/item/storage/briefcase/crimekit = -5, + /obj/item/storage/belt/military = 70, + /obj/item/storage/belt/security/tactical = 50, + /obj/item/storage/belt/soulstone = 80, + /obj/item/storage/belt = -5, + /obj/item/storage/belt/medical/paramedic/combat = 65, + /obj/item/storage/backpack/holding = -300, + /obj/item/storage = -3, //WEAPONS, /obj/item/spacecash = -1, - /obj/item/ore = 10, - /obj/item/mining_scanner = 130, - /obj/item/bee_smoker = 50, - /obj/item/anomaly_core = 20000, - /obj/item/am_containment = 5000, - /obj/item/coin/diamond = 500, - /obj/item/coin/platinum = 250, - /obj/item/coin/phoron = 200, + /obj/item/ore = 1, + /obj/item/mining_scanner = 13, + /obj/item/bee_smoker = 5, + /obj/item/anomaly_core = 2000, + /obj/item/am_containment = 500, + /obj/item/coin/diamond = 50, + /obj/item/coin/platinum = 25, + /obj/item/coin/phoron = 20, /obj/item/coin/uranium = 125, - /obj/item/coin/gold = 50, + /obj/item/coin/gold = 5, /obj/item/coin/casino = 25, /obj/item/coin/silver = 25, /obj/item/coin/iron = 5, /obj/item/coin = 3, //MINING GEAR, - /obj/item/pickaxe/silver = 300, - /obj/item/pickaxe/drill = 100, - /obj/item/pickaxe/jackhammer = 90, - /obj/item/pickaxe/gold = 400, - /obj/item/pickaxe/diamond = 600, - /obj/item/pickaxe/diamonddrill = 700, - /obj/item/pickaxe = 30, - /obj/item/shovel/spade = 20, - /obj/item/rfd/mining = 200, - /obj/item/ore_radar = 30, - /obj/item/lazarus_injector = 800, - /obj/item/extraction_pack = 600, - /obj/item/resonator/upgraded = 650, - /obj/item/resonator = 450, - /obj/item/oremagnet = 250, - /obj/item/autochisel = 500, - /obj/item/docility_serum = 200, - /obj/item/advanced_docility_serum = 300, - /obj/item/slimesteroid = 150, - /obj/item/extract_enhancer = 250, - /obj/item/portable_destructive_analyzer = 780, - /obj/item/inflatable_dispenser = 300, - /obj/item/matter_decompiler = 400, + /obj/item/pickaxe/silver = 30, + /obj/item/pickaxe/drill = 10, + /obj/item/pickaxe/jackhammer = 9, + /obj/item/pickaxe/gold = 40, + /obj/item/pickaxe/diamond = 60, + /obj/item/pickaxe/diamonddrill = 70, + /obj/item/pickaxe = 3, + /obj/item/shovel/spade = 2, + /obj/item/rfd/mining = 20, + /obj/item/ore_radar = 3, + /obj/item/lazarus_injector = 80, + /obj/item/extraction_pack = 60, + /obj/item/resonator/upgraded = 65, + /obj/item/resonator = 45, + /obj/item/oremagnet = 25, + /obj/item/autochisel = 50, + /obj/item/docility_serum = 20, + /obj/item/advanced_docility_serum = 30, + /obj/item/slimesteroid = 15, + /obj/item/extract_enhancer = 25, + /obj/item/portable_destructive_analyzer = 78, + /obj/item/inflatable_dispenser = 30, + /obj/item/matter_decompiler = 40, //COMPUTER HARDWARE, - /obj/item/computer_hardware/battery_module/advanced = 110, - /obj/item/computer_hardware/battery_module/super = 150, - /obj/item/computer_hardware/battery_module/ultra = 190, - /obj/item/computer_hardware/battery_module/micro = 80, - /obj/item/computer_hardware/battery_module/nano = 60, - /obj/item/computer_hardware/battery_module/lambda = 100000, - /obj/item/computer_hardware/hard_drive/advanced = 160, - /obj/item/computer_hardware/hard_drive/super = 250, - /obj/item/computer_hardware/hard_drive/cluster = 500, - /obj/item/computer_hardware/hard_drive/small = 100, - /obj/item/computer_hardware/hard_drive/micro = 60, - /obj/item/computer_hardware/hard_drive/portable = 30, - /obj/item/computer_hardware/hard_drive/portable/advanced = 60, + /obj/item/computer_hardware/battery_module/advanced = 11, + /obj/item/computer_hardware/battery_module/super = 15, + /obj/item/computer_hardware/battery_module/ultra = 19, + /obj/item/computer_hardware/battery_module/micro = 8, + /obj/item/computer_hardware/battery_module/nano = 6, + /obj/item/computer_hardware/battery_module/lambda = 10000, + /obj/item/computer_hardware/hard_drive/advanced = 16, + /obj/item/computer_hardware/hard_drive/super = 25, + /obj/item/computer_hardware/hard_drive/cluster = 50, + /obj/item/computer_hardware/hard_drive/small = 10, + /obj/item/computer_hardware/hard_drive/micro = 6, + /obj/item/computer_hardware/hard_drive/portable = 3, + /obj/item/computer_hardware/hard_drive/portable/advanced = 6, /obj/item/computer_hardware/hard_drive/portable/super = 125, - /obj/item/computer_hardware/network_card/advanced = 90, - /obj/item/computer_hardware/network_card/wired = 40, - /obj/item/computer_hardware/processor_unit/small = 80, - /obj/item/computer_hardware/processor_unit/photonic = 400, - /obj/item/computer_hardware/processor_unit/photonic/small = 120, - /obj/item/computer_hardware/processor_unit = 200, - /obj/item/computer_hardware/tesla_link = 350, - /obj/item/computer_hardware = 80, + /obj/item/computer_hardware/network_card/advanced = 9, + /obj/item/computer_hardware/network_card/wired = 4, + /obj/item/computer_hardware/processor_unit/small = 8, + /obj/item/computer_hardware/processor_unit/photonic = 40, + /obj/item/computer_hardware/processor_unit/photonic/small = 12, + /obj/item/computer_hardware/processor_unit = 20, + /obj/item/computer_hardware/tesla_link = 35, + /obj/item/computer_hardware = 8, /obj/item/computer_hardware/hard_drive = 125, /obj/item/clipboard = 15, //POWER CELLS, - /obj/item/cell/device = 100, - /obj/item/cell/crap = 30, - /obj/item/cell/apc = 130, - /obj/item/cell/high = 160, - /obj/item/cell/mecha = 220, - /obj/item/cell/super = 280, - /obj/item/cell/hyper = 310, - /obj/item/cell/infinite = 50000, + /obj/item/cell/device = 10, + /obj/item/cell/crap = 3, + /obj/item/cell/apc = 13, + /obj/item/cell/high = 16, + /obj/item/cell/mecha = 22, + /obj/item/cell/super = 28, + /obj/item/cell/hyper = 31, + /obj/item/cell/infinite = 5000, /obj/item/cell/potato = 1, - /obj/item/cell/slime = 160, - /obj/item/cell = 60, + /obj/item/cell/slime = 16, + /obj/item/cell = 6, //SMES COILS, - /obj/item/smes_coil/weak = 1000, - /obj/item/smes_coil/super_capacity = 5000, - /obj/item/smes_coil/super_io = 4500, - /obj/item/smes_coil = 2000, - /obj/item/tracker_electronics = 150, - /obj/item/am_containment = 5000, - /obj/item/syringe_cartridge = 20, - /obj/item/suppressor = 60, - /obj/item/fossil = 100, + /obj/item/smes_coil/weak = 100, + /obj/item/smes_coil/super_capacity = 500, + /obj/item/smes_coil/super_io = 450, + /obj/item/smes_coil = 200, + /obj/item/tracker_electronics = 15, + /obj/item/am_containment = 500, + /obj/item/syringe_cartridge = 2, + /obj/item/suppressor = 6, + /obj/item/fossil = 10, /obj/item/vampiric = 666, - /obj/item/anobattery = 1800, - /obj/item/anodevice = 3300, + /obj/item/anobattery = 180, + /obj/item/anodevice = 330, /obj/item/soap/deluxe = 15, - /obj/item/cane/concealed = 250, - /obj/item/cane = 40, - /obj/item/disk/nuclear = 10000, - /obj/item/disk = 90, + /obj/item/cane/concealed = 25, + /obj/item/cane = 4, + /obj/item/disk/nuclear = 1000, + /obj/item/disk = 9, /obj/item/clothing/suit/caution = 15, - /obj/item/module = 100, + /obj/item/module = 10, //STOCK PARTS, - /obj/item/stock_parts/capacitor/adv = 160, - /obj/item/stock_parts/scanning_module/adv = 160, - /obj/item/stock_parts/manipulator/nano = 160, - /obj/item/stock_parts/micro_laser/high = 160, - /obj/item/stock_parts/matter_bin/adv = 160, - /obj/item/stock_parts/capacitor/super = 300, - /obj/item/stock_parts/scanning_module/phasic = 300, - /obj/item/stock_parts/manipulator/pico = 250, - /obj/item/stock_parts/micro_laser/ultra = 290, - /obj/item/stock_parts/matter_bin/super = 310, - /obj/item/stock_parts/subspace/ansible = 500, - /obj/item/stock_parts/subspace/filter = 560, - /obj/item/stock_parts/subspace/amplifier = 540, - /obj/item/stock_parts/subspace/treatment = 570, - /obj/item/stock_parts/subspace/analyzer = 630, - /obj/item/stock_parts/subspace/crystal = 530, - /obj/item/stock_parts/subspace/transmitter = 620, - /obj/item/stock_parts = 80, - /obj/item/ectoplasm = 700, - /obj/item/toy/xmas_cracker = 20, - /obj/item/pinpointer/advpinpointer = 330, - /obj/item/pinpointer = 180, - /obj/item/airalarm_electronics = 90, - /obj/item/firealarm_electronics = 80, + /obj/item/stock_parts/capacitor/adv = 16, + /obj/item/stock_parts/scanning_module/adv = 16, + /obj/item/stock_parts/manipulator/nano = 16, + /obj/item/stock_parts/micro_laser/high = 16, + /obj/item/stock_parts/matter_bin/adv = 16, + /obj/item/stock_parts/capacitor/super = 30, + /obj/item/stock_parts/scanning_module/phasic = 30, + /obj/item/stock_parts/manipulator/pico = 25, + /obj/item/stock_parts/micro_laser/ultra = 29, + /obj/item/stock_parts/matter_bin/super = 31, + /obj/item/stock_parts/subspace/ansible = 50, + /obj/item/stock_parts/subspace/filter = 56, + /obj/item/stock_parts/subspace/amplifier = 54, + /obj/item/stock_parts/subspace/treatment = 57, + /obj/item/stock_parts/subspace/analyzer = 63, + /obj/item/stock_parts/subspace/crystal = 53, + /obj/item/stock_parts/subspace/transmitter = 62, + /obj/item/stock_parts = 8, + /obj/item/ectoplasm = 70, + /obj/item/toy/xmas_cracker = 2, + /obj/item/pinpointer/advpinpointer = 33, + /obj/item/pinpointer = 18, + /obj/item/airalarm_electronics = 9, + /obj/item/firealarm_electronics = 8, /obj/item/camera_assembly = 35, - /obj/item/orion_ship = 100, - /obj/item/airlock_electronics/secure = 600, - /obj/item/airlock_electronics = 300, - /obj/item/aiModule = 3000, - /obj/item/autopsy_scanner = 180, + /obj/item/orion_ship = 10, + /obj/item/airlock_electronics/secure = 60, + /obj/item/airlock_electronics = 30, + /obj/item/aiModule = 300, + /obj/item/autopsy_scanner = 18, //CARDS, - /obj/item/card/data = 300, - /obj/item/card/emag = 600, - /obj/item/card/id/silver = 200, - /obj/item/card/id/gold = 5000, - /obj/item/card/id/captains_spare = 5000, - /obj/item/card/id/syndicate/command = 7000, - /obj/item/card/id/centcom = 7000, - /obj/item/card/id/all_access = 10000, - /obj/item/card/id = 30, + /obj/item/card/data = 30, + /obj/item/card/emag = 60, + /obj/item/card/id/silver = 20, + /obj/item/card/id/gold = 500, + /obj/item/card/id/captains_spare = 500, + /obj/item/card/id/syndicate/command = 700, + /obj/item/card/id/centcom = 700, + /obj/item/card/id/all_access = 1000, + /obj/item/card/id = 3, /obj/item/flame/match = 1, - /obj/item/flame/lighter/zippo = 10, - /obj/item/plastique = 200, - /obj/item/extinguisher/mini = 20, - /obj/item/extinguisher = 40, - /obj/item/flamethrower = 60, + /obj/item/flame/lighter/zippo = 1, + /obj/item/plastique = 20, + /obj/item/extinguisher/mini = 2, + /obj/item/extinguisher = 4, + /obj/item/flamethrower = 6, /obj/item/handcuffs/cable = 5, /obj/item/handcuffs = 35, - /obj/item/rfd/construction = 1000, - /obj/item/rfd_ammo = 50, - /obj/item/rfd/service = 300, - /obj/item/shield/riot/tact = 500, - /obj/item/shield/riot = 150, - /obj/item/shield/buckler = 200, - /obj/item/shield/energy = 1200, + /obj/item/rfd/construction = 100, + /obj/item/rfd_ammo = 5, + /obj/item/rfd/service = 30, + /obj/item/shield/riot/tact = 50, + /obj/item/shield/riot = 15, + /obj/item/shield/buckler = 20, + /obj/item/shield/energy = 120, //SURGERY, - /obj/item/surgery/retractor = 80, - /obj/item/surgery/hemostat = 90, - /obj/item/surgery/cautery = 110, - /obj/item/surgery/surgicaldrill = 130, - /obj/item/surgery/scalpel/laser = 300, - /obj/item/surgery/scalpel/manager = 1200, - /obj/item/surgery/scalpel = 60, - /obj/item/surgery/circular_saw = 140, - /obj/item/surgery/bone_gel = 300, - /obj/item/surgery/fix_o_vein = 500, - /obj/item/surgery/bonesetter = 150, - /obj/item/locator = 100, - /obj/item/wrench = 30, + /obj/item/surgery/retractor = 8, + /obj/item/surgery/hemostat = 9, + /obj/item/surgery/cautery = 11, + /obj/item/surgery/surgicaldrill = 13, + /obj/item/surgery/scalpel/laser = 30, + /obj/item/surgery/scalpel/manager = 120, + /obj/item/surgery/scalpel = 6, + /obj/item/surgery/circular_saw = 14, + /obj/item/surgery/bone_gel = 30, + /obj/item/surgery/fix_o_vein = 50, + /obj/item/surgery/bonesetter = 15, + /obj/item/locator = 10, + /obj/item/wrench = 3, /obj/item/screwdriver = 15, /obj/item/wirecutters = 25, //WELDINGTOOLS, - /obj/item/weldingtool/largetank = 150, - /obj/item/weldingtool/hugetank = 300, - /obj/item/weldingtool/experimental = 600, - /obj/item/weldingtool = 100, - /obj/item/crowbar = 10, + /obj/item/weldingtool/largetank = 15, + /obj/item/weldingtool/hugetank = 30, + /obj/item/weldingtool/experimental = 60, + /obj/item/weldingtool = 10, + /obj/item/crowbar = 1, /obj/item/trap = 35, - /obj/item/nullrod = 60, - /obj/item/reagent_containers/weldpack = 300, - /obj/item/circuitboard/aicore = 6000, - /obj/item/circuitboard = 1000, + /obj/item/nullrod = 6, + /obj/item/reagent_containers/weldpack = 30, + /obj/item/circuitboard/aicore = 600, + /obj/item/circuitboard = 100, //GRENADES, - /obj/item/grenade/anti_photon = 200, - /obj/item/grenade/empgrenade = 180, - /obj/item/grenade/frag = 300, - /obj/item/grenade/napalm = 800, - /obj/item/grenade/spawnergrenade/vaurca = 700, - /obj/item/grenade/spawnergrenade/manhacks = 600, - /obj/item/grenade/spawnergrenade/spesscarp = 350, - /obj/item/grenade/spawnergrenade = 300, - /obj/item/grenade = 150, - /obj/item/implant = 100, - /obj/item/implanter = 80, + /obj/item/grenade/anti_photon = 20, + /obj/item/grenade/empgrenade = 18, + /obj/item/grenade/frag = 30, + /obj/item/grenade/napalm = 80, + /obj/item/grenade/spawnergrenade/vaurca = 70, + /obj/item/grenade/spawnergrenade/manhacks = 60, + /obj/item/grenade/spawnergrenade/spesscarp = 35, + /obj/item/grenade/spawnergrenade = 30, + /obj/item/grenade = 15, + /obj/item/implant = 10, + /obj/item/implanter = 8, //MELEE, - /obj/item/melee/cultblade = 1500, - /obj/item/melee/energy/glaive = 5400, - /obj/item/melee/energy/sword/powersword = 8000, - /obj/item/melee/energy/sword = 5000, - /obj/item/melee/energy/axe = 9000, - /obj/item/melee/energy = 4200, - /obj/item/melee/chainofcommand = 200, - /obj/item/melee/baton/stunrod = 350, - /obj/item/melee/baton/cattleprod = 30, - /obj/item/melee/baton = 80, - /obj/item/melee/classic_baton = 30, - /obj/item/melee/telebaton = 450, - /obj/item/melee/chainsword = 3000, - /obj/item/melee/ceremonial_sword = 2500, - /obj/item/melee/hammer = 1200, - /obj/item/melee/whip = 400, - /obj/item/melee/vaurca/navcomp = 1500, - /obj/item/melee/vaurca/rock = 700, - /obj/item/tank/jetpack = 390, - /obj/item/tank = 40, - /obj/item/ladder_mobile = 250, + /obj/item/melee/cultblade = 150, + /obj/item/melee/energy/glaive = 540, + /obj/item/melee/energy/sword/powersword = 800, + /obj/item/melee/energy/sword = 500, + /obj/item/melee/energy/axe = 900, + /obj/item/melee/energy = 420, + /obj/item/melee/chainofcommand = 20, + /obj/item/melee/baton/stunrod = 35, + /obj/item/melee/baton/cattleprod = 3, + /obj/item/melee/baton = 8, + /obj/item/melee/classic_baton = 3, + /obj/item/melee/telebaton = 45, + /obj/item/melee/chainsword = 300, + /obj/item/melee/ceremonial_sword = 250, + /obj/item/melee/hammer = 120, + /obj/item/melee/whip = 40, + /obj/item/melee/vaurca/navcomp = 150, + /obj/item/melee/vaurca/rock = 70, + /obj/item/tank/jetpack = 39, + /obj/item/tank = 4, + /obj/item/ladder_mobile = 25, /obj/item/contraband/poster = 25, //MATERIAL, - /obj/item/material/twohanded/pike/halberd = -120, - /obj/item/material/twohanded/pike = -100, - /obj/item/material/twohanded/zweihander = -350, - /obj/item/material/twohanded/fireaxe = -150, - /obj/item/material/knife/bayonet = -100, - /obj/item/material/sword = -120, - /obj/item/material/scythe = -100, - /obj/item/material/harpoon = -70, + /obj/item/material/twohanded/pike/halberd = -12, + /obj/item/material/twohanded/pike = -10, + /obj/item/material/twohanded/zweihander = -35, + /obj/item/material/twohanded/fireaxe = -15, + /obj/item/material/knife/bayonet = -10, + /obj/item/material/sword = -12, + /obj/item/material/scythe = -10, + /obj/item/material/harpoon = -7, /obj/item/material = -5, //RIGS, - /obj/item/rig/unathi/fancy = 30000, - /obj/item/rig/unathi = 17000, - /obj/item/rig/combat = 25000, - /obj/item/rig/ert = 20000, - /obj/item/rig/light/hacker = 13000, - /obj/item/rig/light/ninja = 16000, - /obj/item/rig/light/stealth = 11000, - /obj/item/rig/light = 14000, - /obj/item/rig/internalaffairs = 9000, - /obj/item/rig/merc = 25000, - /obj/item/rig/military = 30000, - /obj/item/rig/hunter_killer = 30000, - /obj/item/rig = 15000, + /obj/item/rig/unathi/fancy = 3000, + /obj/item/rig/unathi = 1700, + /obj/item/rig/combat = 2500, + /obj/item/rig/ert = 2000, + /obj/item/rig/light/hacker = 1300, + /obj/item/rig/light/ninja = 1600, + /obj/item/rig/light/stealth = 1100, + /obj/item/rig/light = 1400, + /obj/item/rig/internalaffairs = 900, + /obj/item/rig/merc = 2500, + /obj/item/rig/military = 3000, + /obj/item/rig/hunter_killer = 3000, + /obj/item/rig = 1500, /obj/item/forensics = 65, /obj/item/evidencebag = 5, /obj/item/sample = 15, - /obj/item/storage/card = 10, + /obj/item/storage/card = 1, /obj/item/pack = 6, - /obj/item/holo = 0, - /obj/item/beach_ball/holoball = 0, - /obj/item/book/tome = 350, + /obj/item/holo = 5, + /obj/item/beach_ball/holoball = 10, + /obj/item/book/tome = 35, /obj/item/book = 15, - /obj/item/barcodescanner = 130, + /obj/item/barcodescanner = 13, //CLOTHING, //EARS, - /obj/item/clothing/ears/skrell = 100, - /obj/item/clothing/accessory/bandanna = 20, + /obj/item/clothing/ears/skrell = 10, + /obj/item/clothing/accessory/bandanna = 2, //GLASSES, - /obj/item/clothing/glasses/meson/prescription = 880, - /obj/item/clothing/glasses/meson = 800, - /obj/item/clothing/glasses/safety/goggles/science = 400, - /obj/item/clothing/glasses/night = 1000, - /obj/item/clothing/glasses/regular/hipster = 400, //Hipstering is an expensive lifestyle yo, - /obj/item/clothing/glasses/regular = 300, - /obj/item/clothing/glasses/welding/superior = 450, - /obj/item/clothing/glasses/welding = 250, - /obj/item/clothing/glasses/sunglasses/prescription = 230, - /obj/item/clothing/glasses/sunglasses/sechud/tactical = 550, - /obj/item/clothing/glasses/sunglasses/sechud = 530, - /obj/item/clothing/glasses/thermal = 1990, - /obj/item/clothing/glasses/night = 1200, - /obj/item/clothing/glasses = 150, + /obj/item/clothing/glasses/meson/prescription = 88, + /obj/item/clothing/glasses/meson = 80, + /obj/item/clothing/glasses/safety/goggles/science = 40, + /obj/item/clothing/glasses/night = 100, + /obj/item/clothing/glasses/regular/hipster = 40, //Hipstering is an expensive lifestyle yo, + /obj/item/clothing/glasses/regular = 30, + /obj/item/clothing/glasses/welding/superior = 45, + /obj/item/clothing/glasses/welding = 25, + /obj/item/clothing/glasses/sunglasses/prescription = 23, + /obj/item/clothing/glasses/sunglasses/sechud/tactical = 55, + /obj/item/clothing/glasses/sunglasses/sechud = 53, + /obj/item/clothing/glasses/thermal = 199, + /obj/item/clothing/glasses/night = 120, + /obj/item/clothing/glasses = 15, //GLOVES, - /obj/item/clothing/gloves/boxing = 60, - /obj/item/clothing/gloves/yellow = 300, + /obj/item/clothing/gloves/boxing = 6, + /obj/item/clothing/gloves/yellow = 30, /obj/item/clothing/gloves/yellow/budget = 25, //cheap cheap cheap, - /obj/item/clothing/gloves/captain = 100, + /obj/item/clothing/gloves/captain = 10, /obj/item/clothing/gloves/swat = 125, - /obj/item/clothing/gloves/combat = 400, + /obj/item/clothing/gloves/combat = 40, /obj/item/clothing/gloves/botanic_leather = 6, - /obj/item/clothing/gloves/force/syndicate = 1500, - /obj/item/clothing/gloves/force = 1000, + /obj/item/clothing/gloves/force/syndicate = 150, + /obj/item/clothing/gloves/force = 100, /obj/item/clothing/gloves = 5, //MASKS, - /obj/item/clothing/mask/luchador = 60, - /obj/item/clothing/mask/breath/medical = 180, - /obj/item/clothing/mask/breath = 80, - /obj/item/clothing/mask/gas/swat = 200, - /obj/item/clothing/mask/gas/voice = 600, - /obj/item/clothing/mask/gas/tactical = 500, - /obj/item/clothing/mask/gas = 50, + /obj/item/clothing/mask/luchador = 6, + /obj/item/clothing/mask/breath/medical = 18, + /obj/item/clothing/mask/breath = 8, + /obj/item/clothing/mask/gas/swat = 20, + /obj/item/clothing/mask/gas/voice = 60, + /obj/item/clothing/mask/gas/tactical = 50, + /obj/item/clothing/mask/gas = 5, /obj/item/clothing/mask/muzzle/tape = 2, - /obj/item/clothing/mask/muzzle = 100, - /obj/item/clothing/mask/surgical = 20, + /obj/item/clothing/mask/muzzle = 10, + /obj/item/clothing/mask/surgical = 2, /obj/item/clothing/mask/fakemoustache = 5, /obj/item/clothing/mask/snorkel = 5, - /obj/item/clothing/mask/ai = 3000, + /obj/item/clothing/mask/ai = 300, //SHOES, - /obj/item/clothing/shoes/galoshes = 50, - /obj/item/clothing/shoes/galoshes/syndie = 250, - /obj/item/clothing/shoes/cult = 350, - /obj/item/clothing/shoes/magboots = 350, - /obj/item/clothing/shoes/combat = 200, - /obj/item/clothing/shoes/combat = 450, + /obj/item/clothing/shoes/galoshes = 5, + /obj/item/clothing/shoes/galoshes/syndie = 25, + /obj/item/clothing/shoes/cult = 35, + /obj/item/clothing/shoes/magboots = 35, + /obj/item/clothing/shoes/combat = 20, + /obj/item/clothing/shoes/combat = 45, /obj/item/clothing/shoes = 25, //SUITS, - /obj/item/clothing/suit/space/void/captain = 4000, - /obj/item/clothing/suit/space/void/merc = 3000, - /obj/item/clothing/suit/space/void/security = 3000, - /obj/item/clothing/suit/space/void = 2800, - /obj/item/clothing/suit/space/syndicate = 2200, - /obj/item/clothing/suit/space/void/skrell = 3000, - /obj/item/clothing/suit/space/cult = 1050, - /obj/item/clothing/suit/space/emergency = 150, - /obj/item/clothing/suit/space = 730, - /obj/item/clothing/accessory/poncho/unathimantle = 80, - /obj/item/clothing/suit/cultrobes = 200, - /obj/item/clothing/suit/storage/vest/heavy/ert = 2500, - /obj/item/clothing/suit/armor/carrier/heavy = 3000, - /obj/item/clothing/suit/armor/vest/ert = 2500, - /obj/item/clothing/suit/armor/vest = 550, - /obj/item/clothing/suit/armor/carrier/riot = 700, - /obj/item/clothing/suit/armor/carrier/ballistic = 700, - /obj/item/clothing/suit/armor/carrier/ablative = 700, - /obj/item/clothing/suit/armor/reactive = 5000, - /obj/item/clothing/suit/armor/centcomm = 2000, - /obj/item/clothing/suit/armor/heavy = 1000, - /obj/item/clothing/suit/armor/tactical = 1500, - /obj/item/clothing/suit/armor = 500, - /obj/item/clothing/suit/hazmat = 150, - /obj/item/clothing/suit/captunic/capjacket = 100, - /obj/item/clothing/suit/storage/hazardvest = 60, + /obj/item/clothing/suit/space/void/captain = 400, + /obj/item/clothing/suit/space/void/merc = 300, + /obj/item/clothing/suit/space/void/security = 300, + /obj/item/clothing/suit/space/void = 280, + /obj/item/clothing/suit/space/syndicate = 220, + /obj/item/clothing/suit/space/void/skrell = 300, + /obj/item/clothing/suit/space/cult = 105, + /obj/item/clothing/suit/space/emergency = 15, + /obj/item/clothing/suit/space = 73, + /obj/item/clothing/accessory/poncho/unathimantle = 8, + /obj/item/clothing/suit/cultrobes = 20, + /obj/item/clothing/suit/storage/vest/heavy/ert = 250, + /obj/item/clothing/suit/armor/carrier/heavy = 300, + /obj/item/clothing/suit/armor/vest/ert = 250, + /obj/item/clothing/suit/armor/vest = 55, + /obj/item/clothing/suit/armor/carrier/riot = 70, + /obj/item/clothing/suit/armor/carrier/ballistic = 70, + /obj/item/clothing/suit/armor/carrier/ablative = 70, + /obj/item/clothing/suit/armor/reactive = 500, + /obj/item/clothing/suit/armor/centcomm = 200, + /obj/item/clothing/suit/armor/heavy = 100, + /obj/item/clothing/suit/armor/tactical = 150, + /obj/item/clothing/suit/armor = 50, + /obj/item/clothing/suit/hazmat = 15, + /obj/item/clothing/suit/captunic/capjacket = 10, + /obj/item/clothing/suit/storage/hazardvest = 6, /obj/item/clothing/suit/storage/toggle/labcoat = 55, /obj/item/clothing/suit/armor/riot/laser_tag = 125, - /obj/item/clothing/suit/fire = 500, - /obj/item/clothing/suit/radiation = 450, - /obj/item/clothing/suit/bomb_suit = 300, + /obj/item/clothing/suit/fire = 50, + /obj/item/clothing/suit/radiation = 45, + /obj/item/clothing/suit/bomb_suit = 30, //HEADS, - /obj/item/clothing/head/collectable/petehat = 350, - /obj/item/clothing/head/collectable = 80, - /obj/item/clothing/head/hardhat = 180, - /obj/item/clothing/head/helmet/swat = 400, - /obj/item/clothing/head/helmet/gladiator = 280, - /obj/item/clothing/head/helmet/augment = 600, - /obj/item/clothing/head/helmet/riot = 500, - /obj/item/clothing/head/helmet/ablative = 500, - /obj/item/clothing/head/helmet/ballistic = 500, - /obj/item/clothing/head/helmet/merc = 1000, - /obj/item/clothing/head/helmet/tactical = 800, - /obj/item/clothing/head/helmet/gladiator = 300, - /obj/item/clothing/head/helmet/ert = 1000, - /obj/item/clothing/head/helmet/hos = 800, - /obj/item/clothing/head/hos = 100, - /obj/item/clothing/head/helmet = 250, - /obj/item/clothing/head/culthood = 150, - /obj/item/clothing/head/caphat/hop = 100, - /obj/item/clothing/head/caphat = 200, - /obj/item/clothing/head/centhat = 600, + /obj/item/clothing/head/collectable/petehat = 35, + /obj/item/clothing/head/collectable = 8, + /obj/item/clothing/head/hardhat = 18, + /obj/item/clothing/head/helmet/swat = 40, + /obj/item/clothing/head/helmet/gladiator = 28, + /obj/item/clothing/head/helmet/augment = 60, + /obj/item/clothing/head/helmet/riot = 50, + /obj/item/clothing/head/helmet/ablative = 50, + /obj/item/clothing/head/helmet/ballistic = 50, + /obj/item/clothing/head/helmet/merc = 100, + /obj/item/clothing/head/helmet/tactical = 80, + /obj/item/clothing/head/helmet/gladiator = 30, + /obj/item/clothing/head/helmet/ert = 100, + /obj/item/clothing/head/helmet/hos = 80, + /obj/item/clothing/head/hos = 10, + /obj/item/clothing/head/helmet = 25, + /obj/item/clothing/head/culthood = 15, + /obj/item/clothing/head/caphat/hop = 10, + /obj/item/clothing/head/caphat = 20, + /obj/item/clothing/head/centhat = 60, /obj/item/clothing/head/pin/flower = 5, - /obj/item/clothing/head/powdered_wig = 80, - /obj/item/clothing/head/justice = 30, - /obj/item/clothing/head/philosopher_wig = 70, - /obj/item/clothing/head/welding = 150, - /obj/item/clothing/head/bomb_hood = 200, - /obj/item/clothing/head/radiation = 250, - /obj/item/clothing/head/hazmat = 100, - /obj/item/clothing/head/sol = 250, - /obj/item/clothing/head/sol/dress/admiral = 1000, - /obj/item/clothing/head/sol/dress = 350, - /obj/item/clothing/head/helmet/space/void/merc = 2000, - /obj/item/clothing/head/helmet/space/void/security = 2000, - /obj/item/clothing/head/helmet/space/void/captain = 3000, - /obj/item/clothing/head/helmet/space/void = 1900, - /obj/item/clothing/head/helmet/space/syndicate = 1200, - /obj/item/clothing/head/helmet/space/deathsquad = 2400, - /obj/item/clothing/head/helmet/space/void/skrell = 1200, - /obj/item/clothing/head/helmet/space/cult = 1300, - /obj/item/clothing/head/helmet/space/emergency = 250, - /obj/item/clothing/head/helmet/space = 450, + /obj/item/clothing/head/powdered_wig = 8, + /obj/item/clothing/head/justice = 3, + /obj/item/clothing/head/philosopher_wig = 7, + /obj/item/clothing/head/welding = 15, + /obj/item/clothing/head/bomb_hood = 20, + /obj/item/clothing/head/radiation = 25, + /obj/item/clothing/head/hazmat = 10, + /obj/item/clothing/head/sol = 25, + /obj/item/clothing/head/sol/dress/admiral = 100, + /obj/item/clothing/head/sol/dress = 35, + /obj/item/clothing/head/helmet/space/void/merc = 200, + /obj/item/clothing/head/helmet/space/void/security = 200, + /obj/item/clothing/head/helmet/space/void/captain = 300, + /obj/item/clothing/head/helmet/space/void = 190, + /obj/item/clothing/head/helmet/space/syndicate = 120, + /obj/item/clothing/head/helmet/space/deathsquad = 240, + /obj/item/clothing/head/helmet/space/void/skrell = 120, + /obj/item/clothing/head/helmet/space/cult = 130, + /obj/item/clothing/head/helmet/space/emergency = 25, + /obj/item/clothing/head/helmet/space = 45, //ACCESSORIES, - /obj/item/clothing/accessory/storage/bayonet = 250, + /obj/item/clothing/accessory/storage/bayonet = 25, /obj/item/clothing/accessory/storage = 55, - /obj/item/clothing/accessory/stethoscope = 70, - /obj/item/clothing/accessory/medal/gold/captain = 800, - /obj/item/clothing/accessory/medal/gold = 600, - /obj/item/clothing/accessory/medal/silver = 300, - /obj/item/clothing/accessory/medal/iron = 150, - /obj/item/clothing/accessory/medal = 100, - /obj/item/clothing/accessory/armband = 30, - /obj/item/clothing/accessory/badge = 60, + /obj/item/clothing/accessory/stethoscope = 7, + /obj/item/clothing/accessory/medal/gold/captain = 80, + /obj/item/clothing/accessory/medal/gold = 60, + /obj/item/clothing/accessory/medal/silver = 30, + /obj/item/clothing/accessory/medal/iron = 15, + /obj/item/clothing/accessory/medal = 10, + /obj/item/clothing/accessory/armband = 3, + /obj/item/clothing/accessory/badge = 6, /obj/item/clothing/accessory = 15, //UNDERS, - /obj/item/clothing/under/rank/captain = 100, - /obj/item/clothing/under/rank/xo = 60, + /obj/item/clothing/under/rank/captain = 10, + /obj/item/clothing/under/rank/xo = 6, /obj/item/clothing/under/rank/chief_engineer = 95, - /obj/item/clothing/under/rank/research_director = 60, + /obj/item/clothing/under/rank/research_director = 6, /obj/item/clothing/under/rank/chief_medical_officer = 65, /obj/item/clothing/under/rank/warden = 5, - /obj/item/clothing/under/rank/centcom = 200, - /obj/item/clothing/under/rank/sol = 250, - /obj/item/clothing/under/rank/sol/service = 350, - /obj/item/clothing/under/rank/sol/dress/admiral = 1000, - /obj/item/clothing/under/rank/sol/dress = 450, - /obj/item/clothing/under/rank/centcom_commander = 300, - /obj/item/clothing/under/syndicate/tacticool = 60, - /obj/item/clothing/under/syndicate = 150, - /obj/item/clothing/under/tactical = 150, - /obj/item/clothing/under/ert = 200, - /obj/item/clothing/under/ccpolice = 250, - /obj/item/clothing/under/space = 400, - /obj/item/clothing = 50, + /obj/item/clothing/under/rank/centcom = 20, + /obj/item/clothing/under/rank/sol = 25, + /obj/item/clothing/under/rank/sol/service = 35, + /obj/item/clothing/under/rank/sol/dress/admiral = 100, + /obj/item/clothing/under/rank/sol/dress = 45, + /obj/item/clothing/under/rank/centcom_commander = 30, + /obj/item/clothing/under/syndicate/tacticool = 6, + /obj/item/clothing/under/syndicate = 15, + /obj/item/clothing/under/tactical = 15, + /obj/item/clothing/under/ert = 20, + /obj/item/clothing/under/ccpolice = 25, + /obj/item/clothing/under/space = 40, + /obj/item/clothing = 5, //DEVICES, - /obj/item/device/magnetic_lock = 700, - /obj/item/device/wormhole_jaunter = 500, - /obj/item/device/soulstone = 10000, - /obj/item/device/dociler = 450, - /obj/item/device/mmi = 1200, - /obj/item/device/kit = 100, - /obj/item/aicard = 6000, - /obj/item/device/chameleon = 4000, - /obj/item/device/paicard = 120, - /obj/item/device/powersink = 1800, - /obj/item/hand_tele = 1800, - /obj/item/device/mass_spectrometer/adv = 400, - /obj/item/device/mass_spectrometer = 300, - /obj/item/device/reagent_scanner/adv = 600, - /obj/item/device/reagent_scanner = 500, - /obj/item/device/slime_scanner = 300, - /obj/item/device/transfer_valve = 50, - /obj/item/device/synthesized_instrument/violin = 250, - /obj/item/device/radio = 150, + /obj/item/device/magnetic_lock = 70, + /obj/item/device/wormhole_jaunter = 50, + /obj/item/device/soulstone = 1000, + /obj/item/device/dociler = 45, + /obj/item/device/mmi = 120, + /obj/item/device/kit = 10, + /obj/item/aicard = 600, + /obj/item/device/chameleon = 400, + /obj/item/device/paicard = 12, + /obj/item/device/powersink = 180, + /obj/item/hand_tele = 180, + /obj/item/device/mass_spectrometer/adv = 40, + /obj/item/device/mass_spectrometer = 30, + /obj/item/device/reagent_scanner/adv = 60, + /obj/item/device/reagent_scanner = 50, + /obj/item/device/slime_scanner = 30, + /obj/item/device/transfer_valve = 5, + /obj/item/device/synthesized_instrument/violin = 25, + /obj/item/device/radio = 15, /obj/item/device/assembly/igniter = 15, - /obj/item/device/assembly/infra = 10, + /obj/item/device/assembly/infra = 1, /obj/item/device/assembly/mousetrap = 5, - /obj/item/device/assembly/signaler = 30, - /obj/item/device/assembly = 50, - /obj/item/device/uv_light = 150, - /obj/item/device/eftpos = 30, - /obj/item/device = 90, - /obj/item/device/synthesized_instrument/guitar = 200, - /obj/item/device/synthesized_instrument/trumpet = 300, + /obj/item/device/assembly/signaler = 3, + /obj/item/device/assembly = 5, + /obj/item/device/uv_light = 15, + /obj/item/device/eftpos = 3, + /obj/item/device = 9, + /obj/item/device/synthesized_instrument/guitar = 20, + /obj/item/device/synthesized_instrument/trumpet = 30, //ORGANS, - /obj/item/organ/internal/heart = 1200, - /obj/item/organ/internal/brain/golem = 3000, - /obj/item/organ/internal/brain = 1200, - /obj/item/organ/internal/vaurca/neuralsocket = 1500, - /obj/item/organ = 400, + /obj/item/organ/internal/heart = 120, + /obj/item/organ/internal/brain/golem = 300, + /obj/item/organ/internal/brain = 120, + /obj/item/organ/internal/vaurca/neuralsocket = 150, + /obj/item/organ = 40, //ITEMS, - /obj/item/slime_extract = 200, - /obj/item/robot_parts/robot_component = 250, - /obj/item/robot_parts = 30, - /obj/item/modular_computer/handheld = 1300, - /obj/item/modular_computer = 4000, - /obj/item/solar_assembly = 680, - /obj/item/ammo_casing/cannon = 200, + /obj/item/slime_extract = 20, + /obj/item/robot_parts/robot_component = 25, + /obj/item/robot_parts = 3, + /obj/item/modular_computer/handheld = 130, + /obj/item/modular_computer = 400, + /obj/item/solar_assembly = 68, + /obj/item/ammo_casing/cannon = 20, /obj/item/ammo_casing = 5, - /obj/item/ammo_magazine/nuke = 1200, - /obj/item/ammo_magazine = 30, - /obj/item/conveyor_construct = 100, - /obj/item/conveyor_switch_construct = 30, - /obj/item/supply_beacon = 5000, - /obj/item/frame = 60, - /obj/item/pipe = 100, - /obj/item/pipe_meter = 300, - /obj/item/mecha_equipment/catapult = 3000, - /obj/item/mecha_equipment/mounted_system/combat/laser = 2000, - /obj/item/mecha_equipment/mounted_system/combat/ion = 1550, - /obj/item/mecha_equipment/mounted_system/combat/taser = 1000, - /obj/item/mecha_equipment/mounted_system/combat/smg = 5800, - /obj/item/mecha_equipment = 1000, - /obj/item/missile = 1200, - /obj/item/blueprints = 4000, //Information is valuable, - /obj/item/bodybag/cryobag = 600, - /obj/item/bodybag = 20, - /obj/item/glass_jar = 10, + /obj/item/ammo_magazine/nuke = 120, + /obj/item/ammo_magazine = 3, + /obj/item/conveyor_construct = 10, + /obj/item/conveyor_switch_construct = 3, + /obj/item/supply_beacon = 500, + /obj/item/frame = 6, + /obj/item/pipe = 10, + /obj/item/pipe_meter = 30, + /obj/item/mecha_equipment/catapult = 300, + /obj/item/mecha_equipment/mounted_system/combat/laser = 200, + /obj/item/mecha_equipment/mounted_system/combat/ion = 155, + /obj/item/mecha_equipment/mounted_system/combat/taser = 100, + /obj/item/mecha_equipment/mounted_system/combat/smg = 580, + /obj/item/mecha_equipment = 100, + /obj/item/missile = 120, + /obj/item/blueprints = 400, //Information is valuable, + /obj/item/bodybag/cryobag = 60, + /obj/item/bodybag = 2, + /obj/item/glass_jar = 1, /obj/item/target = 15, - /obj/item/inflatable = 30, - /obj/item/roller = 80, - /obj/item/light/tube/colored = 20, + /obj/item/inflatable = 3, + /obj/item/roller = 8, + /obj/item/light/tube/colored = 2, /obj/item/light/bulb/colored = 15, - /obj/item/rig_module/grenade_launcher = 1500, - /obj/item/rig_module/mounted/energy_blade = 5000, - /obj/item/rig_module/mounted/thermalldrill = 2500, - /obj/item/rig_module/mounted/plasmacutter = 2500, - /obj/item/rig_module/mounted/ion = 2000, - /obj/item/rig_module/mounted/xray = 3500, - /obj/item/rig_module/mounted/smg = 2500, - /obj/item/rig_module/mounted/pulse = 4500, - /obj/item/rig_module/mounted/taser = 1500, - /obj/item/rig_module/mounted/egun = 2100, - /obj/item/rig_module/mounted/energy_blade = 5500, - /obj/item/rig_module/mounted = 4100, - /obj/item/rig_module/stealth_field = 2500, - /obj/item/rig_module/teleporter = 3000, - /obj/item/rig_module/fabricator/energy_net = 1200, - /obj/item/rig_module/fabricator = 2800, - /obj/item/rig_module = 1000, - /obj/item/seeds = 10, + /obj/item/rig_module/grenade_launcher = 150, + /obj/item/rig_module/mounted/energy_blade = 500, + /obj/item/rig_module/mounted/thermalldrill = 250, + /obj/item/rig_module/mounted/plasmacutter = 250, + /obj/item/rig_module/mounted/ion = 200, + /obj/item/rig_module/mounted/xray = 350, + /obj/item/rig_module/mounted/smg = 250, + /obj/item/rig_module/mounted/pulse = 450, + /obj/item/rig_module/mounted/taser = 150, + /obj/item/rig_module/mounted/egun = 210, + /obj/item/rig_module/mounted/energy_blade = 550, + /obj/item/rig_module/mounted = 410, + /obj/item/rig_module/stealth_field = 250, + /obj/item/rig_module/teleporter = 300, + /obj/item/rig_module/fabricator/energy_net = 120, + /obj/item/rig_module/fabricator = 280, + /obj/item/rig_module = 100, + /obj/item/seeds = 1, /obj/item/honey_frame = 15, - /obj/item/beehive_assembly = 100, - /obj/item/bee_pack = 200, - /obj/item/phylactery = 40000, - /obj/item/bluespace_crystal/artificial = 5000, - /obj/item/bluespace_crystal = 10000, - /obj/item/vaurca/box = 250, - /obj/item/hoist_kit = 150, + /obj/item/beehive_assembly = 10, + /obj/item/bee_pack = 20, + /obj/item/phylactery = 4000, + /obj/item/bluespace_crystal/artificial = 500, + /obj/item/bluespace_crystal = 1000, + /obj/item/vaurca/box = 25, + /obj/item/hoist_kit = 15, /obj/item = 5, //STRUCTURES, /obj/structure/ore_box = 12, - /obj/structure/constructshell = 5000, + /obj/structure/constructshell = 500, /obj/structure/cable = 1, - /obj/structure/particle_accelerator = 2000, + /obj/structure/particle_accelerator = 200, /obj/structure/droppod_door = 65, - /obj/structure/disposalconstruct = 0, //Similar to cables, they are assembled into something else, - /obj/structure/disposalpipe/tagger = 70, + /obj/structure/disposalconstruct = 5, //Similar to cables, they are assembled into something else, + /obj/structure/disposalpipe/tagger = 7, /obj/structure/disposalpipe/sortjunction = 65, /obj/structure/disposalpipe = 35, /obj/structure/disposaloutlet = 65, - /obj/structure/boulder = 0, //just a dumb boulder, - /obj/structure/shuttle = 150, + /obj/structure/boulder = 5, //just a dumb boulder, + /obj/structure/shuttle = 15, /obj/structure/plasticflaps = 15, - /obj/structure/cult/pylon = 700, - /obj/structure/cult = 160, - /obj/structure/cryofeed = 450, - /obj/structure/AIcore = 6000, - /obj/structure/AIcore/deactivated = 7000, - /obj/structure/computerframe = 50, + /obj/structure/cult/pylon = 70, + /obj/structure/cult = 16, + /obj/structure/cryofeed = 45, + /obj/structure/AIcore = 600, + /obj/structure/AIcore/deactivated = 700, + /obj/structure/computerframe = 5, /obj/item/toy/plushie/ = 7, /obj/structure/bedsheetbin = 25, - /obj/structure/coatrack = 10, + /obj/structure/coatrack = 1, /obj/structure/displaycase = 86, /obj/structure/door_assembly = 35, /obj/structure/girder = 15, /obj/structure/grille = 5, /obj/structure/inflatable = 1, - /obj/structure/janitorialcart = 120, + /obj/structure/janitorialcart = 12, /obj/structure/kitchenspike = 35, /obj/structure/lattice = 1, - /obj/structure/morgue = 100, - /obj/structure/morgue/crematorium = 600, - /obj/structure/synthesized_instrument/synthesizer/piano = 1200, //pianos are expensive - /obj/structure/synthesized_instrument/synthesizer = 1900, //the synthesizer itself even more + /obj/structure/morgue = 10, + /obj/structure/morgue/crematorium = 60, + /obj/structure/synthesized_instrument/synthesizer/piano = 120, //pianos are expensive + /obj/structure/synthesized_instrument/synthesizer = 190, //the synthesizer itself even more /obj/structure/noticeboard = 15, - /obj/structure/safe/floor = 180, - /obj/structure/safe = 200, + /obj/structure/safe/floor = 18, + /obj/structure/safe = 20, /obj/structure/sign = 25, - /obj/structure/dispenser = 500, - /obj/structure/toilet = 50, - /obj/structure/gore = 300, + /obj/structure/dispenser = 50, + /obj/structure/toilet = 5, + /obj/structure/gore = 30, /obj/structure/closet = 15, /obj/structure/bed = 7, - /obj/structure/holostool = 0, - /obj/structure/holohoop = 0, - /obj/structure/bookcase = 50, + /obj/structure/holostool = 1, + /obj/structure/holohoop = 1, + /obj/structure/bookcase = 5, /obj/structure/blocker = -1, - /obj/structure = 30, + /obj/structure = 3, //BOTS, - /mob/living/bot/cleanbot = 260, - /mob/living/bot/farmbot = 500, - /mob/living/bot/medbot = 600, - /mob/living/bot = 300, + /mob/living/bot/cleanbot = 26, + /mob/living/bot/farmbot = 50, + /mob/living/bot/medbot = 60, + /mob/living/bot = 30, //MOBS, - /mob/living/carbon/human = -10000, - /mob/living/carbon/slime = 5000, - /mob/living/silicon/robot = 10000, - /mob/living/silicon/pai = 1000, - /mob/living/silicon/ai = 50000, - /mob/living/silicon = 5000, - /mob/living/simple_animal/hostile/commanded/dog = 1000, - /mob/living/simple_animal/hostile/true_changeling = 20000, - /mob/living/simple_animal/hostile/biglizard = 10000, - /mob/living/simple_animal/hostile/bear/spatial = 2000, - /mob/living/simple_animal/hostile = 700, - /mob/living/simple_animal/construct = 10000, - /mob/living/simple_animal/rat/king = 5000, - /mob/living/simple_animal/rat = 10, - /mob/living/simple_animal/borer = 10000, - /mob/living/simple_animal/corgi/Ian = 1000, //Ian is valuable, - /mob/living/simple_animal/spiderbot = 3000, - /mob/living/simple_animal/cow = 2000, //Cow expensive, - /mob/living/simple_animal = 500, - /mob/living = 100, + /mob/living/carbon/human = -1000, + /mob/living/carbon/slime = 500, + /mob/living/silicon/robot = 1000, + /mob/living/silicon/pai = 100, + /mob/living/silicon/ai = 5000, + /mob/living/silicon = 500, + /mob/living/simple_animal/hostile/commanded/dog = 100, + /mob/living/simple_animal/hostile/true_changeling = 2000, + /mob/living/simple_animal/hostile/biglizard = 1000, + /mob/living/simple_animal/hostile/bear/spatial = 200, + /mob/living/simple_animal/hostile = 70, + /mob/living/simple_animal/construct = 1000, + /mob/living/simple_animal/rat/king = 500, + /mob/living/simple_animal/rat = 1, + /mob/living/simple_animal/borer = 1000, + /mob/living/simple_animal/corgi/Ian = 100, //Ian is valuable, + /mob/living/simple_animal/spiderbot = 300, + /mob/living/simple_animal/cow = 200, //Cow expensive, + /mob/living/simple_animal = 50, + /mob/living = 10, //MECHAS, - /mob/living/heavy_vehicle/premade/combat = -50000, - /mob/living/heavy_vehicle/premade/heavy = -40000, - /mob/living/heavy_vehicle/premade/ripley = -20000, - /mob/living/heavy_vehicle/premade/light = -20000, + /mob/living/heavy_vehicle/premade/combat = -5000, + /mob/living/heavy_vehicle/premade/heavy = -4000, + /mob/living/heavy_vehicle/premade/ripley = -2000, + /mob/living/heavy_vehicle/premade/light = -2000, //MACHINERY, - /obj/machinery/from_beyond = -30000, - /obj/machinery/mineral/unloading_machine = -500, - /obj/machinery/mining/brace = -300, - /obj/machinery/drone_fabricator = -3000, - /obj/machinery/photocopier/faxmachine = -500, - /obj/machinery/papershredder = -80, - /obj/machinery/gravity_generator = -16000, + /obj/machinery/from_beyond = -3000, + /obj/machinery/mineral/unloading_machine = -50, + /obj/machinery/mining/brace = -30, + /obj/machinery/drone_fabricator = -300, + /obj/machinery/photocopier/faxmachine = -50, + /obj/machinery/papershredder = -8, + /obj/machinery/gravity_generator = -1600, /obj/machinery/light = 25, - /obj/machinery/power/smes/buildable = -15000, - /obj/machinery/chem_master = -6000, - /obj/machinery/chemical_dispenser = -5000, - /obj/machinery/conveyor = 200, - /obj/machinery/conveyor_switch = 100, - /obj/machinery/disposal = 500, - /obj/machinery/blackbox_recorder = -9500, - /obj/machinery/r_n_d/protolathe = -15000, - /obj/machinery/r_n_d/server = -20000, - /obj/machinery/r_n_d = -1000, - /obj/machinery/auto_cloner = -13000, - /obj/machinery/giga_drill = -1900, - /obj/machinery/artifact = -13500, - /obj/machinery/artifact_analyser = -11900, - /obj/machinery/artifact_harvester = -12300, - /obj/machinery/artifact_scanpad = -1800, - /obj/machinery/suspension_gen = -3000, - /obj/machinery/keycard_auth = -100, - /obj/machinery/power/supermatter/shard = 100000, - /obj/machinery/power/supermatter = 500000, - /obj/machinery/atmospherics/pipe/simple/heat_exchanging = -1000, - /obj/machinery/atmospherics/pipe = -100, - /obj/machinery/atmospherics/portables_connector = -500, - /obj/machinery/atmospherics/tvalve = -150, - /obj/machinery/atmospherics/valve = -120, - /obj/machinery/atmospherics/binary/circulator = -2500, - /obj/machinery/atmospherics/binary/passive_gate = -1600, - /obj/machinery/atmospherics/binary/pump = -1900, - /obj/machinery/atmospherics/binary/pump/high_power = -2500, - /obj/machinery/atmospherics/omni/filter = -4000, - /obj/machinery/atmospherics/omni/mixer = -3600, - /obj/machinery/atmospherics/unary/freezer = -6000, - /obj/machinery/atmospherics/unary/heater = -6000, - /obj/machinery/atmospherics/unary/outlet_injector = -2300, - /obj/machinery/atmospherics/unary/vent_pump = -2000, - /obj/machinery/atmospherics/unary/vent_scrubber = -2300, - /obj/machinery/bodyscanner = -6000, - /obj/machinery/body_scanconsole = -1500, - /obj/machinery/ai_slipper = -500, - /obj/machinery/alarm = -800, - /obj/machinery/air_sensor = -800, - /obj/machinery/autolathe = -3300, - /obj/machinery/bluespacerelay = -4000, - /obj/machinery/button = 100, - /obj/machinery/cablelayer = -1700, - /obj/machinery/cell_charger = -90, - /obj/machinery/constructable_frame = -500, - /obj/machinery/cryopod = -3000, - /obj/machinery/deployable/barrier = -500, - /obj/machinery/floodlight = -200, - /obj/machinery/floor_light = -100, - /obj/machinery/floorlayer = -1500, - /obj/machinery/igniter = -300, - /obj/machinery/sparker = -500, - /obj/machinery/iv_drip = -100, - /obj/machinery/media/jukebox = -700, - /obj/machinery/mass_driver = -500, - /obj/machinery/navbeacon = -90, - /obj/machinery/newscaster = -100, - /obj/machinery/nuclearbomb = -10000, - /obj/machinery/recharger = -200, - /obj/machinery/sleeper = -4000, - /obj/machinery/space_heater = -500, - /obj/machinery/ai_status_display = -600, - /obj/machinery/teleport = -15000, - /obj/machinery/camera = -700, - /obj/machinery/airlock_sensor = -800, - /obj/machinery/door/airlock = -800, - /obj/machinery/door/blast/shutters = -300, - /obj/machinery/door/blast = -1000, - /obj/machinery/door/firedoor = -600, - /obj/machinery/door = -100, - /obj/machinery/door_timer = -300, - /obj/machinery/embedded_controller/radio/airlock = -600, - /obj/machinery/gibber = -600, - /obj/machinery/pipedispenser = -100, - /obj/machinery/telecomms/broadcaster = -10000, - /obj/machinery/telecomms = -7000, - /obj/machinery/shower = -300, - /obj/machinery/acting/changer = -3000, - /obj/machinery/computer/artillerycontrol = -1400, - /obj/machinery/dnaforensics = -1200, - /obj/machinery/microscope = -550, - /obj/machinery/atm = -4500, - /obj/machinery/readybutton = -0, - /obj/machinery/botany/editor = -16000, - /obj/machinery/botany = -9050, - /obj/machinery/seed_storage = -500, - /obj/machinery/beehive = -500, + /obj/machinery/power/smes/buildable = -1500, + /obj/machinery/chem_master = -600, + /obj/machinery/chemical_dispenser = -500, + /obj/machinery/conveyor = 20, + /obj/machinery/conveyor_switch = 10, + /obj/machinery/disposal = 50, + /obj/machinery/blackbox_recorder = -950, + /obj/machinery/r_n_d/protolathe = -1500, + /obj/machinery/r_n_d/server = -2000, + /obj/machinery/r_n_d = -100, + /obj/machinery/auto_cloner = -1300, + /obj/machinery/giga_drill = -190, + /obj/machinery/artifact = -1350, + /obj/machinery/artifact_analyser = -1190, + /obj/machinery/artifact_harvester = -1230, + /obj/machinery/artifact_scanpad = -180, + /obj/machinery/suspension_gen = -300, + /obj/machinery/keycard_auth = -10, + /obj/machinery/power/supermatter/shard = 10000, + /obj/machinery/power/supermatter = 50000, + /obj/machinery/atmospherics/pipe/simple/heat_exchanging = -100, + /obj/machinery/atmospherics/pipe = -10, + /obj/machinery/atmospherics/portables_connector = -50, + /obj/machinery/atmospherics/tvalve = -15, + /obj/machinery/atmospherics/valve = -12, + /obj/machinery/atmospherics/binary/circulator = -250, + /obj/machinery/atmospherics/binary/passive_gate = -160, + /obj/machinery/atmospherics/binary/pump = -190, + /obj/machinery/atmospherics/binary/pump/high_power = -250, + /obj/machinery/atmospherics/omni/filter = -400, + /obj/machinery/atmospherics/omni/mixer = -360, + /obj/machinery/atmospherics/unary/freezer = -600, + /obj/machinery/atmospherics/unary/heater = -600, + /obj/machinery/atmospherics/unary/outlet_injector = -230, + /obj/machinery/atmospherics/unary/vent_pump = -200, + /obj/machinery/atmospherics/unary/vent_scrubber = -230, + /obj/machinery/bodyscanner = -600, + /obj/machinery/body_scanconsole = -150, + /obj/machinery/ai_slipper = -50, + /obj/machinery/alarm = -80, + /obj/machinery/air_sensor = -80, + /obj/machinery/autolathe = -330, + /obj/machinery/bluespacerelay = -400, + /obj/machinery/button = 10, + /obj/machinery/cablelayer = -170, + /obj/machinery/cell_charger = -9, + /obj/machinery/constructable_frame = -50, + /obj/machinery/cryopod = -300, + /obj/machinery/deployable/barrier = -50, + /obj/machinery/floodlight = -20, + /obj/machinery/floor_light = -10, + /obj/machinery/floorlayer = -150, + /obj/machinery/igniter = -30, + /obj/machinery/sparker = -50, + /obj/machinery/iv_drip = -10, + /obj/machinery/media/jukebox = -70, + /obj/machinery/mass_driver = -50, + /obj/machinery/navbeacon = -9, + /obj/machinery/newscaster = -10, + /obj/machinery/nuclearbomb = -1000, + /obj/machinery/recharger = -20, + /obj/machinery/sleeper = -400, + /obj/machinery/space_heater = -50, + /obj/machinery/ai_status_display = -60, + /obj/machinery/teleport = -1500, + /obj/machinery/camera = -70, + /obj/machinery/airlock_sensor = -80, + /obj/machinery/door/airlock = -80, + /obj/machinery/door/blast/shutters = -30, + /obj/machinery/door/blast = -100, + /obj/machinery/door/firedoor = -60, + /obj/machinery/door = -10, + /obj/machinery/door_timer = -30, + /obj/machinery/embedded_controller/radio/airlock = -60, + /obj/machinery/gibber = -60, + /obj/machinery/pipedispenser = -10, + /obj/machinery/telecomms/broadcaster = -1000, + /obj/machinery/telecomms = -700, + /obj/machinery/shower = -30, + /obj/machinery/acting/changer = -300, + /obj/machinery/computer/artillerycontrol = -140, + /obj/machinery/dnaforensics = -120, + /obj/machinery/microscope = -55, + /obj/machinery/atm = -450, + /obj/machinery/readybutton = -5, + /obj/machinery/botany/editor = -1600, + /obj/machinery/botany = -905, + /obj/machinery/seed_storage = -50, + /obj/machinery/beehive = -50, /obj/machinery/portable_atmospherics/hydroponics/soil = 1, //its dirt, - /obj/machinery/portable_atmospherics/hydroponics = -2300, - /obj/machinery/librarypubliccomp = -600, - /obj/machinery/librarycomp = -1000, - /obj/machinery/libraryscanner = -1000, - /obj/machinery/bookbinder = -1200, - /obj/machinery = -1000, - /obj/vehicle/bike = 1500, - /obj/vehicle = 1000, + /obj/machinery/portable_atmospherics/hydroponics = -230, + /obj/machinery/librarypubliccomp = -60, + /obj/machinery/librarycomp = -100, + /obj/machinery/libraryscanner = -100, + /obj/machinery/bookbinder = -120, + /obj/machinery = -100, + /obj/vehicle/bike = 150, + /obj/vehicle = 100, //Ammunition - /obj/item/warhead/longbow/ap = 15000, - /obj/item/warhead/longbow/bunker = 25000, - /obj/item/warhead/longbow = 10000, - /obj/item/ship_ammunition/longbow = 2500, - /obj/item/primer/low = 2000, - /obj/item/primer/high = 9500, - /obj/item/primer = 5500, - /obj/item/ship_ammunition/grauwolf_bundle/ap = 12000, + /obj/item/warhead/longbow/ap = 1500, + /obj/item/warhead/longbow/bunker = 2500, + /obj/item/warhead/longbow = 1000, + /obj/item/ship_ammunition/longbow = 250, + /obj/item/primer/low = 200, + /obj/item/primer/high = 950, + /obj/item/primer = 550, + /obj/item/ship_ammunition/grauwolf_bundle/ap = 1200, /obj/item/ship_ammunition/grauwolf_bundle = 10000 ) //Must be in descending order. Child before parents, otherwise it doesn't work., diff --git a/code/modules/law/laws/low_severity.dm b/code/modules/law/laws/low_severity.dm index a7bb5442333..db9be9e10db 100644 --- a/code/modules/law/laws/low_severity.dm +++ b/code/modules/law/laws/low_severity.dm @@ -9,8 +9,8 @@ min_brig_time = 3 max_brig_time = 10 - min_fine = 200 - max_fine = 300 + min_fine = 50 + max_fine = 100 /datum/law/low_severity/petty_theft name = "i102 - Petty Theft" @@ -20,8 +20,8 @@ min_brig_time = 3 max_brig_time = 10 - min_fine = 150 - max_fine = 225 + min_fine = 75 + max_fine = 150 /datum/law/low_severity/minor_assault name = "i103 - Minor Assault" @@ -31,8 +31,8 @@ min_brig_time = 4 max_brig_time = 10 - min_fine = 400 - max_fine = 800 + min_fine = 100 + max_fine = 300 /datum/law/low_severity/battery name = "i104 - Battery" @@ -42,8 +42,8 @@ min_brig_time = 2 max_brig_time = 8 - min_fine = 200 - max_fine = 400 + min_fine = 75 + max_fine = 175 /datum/law/low_severity/hooliganism name = "i105 - Indecent Exposure or Hooliganism" @@ -53,8 +53,8 @@ min_brig_time = 5 max_brig_time = 8 - min_fine = 250 - max_fine = 375 + min_fine = 50 + max_fine = 125 /datum/law/low_severity/radio_misuse name = "i107 - Misuse of Public Radio Channels" @@ -64,8 +64,8 @@ min_brig_time = 3 max_brig_time = 3 - min_fine = 150 - max_fine = 225 + min_fine = 35 + max_fine = 75 /datum/law/low_severity/violating_injunction name = "i108 - Violation of Injunction" @@ -75,8 +75,8 @@ min_brig_time = 5 max_brig_time = 10 - min_fine = 500 - max_fine = 750 + min_fine = 150 + max_fine = 250 /datum/law/low_severity/slander_hos name = "i109 - Slandering a Head of Staff" @@ -86,8 +86,8 @@ min_brig_time = 5 max_brig_time = 10 - min_fine = 250 - max_fine = 375 + min_fine = 100 + max_fine = 175 /datum/law/low_severity/slander name = "i110 - Slander or Verbal Abuse" @@ -97,8 +97,8 @@ min_brig_time = 3 max_brig_time = 5 - min_fine = 150 - max_fine = 250 + min_fine = 50 + max_fine = 100 /datum/law/low_severity/failure_execute name = "i111 - Failure to Execute an Order" @@ -108,8 +108,8 @@ min_brig_time = 5 max_brig_time = 15 - min_fine = 500 - max_fine = 750 + min_fine = 150 + max_fine = 300 /datum/law/low_severity/animal_cruelty name = "i113 - Animal Cruelty" @@ -119,8 +119,8 @@ min_brig_time = 5 max_brig_time = 10 - min_fine = 0 - max_fine = 0 + min_fine = 150 + max_fine = 350 /datum/law/low_severity/vandalism name = "i114 - Vandalism" @@ -130,8 +130,8 @@ min_brig_time = 3 max_brig_time = 10 - min_fine = 450 - max_fine = 675 + min_fine = 175 + max_fine = 300 /datum/law/low_severity/threat_murder name = "i115 - Threat of Murder or Serious Injury" @@ -141,8 +141,8 @@ min_brig_time = 3 max_brig_time = 10 - min_fine = 500 - max_fine = 750 + min_fine = 250 + max_fine = 500 /datum/law/low_severity/necrophilia name = "i116 - Disrespect to the Dead" @@ -152,8 +152,8 @@ min_brig_time = 5 max_brig_time = 10 - min_fine = 400 - max_fine = 600 + min_fine = 150 + max_fine = 250 /datum/law/low_severity/excessive_detainment name = "i117 - Excessive Use of Force in Detainment" @@ -163,8 +163,8 @@ min_brig_time = 5 max_brig_time = 10 - min_fine = 350 - max_fine = 700 + min_fine = 150 + max_fine = 300 /datum/law/low_severity/violation_privacy name = "i118 - Violation of Privacy Laws" @@ -174,8 +174,8 @@ min_brig_time = 3 max_brig_time = 10 - min_fine = 500 - max_fine = 750 + min_fine = 250 + max_fine = 500 /datum/law/low_severity/illegal_search name = "i119 - Illegal Search" @@ -185,5 +185,5 @@ min_brig_time = 3 max_brig_time = 10 - min_fine = 500 - max_fine = 750 + min_fine = 200 + max_fine = 400 diff --git a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm index 07487bc877f..8e07820060a 100644 --- a/code/modules/mob/living/carbon/human/species/station/diona/diona.dm +++ b/code/modules/mob/living/carbon/human/species/station/diona/diona.dm @@ -16,7 +16,7 @@ They are very slow, reasonably strong, and quite durable. They also require ligh age_max = 1000 default_genders = list(PLURAL) selectable_pronouns = list(NEUTER, PLURAL) - economic_modifier = 3 + economic_modifier = 7 icobase = 'icons/mob/human_races/diona/r_diona.dmi' deform = 'icons/mob/human_races/diona/r_def_plant.dmi' preview_icon = 'icons/mob/human_races/diona/diona_preview.dmi' diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm index 2d8bae30d33..8eb84bab592 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc.dm @@ -9,7 +9,7 @@ height_max = 250 age_min = 1 age_max = 60 - economic_modifier = 3 + economic_modifier = 6 default_genders = list(NEUTER) selectable_pronouns = list(NEUTER, PLURAL) diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm index 50a026bec07..c0ed854b00a 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajara.dm @@ -43,7 +43,7 @@ name_language = LANGUAGE_SIIK_MAAS ethanol_resistance = 0.9//Gets drunk a little faster rarity_value = 2 - economic_modifier = 7 + economic_modifier = 9 stamina = 90 // Tajara evolved to maintain a steady pace in the snow, sprinting wastes energy stamina_recovery = 4 diff --git a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm index 18d70ea5e3c..79e155579b6 100644 --- a/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/station/unathi/unathi.dm @@ -36,7 +36,7 @@ ethanol_resistance = 0.8 taste_sensitivity = TASTE_SENSITIVE - economic_modifier = 7 + economic_modifier = 9 num_alternate_languages = 2 secondary_langs = list(LANGUAGE_UNATHI, LANGUAGE_AZAZIBA) diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm index d19c0526598..e2ea68c4879 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca.dm @@ -11,7 +11,7 @@ age_max = 20 default_genders = list(NEUTER) selectable_pronouns = null - economic_modifier = 2 + economic_modifier = 7 language = LANGUAGE_VAURCA primitive_form = SPECIES_MONKEY_VAURCA greater_form = SPECIES_VAURCA_WARRIOR diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 90a285093d2..92dee941859 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -60,7 +60,7 @@ if(2) if(fabricate) fabricated_laptop.processor_unit = new/obj/item/computer_hardware/processor_unit(fabricated_laptop) - total_price += 299 + total_price += 199 switch(dev_battery) if(1) //Micro(500C) if(fabricate) @@ -68,7 +68,7 @@ if(2) // Basic(750C) if(fabricate) fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_laptop) - total_price += 199 + total_price += 99 // if(3) // Upgraded(1100C) // if(fabricate) // fabricated_laptop.battery_module = new/obj/item/computer_hardware/battery_module/advanced(fabricated_laptop) @@ -80,7 +80,7 @@ if(2) // Basic(128GQ) if(fabricate) fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_laptop) - total_price += 199 + total_price += 99 // if(3) // Upgraded(256GQ) // if(fabricate) // fabricated_laptop.hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(fabricated_laptop) @@ -89,7 +89,7 @@ if(1) // Basic(Short-Range) if(fabricate) fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card(fabricated_laptop) - total_price += 199 + total_price += 99 // if(2) // Advanced (Long Range) // if(fabricate) // fabricated_laptop.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_laptop) @@ -103,7 +103,7 @@ // if(fabricate) // fabricated_laptop.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_laptop) if(dev_card) - total_price += 199 + total_price += 99 if(fabricate) fabricated_laptop.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_laptop) //if(dev_aislot) @@ -124,11 +124,11 @@ if(2) // Upgraded(500C) if(fabricate) fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module/micro(fabricated_tablet) - total_price += 199 + total_price += 99 if(3) // Advanced(750C) if(fabricate) fabricated_tablet.battery_module = new/obj/item/computer_hardware/battery_module(fabricated_tablet) - total_price += 499 + total_price += 149 switch(dev_disk) if(1) // Basic(32GQ) if(fabricate) @@ -136,34 +136,34 @@ if(2) // Upgraded(64GQ) if(fabricate) fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive/small(fabricated_tablet) - total_price += 99 + total_price += 49 if(3) // Advanced(128GQ) if(fabricate) fabricated_tablet.hard_drive = new/obj/item/computer_hardware/hard_drive(fabricated_tablet) - total_price += 299 + total_price += 129 switch(dev_netcard) if(1) // Basic(Short-Range) if(fabricate) fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card(fabricated_tablet) - total_price += 99 + total_price += 49 if(2) // Advanced (Long Range) if(fabricate) fabricated_tablet.network_card = new/obj/item/computer_hardware/network_card/advanced(fabricated_tablet) - total_price += 299 + total_price += 129 if(dev_nanoprint) - total_price += 99 + total_price += 49 if(fabricate) fabricated_tablet.nano_printer = new/obj/item/computer_hardware/nano_printer(fabricated_tablet) if(dev_card) - total_price += 199 + total_price += 99 if(fabricate) fabricated_tablet.card_slot = new/obj/item/computer_hardware/card_slot(fabricated_tablet) if(dev_tesla) - total_price += 399 + total_price += 229 if(fabricate) fabricated_tablet.tesla_link = new/obj/item/computer_hardware/tesla_link(fabricated_tablet) if(dev_aislot) - total_price += 499 + total_price += 199 if(fabricate) fabricated_tablet.ai_slot = new/obj/item/computer_hardware/ai_slot(fabricated_tablet) return total_price diff --git a/html/changelogs/nauticall-price-rebalance.yml b/html/changelogs/nauticall-price-rebalance.yml new file mode 100644 index 00000000000..c0176f501d0 --- /dev/null +++ b/html/changelogs/nauticall-price-rebalance.yml @@ -0,0 +1,62 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: nauticall + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - experiment: "Reworked prices, wages and balances of (almost) everything ingame." + - rscadd: "Added coinage and decimal support to cash, ruthlessly sanitized to avoid floating-point errors. Reflected in cash-related things like ATMs." + - code_imp: "Tweaked how cash bundles are made and distributed to support decimalization." + - balance: "Adjusted the starting money individuals and departments receive in their accounts." + - balance: "Adjusted the funding Tajara, Unathi, Diona, Vaurca, and IPCs receive in their accounts. Should earn more on average than they used to." diff --git a/icons/obj/cash.dmi b/icons/obj/cash.dmi index 7edb0c6b388868225c53e2ab217f3756630751e1..cf780b32886153ff7a666d883f69aebd5e59b80f 100644 GIT binary patch literal 1689 zcmV;K24?w*P)004jp0{{R3ySghY%p-YzrSZzQCwhW#l5zro0OcVtEYuRxTc`2u(*to znv;rxiIkY;=H`@WFPepZdw_{kP)|-rMu~K7N=!~tR#!kEM16jhOH5ikJxQEdDPJ=e zOeGIVheRw=C?Y~0rbAL?Brs7LB}9jLC{josLOGwHyk%v3#dA1;LKI%BSTt}j(o|=P zEH_xInlNx1z`&!TqF8LJFh6i{bAm`pRn)Y1i*rLHMMbTU0CjY9>d{fSwH$thC0AuD ze}*QtwYA{j;2^Vi@EVOhXUb1i`db*-#`Zc+x>{yR@7#NlFaZs|i!#g9;F1;_s?~MtQ@xTqKle>wG*Hl(bIWV9JYhj-ds|&=N5lA&r@e z@RbNQN3epUBv2MOjddE@N3R>@^fDQ@PeZ5PW880k`nn;6VeGqPt9Q(-M6m1oF|&W) znXw=EA~Fzv0wO0YD9BrwthM z3g#CVLx%IWKDiYzlzvNoL+Mv6;)b)+ye}w(PcXl@yc{qDzm<^T?IrMASi0>K1U*S1 zEXV^5uHIQ*zO(8TSX%+Xm9>x{7b z8t{{bD*-=g2>ASzp)3*c%RVH51_!aW7V-l_AP|>igP5P18MQP6R%X(a05r%9^`{@q zk01zwAP9mW2!falcRw@u9I*2BFATl}tbF4ugRcQA-@Iq=4PfP4_YEEZw&25U_^Ww4 z+Sb^Dk9Hv6iFP!$;J3Sw??$^CTk!E7Ci>nI|0u|JH9B(ic za4``5k8r(<)(FQkpDj05%`x@lod(b#yv_a#D@do=x z9B$Be4;r8i8lVjt;0^Xc8#F*0+?Fd7MV^&WGozLUUl}zsYH9G5Q8S~K245L9Giqr( zE0Z1SCyrlssGmB1*`fa4@yibN4~}1UsDE_*2!bF8f*=TjAczmiL6*bA!_o3w`6q*) z0V}WkV(=?q;(U(IrSd|VqP&*lC&fxnthq7#iR_~$9)r_rg#7X0fB^0Vkn zV+sDPt9b^%f3;ezj^@?g2kaaK%La_Of)xYCT)`s)#(aX$6(DflXd-#Fmsg!!3UZ!Y z<+2cnAm_T@U%-rQU@s0BIRAebeNc!P!@*5E(q z=jV+;gDTer;tiHlLA1dNPX({iV6)L^Gy@H)ysA6I8Z?d=Z?J#FS7~sRdk}BX0B^7l z+Mof};ER`ldW_|r=r)+-y$Z2=@IG=0ga!O|T;zXCBLbM}3N0@&&*fdW7T5O*< jUmw?$69hpJ#Q&K0cKuDW)-Khz00000NkvXXu0mjfCSv{z literal 2789 zcmZ{mc{tQ-8^?cxV=IxNV;#!YA*rOXOx6%(sj-C&O+*n5F=5Q4(jJLaMAornUj{KI zOH+{{$JioSn<31Mn8ldmocEviJ?FgFbwAJddcN0l-`D-e=f0ljuB)@Xl%$d*002@B z$B&)fQrw?QTy$&iFc0Y75<;w-SJbhOG60~n;2sgEtLv-q2*%GD-4pt{ zy*(6omHUBy!^x?Al#{=G08kGeHX0kAHXJZ?RL`19?M!u3hnF;}A2cyCsW$F#y?ftK ztF~BSZ}9uB=N@U#G9?3$r!HEycx%Z1{v!1iwGXFhpE4u)Im^oH>P7DmKS$KLQwV%l9SSl?FD|n>1Jk z8F2t0L321}<%Z7sk%bLSA5JP(j$cZC#Q@&EV^B@7>PT?~6W*gz;mS6)q; z7@z-=J+R)oT*=#PCPZYrpqMa995&uy`C4z}1Z09GBqL(=KQUxn+v67>;0|a0ZkbVT zpmO3t$<%Z|vPdat(FYq-Q)?EqV5l(-E@it?w8&iPBjt{3F;c_aljrv3-iu4NRb3EV z4Roq$tsJ6WNCIDR-G1TG1DZRobr~IJ{W?>qBzzPw&90(}xLPFk`-r$R&C9 zH5RBJ{lKGg9NK1in2?rsTU}-cDVy7x$51Hu+vXu^8`(XTCtEDulVpzwlmD~8DAV7y zE|gs{sC-!>-TK0`gVO_#Bx~E1kzcD7>O}}LuZ#~FR-XiB7<^@a#91E? zgz;yK)Ir{2Rr9Q{F>}>1XyUHPi!zHjQH6fQC#LL7o#)1OnrGVty5 z)k$ybXmkN}PzksY9H9_h9u~Msy&=^;e?=RcO=o*)&TZuw9zcVZ##o0~Z|DSx9I}$= zfGT#+u3BGVOBh02DM#VnR0UFB$WJLAWPGDwKyjx0iqPwbwG z1aqrZ_&fn$iH(Y6`Y!7N5LpwEm>rd55fv)%W6H`oG9F*Q*FYZw7=%wg$uO%7zjP)AO2Usn<%dE>&{Thr|BD zbaZ3o<(8X$E6{Z(5k$3M)cke#>DRc-;1T~O!@X{?+YV>LO1ChpzQRNX#cbDqPZ#r| zXQWwAtGQe}SJ%v4FUoPLnl6S?boMrzh*!46T7vTjr*-as)@b;l5xyoi;dexOGmdMt z#cxKX!68GL?uwQ3_0R}GQf%?1v5tMIG`;5&%JWV_2l(T(^7*SS4T@YPjC4py!lMy9 zAr!h=&z%U9;eVqoVeN#4~JJ&ii_+_xzI`psd6XDzA<<6$>z}bI2>tT2NYLy*lEF>i-=D{vP)B_C&1kV|&;e zHC&@ES}2w#RKf zG@Q}f;ca2umqwXKIHeY&<5E5iq1Wf;f}(wC8nfL`L!!2WCo{V<^szJBq+81FVPjhC z*qHv}6^+N@1*Rk>Z;_5nguQWVHMu1aC2(WhzDRfUN#tgym4BD3{%kE>?5C{Axa^q< z=C7?qQ@;%}#JT9jm2VxcXU|H_nwmbU1dZl&&|91_uXQEd$M9m_4vg?gH31Qlmr-%T z_EMH(2cv;rh*BA%lcw*&`dWc=D1Am_SVG}z8Uq63u_X^b zFWDhrPLup~&~2MfX_fe8`W_jxOiz%?HCn;(8~OWVL-w;eBGsZa@)Kh=lVd*Z%olXQ z>!%c!;|W}^({agB7eDGRi(jq=4=+sqkW10Sbc>+R(-ggkn!C@boLb&sLFV+zfJX^h z>FMcJHEbYGa3Mz^mE{2(#o)T&^6KT7I^7CRmJjAgO_AL&nzDL)+I)%Bv7?=NpEv}! ztXS0tPY$qtNjd3fFhwzMb7nUc1F>A=&yRZ?0oU#XVF=4w&3;#Q#1S&{af2zQrio$( zVxT17rxOE(vJ{*223HZ?w!icZ80@`SA_=^3Od*OoG*Zdn-g#fxw>!+zEMAL^i~%0! zOY_kt^*&S%=+Cn)MGm?g)!M(7CJ($VAPu#Y0zur^A>m(c)i0Wo%FWwW+WQOZ9Mi~E z8ZFsEsNC@9z;hkJ;z(`t^7L$uPLiiQ>7<&O_Xua*vmEITBsUGZY))?9hud>JakO+I zANKT6WdR|3*Mhz0}gRWS^Q`|6T4z!3)@;7+N53cr)?*7WH@%I9u>Mbxu^zOs}A>;9!M?N*i@p4n|w!{2F^F`uvDOj7cXJ3YG z6*&p$@CF!~Eb2Hi5Yl90Gw2?^=}0nY@Lr)So { Your account balance is{' '} - {data.money} + {data.money.toFixed(2)} 电. { {data.access_level ? ( - {data.station_account_money}电 + {data.station_account_money.toFixed(2)}电 ) : ( '' @@ -223,7 +223,7 @@ export const SpecificAccountData = (props, context) => { {account.owner} - {account.money}电 + {account.money.toFixed(2)}电 @@ -312,7 +312,7 @@ export const SpecificAccountData = (props, context) => { {transaction.target_name} {transaction.purpose} - {transaction.amount}电 + {transaction.amount.toFixed(2)}电 {transaction.source_terminal} ))} diff --git a/tgui/packages/tgui/interfaces/CargoControl.tsx b/tgui/packages/tgui/interfaces/CargoControl.tsx index 582ccfe7398..a2170ba6c58 100644 --- a/tgui/packages/tgui/interfaces/CargoControl.tsx +++ b/tgui/packages/tgui/interfaces/CargoControl.tsx @@ -199,16 +199,16 @@ export const CargoControl = (props, context) => { : 'Unauthorised'} - {data.order_details.price} 电 + {data.order_details.price.toFixed(2)} 电 - {data.order_details.price_cargo} 电 + {data.order_details.price_cargo.toFixed(2)} 电 - {data.order_details.price_customer} 电 + {data.order_details.price_customer.toFixed(2)} 电 - {data.order_details.price_customer} 电 + {data.order_details.price_customer.toFixed(2)} 电 {data.order_details.time_submitted} @@ -246,7 +246,7 @@ export const CargoControl = (props, context) => { {item.name} {item.supplier_name} - {item.price} 电 + {item.price.toFixed(2)} 电 ))} @@ -287,7 +287,7 @@ export const MainWindow = (props, context) => { Welcome, {data.username}. - {data.cargo_money} 电 + {data.cargo_money.toFixed(2)} 电 {data.shuttle_has_arrive_time ? ( @@ -320,7 +320,7 @@ export const OverviewSubmitted = (props, context) => { {data.order_approved_shuttle_time / 10} seconds - {data.order_approved_shuttle_price} 电 + {data.order_approved_shuttle_price.toFixed(2)} 电 @@ -334,7 +334,7 @@ export const OverviewSubmitted = (props, context) => { {order.order_id} {order.ordered_by} - {order.price_cargo} 电 + {order.price_cargo.toFixed(2)} 电
@@ -407,7 +407,7 @@ export const OverviewApproved = (props, context) => { {order.order_id} {order.ordered_by} - {order.price_cargo} 电 + {order.price_cargo.toFixed(2)} 电
diff --git a/tgui/packages/tgui/interfaces/OrderTerminal.tsx b/tgui/packages/tgui/interfaces/OrderTerminal.tsx index 091a4b776c5..a9ced1385de 100644 --- a/tgui/packages/tgui/interfaces/OrderTerminal.tsx +++ b/tgui/packages/tgui/interfaces/OrderTerminal.tsx @@ -55,7 +55,7 @@ export const ItemWindow = (props, context) => { {data.items.map((item) => ( - {item.price}电   + {item.price.toFixed(2)}电