more fixing+ chem selling tweaks

2025-12-11 10:22:13 +00:00 · 2019-11-13 09:39:42 -05:00
parent de1ce4afc8
commit 73661cfe52
7 changed files with 61 additions and 11 deletions
--- a/code/modules/cargo/exports/food_wine.dm
+++ b/code/modules/cargo/exports/food_wine.dm
@@ -42,6 +42,21 @@
 	unit_name = "cooked food base"
 	export_types = list(/obj/item/reagent_containers/food/snacks/bun)

+/datum/export/food/buns
+	cost = 3
+	unit_name = "cooked food base"
+	export_types = list(/obj/item/reagent_containers/food/snacks/bun)
+
+/datum/export/food/eggs
+	cost = 4
+	unit_name = "cooked food base"
+	export_types = list(/obj/item/reagent_containers/food/snacks/friedegg)
+
+/datum/export/food/eggs_food
+	cost = 20
+	unit_name = "cooked egg based food"
+	export_types = list(/obj/item/reagent_containers/food/snacks/omelette, /obj/item/reagent_containers/food/snacks/benedict, /obj/item/reagent_containers/food/snacks/salad/eggbowl)
+
 /datum/export/food/sweets
 	cost = 4
 	unit_name = "pastery base"
@@ -147,14 +162,8 @@
 	unit_name = "snowcone"
 	export_types = list(/obj/item/reagent_containers/food/snacks/snowcones)

-/datum/export/booze/loose
-	cost = 1.5 //PER unit
-	unit_name = "station brew"
-	export_types = list(/datum/reagent/consumable/ethanol/fruit_wine)
-	include_subtypes = TRUE //Just in case
-
 /datum/export/booze/brands
-	cost = 100
+	cost = 200
 	unit_name = "export bottle"
 	export_types = list(/obj/item/export/bottle/kahlua, /obj/item/export/bottle/whiskey, /obj/item/export/bottle/vodka, /obj/item/export/bottle/gin, \
 						/obj/item/export/bottle/rum, /obj/item/export/bottle/tequila, /obj/item/export/bottle/vermouth, /obj/item/export/bottle/wine, /obj/item/export/bottle/grappa, /obj/item/export/bottle/cognac, \
--- a/code/modules/cargo/packs/livestock.dm
+++ b/code/modules/cargo/packs/livestock.dm
@@ -12,9 +12,10 @@

 /datum/supply_pack/critter/animal_feed
 	name = "Animal Feed Crate"
-	desc = "Feed for livestock, like cows and hens. Contains fifty Wheat bundles"
-	cost = 1300
-	contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat)
+	desc = "Feed for livestock, like cows and hens. Contains fifty Wheat bundles and fifty Oat bundles."
+	cost = 1500
+	contains = list(/obj/item/reagent_containers/food/snacks/grown/wheat,
+					/obj/item/reagent_containers/food/snacks/grown/oat)
 	crate_name = "animal feed crate"
 	crate_type = /obj/structure/closet/crate/freezer

--- a/code/modules/cargo/packs/materials.dm
+++ b/code/modules/cargo/packs/materials.dm
@@ -75,6 +75,18 @@
 	crate_name = "cotton crate"
 	crate_type = /obj/structure/closet/crate/hydroponics

+/datum/supply_pack/organic/rawlumber
+	name = "Raw Lumber Crate"
+	desc = "Raw logs from towercaps. Contains fifty logs."
+	cost = 1000
+	contains = list(/obj/item/grown/log)
+	crate_name = "lumber crate"
+
+/datum/supply_pack/critter/animal_feed/generate()
+	. = ..()
+	for(var/i in 1 to 49)
+		new /obj/item/grown/log(.)
+
 /datum/supply_pack/materials/rcdammo
 	name = "Spare RDC ammo"
 	desc = "This crate contains sixteen RCD ammo packs, to help with any holes or projects people mite be working on."
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -12,6 +12,7 @@
 	id = "consumable"
 	taste_description = "generic food"
 	taste_mult = 4
+	value = 0.1
 	var/nutriment_factor = 1 * REAGENTS_METABOLISM
 	var/quality = 0	//affects mood, typically higher for mixed drinks with more complex recipes

@@ -91,6 +92,7 @@
 	name = "Vitamin"
 	id = "vitamin"
 	description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
+	value = 0.5

 	brute_heal = 1
 	burn_heal = 1
@@ -106,6 +108,7 @@
 	description = "A variety of cooking oil derived from fat or plants. Used in food preparation and frying."
 	color = "#EADD6B" //RGB: 234, 221, 107 (based off of canola oil)
 	taste_mult = 0.8
+	value = 1
 	taste_description = "oil"
 	nutriment_factor = 7 * REAGENTS_METABOLISM //Not very healthy on its own
 	metabolization_rate = 10 * REAGENTS_METABOLISM
@@ -156,6 +159,7 @@
 	metabolization_rate = 2 * REAGENTS_METABOLISM
 	overdose_threshold = 200 // Hyperglycaemic shock
 	taste_description = "sweetness"
+	value = 1

 /datum/reagent/consumable/sugar/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>You go into hyperglycaemic shock! Lay off the twinkies!</span>")
@@ -237,6 +241,7 @@
 	description = "A special oil that noticably chills the body. Extracted from Icepeppers and slimes."
 	color = "#8BA6E9" // rgb: 139, 166, 233
 	taste_description = "mint"
+	value = 2
 	pH = 13 //HMM! I wonder

 /datum/reagent/consumable/frostoil/on_mob_life(mob/living/carbon/M)
@@ -438,6 +443,7 @@
 /datum/reagent/consumable/sprinkles
 	name = "Sprinkles"
 	id = "sprinkles"
