Actually Balanced and Standardized Vendor Prices. (#12495)

2020-06-10 07:22:53 +02:00
parent 1e4904f76e
commit 8cb15f9279
73 changed files with 162 additions and 139 deletions
@@ -154,7 +154,8 @@ RLD
 	icon_state = "rcd"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-	custom_price = 900
+	custom_price = PRICE_ABOVE_EXPENSIVE
+	custom_premium_price = PRICE_ALMOST_ONE_GRAND
 	max_matter = 160
 	item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
 	has_ammobar = TRUE
@@ -8,6 +8,9 @@ CIGARS
 SMOKING PIPES
 CHEAP LIGHTERS
 ZIPPO
+ROLLING PAPER
+VAPES
+BONGS

 CIGARETTE PACKETS ARE IN FANCY.DM
 */
@@ -506,7 +509,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	resistance_flags = FIRE_PROOF
 	light_color = LIGHT_COLOR_FIRE
 	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
-	custom_price = 55
+	custom_price = PRICE_ALMOST_CHEAP

 /obj/item/lighter/Initialize()
 	. = ..()
@@ -616,6 +619,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	desc = "A cheap-as-free lighter."
 	icon_state = "lighter"
 	fancy = FALSE
+	custom_price = PRICE_CHEAP_AS_FREE
 	overlay_list = list(
 		"transp",
 		"tall",
@@ -1,7 +1,7 @@
 /obj/item/flashlight
 	name = "flashlight"
 	desc = "A hand-held emergency light."
-	custom_price = 100
+	custom_price = PRICE_REALLY_CHEAP
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "flashlight"
 	item_state = "flashlight"
@@ -211,6 +211,7 @@
 	light_color = "#CDDDFF"
 	flashlight_power = 0.9
 	hitsound = 'sound/weapons/genhit1.ogg'
+	custom_price = PRICE_ALMOST_CHEAP

 // the desk lamps are a bit special
 /obj/item/flashlight/lamp
@@ -351,12 +352,13 @@
 	brightness_on = 6	// luminosity when on
 	light_color = "#FFAA44"
 	flashlight_power = 0.8
+	custom_price = PRICE_CHEAP

 /obj/item/flashlight/lantern/jade
 	name = "jade lantern"
 	desc = "An ornate, green lantern."
 	color = LIGHT_COLOR_GREEN
-	light_color = LIGHT_COLOR_GREEN 
+	light_color = LIGHT_COLOR_GREEN

 /obj/item/flashlight/slime
 	gender = PLURAL
@@ -429,7 +431,7 @@
 /obj/item/flashlight/glowstick
 	name = "glowstick"
 	desc = "A military-grade glowstick."
-	custom_price = 50
+	custom_price = PRICE_CHEAP_AS_FREE
 	w_class = WEIGHT_CLASS_SMALL
 	brightness_on = 4
 	color = LIGHT_COLOR_GREEN
@@ -6,12 +6,14 @@ T-RAY
 HEALTH ANALYZER
 GAS ANALYZER
 SLIME SCANNER
+NANITE SCANNER
+GENETICS SCANNER

 */
 /obj/item/t_scanner
 	name = "\improper T-ray scanner"
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
-	custom_price = 150
+	custom_price = PRICE_REALLY_CHEAP
 	icon = 'icons/obj/device.dmi'
 	icon_state = "t-ray0"
 	var/on = FALSE
@@ -5,7 +5,7 @@
 	icon_state = "scanner"
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
-	custom_price = 900
+	custom_price = PRICE_ABOVE_EXPENSIVE

 /obj/item/sensor_device/attack_self(mob/user)
 	GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it
@@ -71,7 +71,7 @@
 	sharpness = IS_SHARP_ACCURATE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	var/bayonet = FALSE	//Can this be attached to a gun?
-	custom_price = 250
+	custom_price = PRICE_NORMAL

 /obj/item/kitchen/knife/Initialize()
 	. = ..()
@@ -131,7 +131,7 @@
 	custom_materials = list(/datum/material/iron=18000)
 	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	w_class = WEIGHT_CLASS_NORMAL
-	custom_price = 600
+	custom_price = PRICE_EXPENSIVE

 /obj/item/kitchen/knife/combat
 	name = "combat knife"
@@ -200,7 +200,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	custom_price = 200
+	custom_price = PRICE_ALMOST_CHEAP

 /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -78,7 +78,7 @@
 	name = "crew pinpointer"
 	desc = "A handheld tracking device that points to crew suit sensors."
 	icon_state = "pinpointer_crew"
-	custom_price = 600
+	custom_price = PRICE_ABOVE_EXPENSIVE
 	var/has_owner = FALSE
 	var/pinpointer_owner = null

@@ -96,7 +96,7 @@
 	var/stop_bleeding = 1800
 	var/heal_brute = 5
 	self_delay = 10
-	custom_price = 100
+	custom_price = PRICE_REALLY_CHEAP

 /obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
 	if(ishuman(M))
@@ -713,7 +713,7 @@
 	icon_state = "fannypack_leather"
 	item_state = "fannypack_leather"
 	dying_key = DYE_REGISTRY_FANNYPACK
-	custom_price = 100
+	custom_price = PRICE_ALMOST_CHEAP

 /obj/item/storage/belt/fannypack/ComponentInitialize()
 	. = ..()
@@ -434,6 +434,7 @@
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donkpocketbox"
 	illustration=null
+	custom_premium_price = PRICE_ABOVE_NORMAL // git gud

 /obj/item/storage/box/donkpockets/ComponentInitialize()
 	. = ..()
@@ -622,7 +623,7 @@
 	item_state = "zippo"
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = ITEM_SLOT_BELT
-	custom_price = 20
+	custom_price = PRICE_REALLY_CHEAP

 /obj/item/storage/box/matches/ComponentInitialize()
 	. = ..()
@@ -1343,6 +1344,7 @@
 	name = "box of marshmallows"
 	desc = "A box of marshmallows."
 	illustration = "marshmallow"
+	custom_premium_price = PRICE_BELOW_NORMAL

 /obj/item/storage/box/marshmallow/PopulateContents()
 	for (var/i in 1 to 5)
@@ -70,6 +70,7 @@
 	name = "donut box"
 	spawn_type = /obj/item/reagent_containers/food/snacks/donut
 	fancy_open = TRUE
+	custom_price = PRICE_NORMAL

 /obj/item/storage/fancy/donut_box/ComponentInitialize()
 	. = ..()
@@ -136,7 +137,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	icon_type = "cigarette"
 	spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
-	custom_price = 75
+	custom_price = PRICE_ALMOST_CHEAP

 /obj/item/storage/fancy/cigarettes/ComponentInitialize()
 	. = ..()
@@ -278,7 +279,7 @@
 ///The value in here has NOTHING to do with icons. It needs to be this for the proper examine.
 	icon_type = "rolling paper"
 	spawn_type = /obj/item/rollingpaper
-	custom_price = 25
+	custom_price = PRICE_REALLY_CHEAP

 /obj/item/storage/fancy/rollingpapers/ComponentInitialize()
 	. = ..()
@@ -432,8 +432,8 @@
 	throw_range = 7
 	var/empty = FALSE
 	item_state = "firstaid"
-	custom_price = 300
-	custom_premium_price = 500
+	custom_price = PRICE_ABOVE_NORMAL
+	custom_premium_price = PRICE_EXPENSIVE

 /obj/item/storage/hypospraykit/ComponentInitialize()
 	. = ..()
@@ -145,7 +145,7 @@
 	desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
 	icon_state = "waterbackpackjani"
 	item_state = "waterbackpackjani"
-	custom_price = 1000
+	custom_price = PRICE_ALMOST_ONE_GRAND

 /obj/item/watertank/janitor/Initialize()
 	. = ..()