adjust vendor organization

shiptest-ss13 · Jan 4, 2024 · 72da169 · 72da169
1 parent 72a315f
commit 72da169
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
@@ -85,6 +85,7 @@
 	attack_verb = list("sliced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP
+	custom_price = 500
 
 /obj/item/clothing/glasses/science
 	name = "science goggles"

diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
@@ -20,23 +20,23 @@
 	// Mining products are handled differently, because I am too lazy to convert this list stolen from the old vendor.
 	products = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
 		/obj/item/stack/marker_beacon/thirty = 3,
+		/obj/item/mining_scanner = 2,
+		/obj/item/t_scanner/adv_mining_scanner = 2,
 		/obj/item/hivelordstabilizer = 3,
-		/obj/item/survivalcapsule = 2,
+		/obj/item/clothing/glasses/meson/gar = 2,
 		/obj/item/kinetic_crusher = 1,
 		/obj/item/gun/energy/kinetic_accelerator = 2,
-		/obj/item/mining_scanner = 2,
-		/obj/item/lazarus_injector = 1,
 		/obj/item/pickaxe/silver = 1,
-		/obj/item/survivalcapsule/luxury = 1,
 		/obj/item/borg/upgrade/modkit/range = 2,
 		/obj/item/borg/upgrade/modkit/damage = 2,
 		/obj/item/borg/upgrade/modkit/cooldown = 2,
 		/obj/item/borg/upgrade/modkit/aoe/mobs = 1
 	)
 	premium = list(
-		/mob/living/simple_animal/hostile/facehugger/toy = 1,
-		/obj/item/clothing/glasses/meson/gar = 2,
-		/obj/item/survivalcapsule/luxuryelite = 1,
+		/obj/item/lazarus_injector = 1,
+		/obj/item/survivalcapsule = 2,
+		/obj/item/survivalcapsule/luxury = 1,
+		/obj/item/survivalcapsule/luxuryelite = 1
 	)
 
 	var/voucher_items = list(

diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
@@ -12,33 +12,29 @@
 		/obj/item/healthanalyzer = 2,
 		/obj/item/reagent_containers/pill/patch/styptic = 5,
 		/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
+		/obj/item/reagent_containers/hypospray/medipen = 3,
 		/obj/item/reagent_containers/syringe/perfluorodecalin = 2,
+		/obj/item/reagent_containers/syringe/antiviral = 1,
 		/obj/item/reagent_containers/glass/bottle/charcoal = 3,
 		/obj/item/reagent_containers/glass/bottle/epinephrine = 3,
 		/obj/item/reagent_containers/glass/bottle/morphine = 1,
 		/obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
 		/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
-		/obj/item/reagent_containers/syringe/antiviral = 1,
 		/obj/item/reagent_containers/medigel/styptic = 1,
 		/obj/item/reagent_containers/medigel/silver_sulf = 1,
+		/obj/item/reagent_containers/medigel/synthflesh = 1,
 		/obj/item/reagent_containers/medigel/sterilizine = 1,
-
 		/obj/item/sensor_device = 1,
 		/obj/item/pinpointer/crew = 1,
-		/obj/item/reagent_containers/glass/bottle/vial/small = 3,
 		/obj/item/stack/medical/splint = 5)
 	contraband = list(
 		/obj/item/reagent_containers/pill/tox = 2,
 		/obj/item/reagent_containers/pill/morphine = 2,
 		/obj/item/reagent_containers/pill/charcoal = 4,
 		/obj/item/storage/box/hug/medical = 1)
 	premium = list(
-		/obj/item/reagent_containers/medigel/synthflesh = 1,
-		/obj/item/reagent_containers/hypospray/medipen = 3,
 		/obj/item/clothing/glasses/hud/health = 1,
 		/obj/item/clothing/glasses/hud/health/prescription = 1,
-		/obj/item/hypospray/mkii = 1,
-		/obj/item/storage/belt/medical = 1,
 		/obj/item/shears = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	resistance_flags = FIRE_PROOF