cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct price errors introduced in UI update. Also shuffle a few things so there is no random spaces in the vendor.

Browse Source
This commit is contained in:
lbnesquik
2020-08-22 20:36:21 +02:00
parent 9b802e87f9
commit 472685cd25
2 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
View File

@@ -42,21 +42,21 @@
EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 1500),
EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/weapon/grenade/smokebomb, 100),
EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 7500),
EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 500),
EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 1000),
EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 500),
EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 500),
EQUIPMENT("Geiger Counter", /obj/item/device/geiger, 750),
EQUIPMENT("GPS Device", /obj/item/device/gps/mining, 100),
// EQUIPMENT("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000),
EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 1200),
EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120),
EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 750),
)
prize_list["Consumables"] = list(
EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10),
EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30),
EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1200),
EQUIPMENT("Injector (L) - Glucose", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500),
EQUIPMENT("Injector (L) - Panacea", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 500),
@@ -71,14 +71,14 @@
)
prize_list["Kinetic Accelerator"] = list(
EQUIPMENT("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 900),
EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable, 175),
EQUIPMENT("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
EQUIPMENT("KA Efficiency Increase", /obj/item/borg/upgrade/modkit/efficiency, 1200),
EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350),
EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300),
EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000),
EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350),
EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250),
EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300),
EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable, 175),
EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 125),
)
prize_list["Digging Tools"] = list(
@@ -91,6 +91,8 @@
EQUIPMENT("Fine Excavation Kit - Measuring Tape", /obj/item/device/measuring_tape, 125),
EQUIPMENT("Fine Excavation Kit - Hand Pick", /obj/item/weapon/pickaxe/hand, 375),
EQUIPMENT("Explosive Excavation Kit - Plastic Charge",/obj/item/weapon/plastique/seismic/locked, 1500),
EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 3000),
EQUIPMENT("Industrial Equipment - Sheet-Snatcher",/obj/item/weapon/storage/bag/sheetsnatcher, 500),
)
prize_list["Hardsuit"] = list(
EQUIPMENT("Hardsuit - Control Module", /obj/item/weapon/rig/industrial/vendor, 2000),
@@ -104,14 +106,12 @@
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 125),
EQUIPMENT("Bar Shelter Capsule", /obj/item/device/survivalcapsule/luxurybar, 10000),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 3000),
EQUIPMENT("Industrial Equipment - Sheet-Snatcher",/obj/item/weapon/storage/bag/sheetsnatcher, 500),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
EQUIPMENT("Laser Pointer", /obj/item/device/laser_pointer, 900),
EQUIPMENT("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 3100),
EQUIPMENT("Bar Shelter Capsule", /obj/item/device/survivalcapsule/luxurybar, 10000),
EQUIPMENT("Plush Toy", /obj/random/plushie, 300),
EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 200),
EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 1000),

83
code/modules/mining/ore_redemption_machine/survey_vendor.dm
View File

@@ -14,55 +14,56 @@
//VOREStation Edit Start - Heavily modified list
prize_list = list()
prize_list["Gear"] = list(
EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 500),
EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 1000),
EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 1500),
EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/weapon/grenade/smokebomb, 100),
EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 7500),
EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 500),
EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 1000),
EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 500),
EQUIPMENT("Geiger Counter", /obj/item/device/geiger, 750),
EQUIPMENT("GPS Device", /obj/item/device/gps/mining, 100),
EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 1200),
EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 750),
EQUIPMENT("Defense Equipment - Smoke Bomb", /obj/item/weapon/grenade/smokebomb, 10),
EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50),
EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100),
EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150),
EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50),
EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100),
EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 750),
EQUIPMENT("Fulton Beacon", /obj/item/fulton_core, 300),
EQUIPMENT("Geiger Counter", /obj/item/device/geiger, 75),
EQUIPMENT("GPS Device", /obj/item/device/gps/mining, 10),
EQUIPMENT("Jump Boots", /obj/item/clothing/shoes/bhop, 250),
EQUIPMENT("Mini-Translocator", /obj/item/device/perfect_tele/one_beacon, 120),
EQUIPMENT("Survival Equipment - Insulated Poncho", /obj/random/thermalponcho, 75),
)
prize_list["Consumables"] = list(
EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 1200),
EQUIPMENT("Injector (L) - Glucose", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 500),
EQUIPMENT("Injector (L) - Panacea", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 500),
EQUIPMENT("Injector (L) - Trauma", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 500),
EQUIPMENT("Nanopaste Tube", /obj/item/stack/nanopaste, 1000),
EQUIPMENT("Point Transfer Card", /obj/item/weapon/card/mining_point_card/survey, 500),
EQUIPMENT("Shelter Capsule", /obj/item/device/survivalcapsule, 500),
EQUIPMENT("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 250),
EQUIPMENT("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 250),
EQUIPMENT("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 250),
EQUIPMENT("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 250),
EQUIPMENT("1 Marker Beacon", /obj/item/stack/marker_beacon, 1),
EQUIPMENT("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10),
EQUIPMENT("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30),
EQUIPMENT("Fulton Pack", /obj/item/extraction_pack, 125),
EQUIPMENT("Injector (L) - Glucose", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose, 50),
EQUIPMENT("Injector (L) - Panacea", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/purity, 50),
EQUIPMENT("Injector (L) - Trauma", /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/brute, 50),
EQUIPMENT("Nanopaste Tube", /obj/item/stack/nanopaste, 100),
EQUIPMENT("Point Transfer Card", /obj/item/weapon/card/mining_point_card/survey, 50),
EQUIPMENT("Shelter Capsule", /obj/item/device/survivalcapsule, 50),
EQUIPMENT("Burn Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/burn, 25),
EQUIPMENT("Detox Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/detox, 25),
EQUIPMENT("Oxy Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy, 25),
EQUIPMENT("Trauma Medipen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma, 25),
)
prize_list["Digging Tools"] = list(
EQUIPMENT("Survey Tools - Shovel", /obj/item/weapon/shovel, 40),
EQUIPMENT("Survey Tools - Mechanical Trap", /obj/item/weapon/beartrap, 50),
)
prize_list["Miscellaneous"] = list(
EQUIPMENT("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 125),
EQUIPMENT("Bar Shelter Capsule", /obj/item/device/survivalcapsule/luxurybar, 10000),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 3000),
EQUIPMENT("Laser Pointer", /obj/item/device/laser_pointer, 900),
EQUIPMENT("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 3100),
EQUIPMENT("Plush Toy", /obj/random/plushie, 300),
EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 200),
EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 1000),
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 200),
EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 400),
EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125),
EQUIPMENT("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 10),
EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 10),
EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15),
EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50),
EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100),
EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 300),
EQUIPMENT("Laser Pointer", /obj/item/device/laser_pointer, 90),
EQUIPMENT("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 310),
EQUIPMENT("Bar Shelter Capsule", /obj/item/device/survivalcapsule/luxurybar, 1000),
EQUIPMENT("Plush Toy", /obj/random/plushie, 30),
EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 20),
EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 100),
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 20),
EQUIPMENT("UAV - Recon Skimmer", /obj/item/device/uav, 40),
)
//VOREStation Edit End