+	value = 3
 	description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
 	color = "#FF00FF" // rgb: 255, 0, 255
 	taste_description = "childhood whimsy"
@@ -453,6 +459,7 @@
 	id = "peanut_butter"
 	description = "A popular food paste made from ground dry-roasted peanuts."
 	color = "#C29261"
+	value = 3
 	nutriment_factor = 15 * REAGENTS_METABOLISM
 	taste_description = "peanuts"

@@ -461,6 +468,7 @@
 	id = "cornoil"
 	description = "An oil derived from various types of corn."
 	nutriment_factor = 20 * REAGENTS_METABOLISM
+	value = 4
 	color = "#302000" // rgb: 48, 32, 0
 	taste_description = "slime"

@@ -537,6 +545,7 @@
 	id = "cherryjelly"
 	description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
 	color = "#801E28" // rgb: 128, 30, 40
+	value = 1
 	taste_description = "cherry"

 /datum/reagent/consumable/bluecherryjelly
@@ -544,6 +553,7 @@
 	id = "bluecherryjelly"
 	description = "Blue and tastier kind of cherry jelly."
 	color = "#00F0FF"
+	value = 12
 	taste_description = "blue cherry"

 /datum/reagent/consumable/rice
@@ -601,7 +611,7 @@
 	id = "honey"
 	description = "Sweet sweet honey that decays into sugar. Has antibacterial and natural healing properties."
 	color = "#d3a308"
-	value = 5
+	value = 15
 	nutriment_factor = 15 * REAGENTS_METABOLISM
 	metabolization_rate = 1 * REAGENTS_METABOLISM
 	taste_description = "sweetness"
@@ -628,6 +638,7 @@
 	id = "mayonnaise"
 	description = "An white and oily mixture of mixed egg yolks."
 	color = "#DFDFDF"
+	value = 5
 	taste_description = "mayonnaise"

 /datum/reagent/consumable/tearjuice
@@ -756,6 +767,7 @@
 	taste_mult = 8
 	taste_description = "sweetness"
 	overdose_threshold = 17
+	value = 0.2

 /datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/M)
 	if(M.disgust < 80)
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -128,6 +128,7 @@
 	description = "Instantly restores all hearing to the patient, but does not cure deafness."
 	color = "#6600FF" // rgb: 100, 165, 255
 	pH = 2
+	value = 10

 /datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/M)
 	M.restoreEars()
@@ -210,6 +211,7 @@
 	overdose_threshold = 30
 	taste_description = "fish"
 	pH = 12.2
+	value = 20

 /datum/reagent/medicine/rezadone/on_mob_life(mob/living/carbon/M)
 	M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
@@ -243,6 +245,7 @@
 	color = "#ffeac9"
 	metabolization_rate = 5 * REAGENTS_METABOLISM
 	overdose_threshold = 50
+	value = 3

 /datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
 	if(iscarbon(M) && M.stat != DEAD)
@@ -281,6 +284,7 @@
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	overdose_threshold = 25
 	pH = 10.7
+	value = 4

 /datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/carbon/M)
 	if(M.getFireLoss() > 25)
@@ -305,6 +309,7 @@
 	pH = 6.7
 	metabolization_rate = 5 * REAGENTS_METABOLISM
 	overdose_threshold = 50
+	value = 3

 /datum/reagent/medicine/styptic_powder/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
 	if(iscarbon(M) && M.stat != DEAD)
@@ -347,6 +352,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	var/last_added = 0
 	var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10	//So that normal blood regeneration can continue with salglu active
 	pH = 5.5
+	value = 1

 /datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/carbon/M)
 	if(last_added)
@@ -427,6 +433,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	pH = 11.5
 	metabolization_rate = 5 * REAGENTS_METABOLISM
 	overdose_threshold = 40
+	value = 6

 /datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=TOUCH, reac_volume,show_message = 1)
 	if(iscarbon(M))
@@ -459,6 +466,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	taste_description = "ash"
 	pH = 5
+	value = 1

 /datum/reagent/medicine/charcoal/on_mob_life(mob/living/carbon/M)
 	M.adjustToxLoss(-2*REM, 0)
@@ -477,6 +485,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	metabolization_rate = 0.25 * REAGENTS_METABOLISM
 	overdose_threshold = 30
 	pH = 2
+	value = 5

 /datum/reagent/medicine/omnizine/on_mob_life(mob/living/carbon/M)
 	M.adjustToxLoss(-0.5*REM, 0)
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -19,6 +19,7 @@
 /datum/reagent/nitroglycerin
 	name = "Nitroglycerin"
 	id = "nitroglycerin"
+	value = 5
 	description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
 	color = "#808080" // rgb: 128, 128, 128
 	taste_description = "oil"
@@ -29,6 +30,7 @@
 	description = "Keeps unstable chemicals stable. This does not work on everything."
 	reagent_state = LIQUID
 	color = "#FFFF00"
+	value = 3
 	taste_description = "metal"

 /datum/reagent/clf3
@@ -89,6 +91,7 @@
 	description = "Sucks everything into the detonation point."
 	reagent_state = LIQUID
 	color = "#210021"
+	value = 10
 	taste_description = "compressed bitterness"

 /datum/reagent/blackpowder
@@ -97,6 +100,7 @@
 	description = "Explodes. Violently."
 	reagent_state = LIQUID
 	color = "#000000"
+	value = 5
 	metabolization_rate = 0.05
 	taste_description = "salt"

@@ -164,6 +168,7 @@
 	description = "Very flammable."
 	reagent_state = LIQUID
 	color = "#FA00AF"
+	value = 1
 	taste_description = "burning"

 /datum/reagent/napalm/on_mob_life(mob/living/carbon/M)