fix

cmss13-devs · Nov 3, 2024 · 2efb25f · 2efb25f
1 parent e4c0968
commit 2efb25f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/code/modules/reagents/Chemistry-Generator.dm b/code/modules/reagents/Chemistry-Generator.dm
@@ -95,9 +95,7 @@
 					else
 						chem_id = pick(GLOB.chemical_gen_classes_list["C2"])
 				if(2)
-					if(roll<=60)
-						chem_id = pick(GLOB.chemical_gen_classes_list["C1"])
-					else if(roll<=35)
+					if(roll<=35)
 						chem_id = pick(GLOB.chemical_gen_classes_list["C2"])
 					else if(roll<=15)
 						chem_id = pick(GLOB.chemical_gen_classes_list["C3"])
@@ -106,10 +104,8 @@
 				if(3)
 					if(roll<=50)
 						chem_id = pick(GLOB.chemical_gen_classes_list["C3"])
-					else if(roll<=70)
-						chem_id = pick(GLOB.chemical_gen_classes_list["C4"])
 					else
-						chem_id = pick(GLOB.chemical_gen_classes_list["C5"])
+						chem_id = pick(GLOB.chemical_gen_classes_list["C4"])
 				else
 					if(!required_reagents || is_catalyst)//first component is more likely to be special in chems tier 4 or higher, catalysts are always special in tier 4 or higher
 						if (prob(50))

diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm
@@ -175,7 +175,7 @@
 		PROPERTY_FOCUSING = 6,
 		PROPERTY_CURING = 4,
 	)
-	flags = REAGENT_TYPE_MEDICAL | REAGENT_NO_GENERATION
+	flags = REAGENT_TYPE_MEDICAL
 
 /datum/reagent/medical/neuraline //injected by neurostimulator implant
 	name = "Neuraline"

diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm
@@ -44,7 +44,6 @@
 	description = "A thick green blood, definitely not human."
 	color = BLOOD_COLOR_YAUTJA
 	chemclass = CHEM_CLASS_SPECIAL
-	flags = REAGENT_NO_GENERATION
 	objective_value = OBJECTIVE_HIGH_VALUE
 
 /datum/reagent/blood/synth_blood
@@ -68,7 +67,6 @@
 	description = "A corrosive blood like substance. Makeup appears to be made out of acids and blood plasma."
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_HIGH_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_CORROSIVE = 3)
 
 /datum/reagent/blood/xeno_blood/royal
@@ -77,7 +75,6 @@
 	color = BLOOD_COLOR_XENO_ROYAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_CORROSIVE = 6)
 
 /datum/reagent/vaccine
@@ -450,7 +447,7 @@
 	description = "Chemical element of atomic number 92. A silvery-white metallic chemical element in the actinide series, weakly radioactive. Has been historically used for nuclear power and in the creation of nuclear bombs."
 	reagent_state = SOLID
 	color = "#B8B8C0" // rgb: 184, 184, 192
-	chemclass = CHEM_CLASS_SPECIAL
+	chemclass = CHEM_CLASS_RARE
 	properties = list(PROPERTY_CARCINOGENIC = 2)
 
 /datum/reagent/uranium/reaction_turf(turf/T, volume)
@@ -973,7 +970,6 @@
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_HALLUCINOGENIC = 8, PROPERTY_NERVESTIMULATING = 6)
 
 /datum/reagent/plasma/chitin
@@ -985,7 +981,6 @@
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_HYPERDENSIFICATING = 1)
 
 /datum/reagent/plasma/catecholamine
@@ -997,7 +992,6 @@
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_PAINING = 2, PROPERTY_MUSCLESTIMULATING = 6)
 
 /datum/reagent/plasma/egg
@@ -1009,7 +1003,6 @@
 	overdose_critical = 100
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_HEMOSITIC = 4)
 
 /datum/reagent/plasma/egg/on_mob_life(mob/living/M)
@@ -1041,7 +1034,6 @@
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_NEUROTOXIC = 4, PROPERTY_TOXIC = 1, PROPERTY_HALLUCINOGENIC = 6)
 
 /datum/reagent/plasma/antineurotoxin
@@ -1053,7 +1045,6 @@
 	objective_value = OBJECTIVE_MEDIUM_VALUE
 	overdose = REAGENTS_OVERDOSE
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_NEUROSHIELDING = 1)
 
 /datum/reagent/plasma/purple
@@ -1065,7 +1056,6 @@
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_BIOCIDIC = 2)
 
 /datum/reagent/plasma/royal
@@ -1077,7 +1067,6 @@
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_ABSOLUTE_VALUE
-	flags = REAGENT_NO_GENERATION
 	properties = list(PROPERTY_BIOCIDIC = 4, PROPERTY_ADDICTIVE = 1, PROPERTY_HALLUCINOGENIC = 4, PROPERTY_ENCRYPTED = 1)
 
 /datum/reagent/fruit_resin
@@ -1091,4 +1080,4 @@
 	overdose_critical = MED_REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	properties = list(PROPERTY_TRANSFORMATIVE = 4, PROPERTY_NUTRITIOUS = 3, PROPERTY_HEMOGENIC = 1)
-	flags = REAGENT_SCANNABLE | REAGENT_NO_GENERATION
+	flags = REAGENT_SCANNABLE