Research major property rebalance

code/game/objects/effects/effect_system/chemsmoke.dm

@@ -8,6 +8,8 @@
 	time_to_live = 300
 	anchored = TRUE
 	smokeranking = SMOKE_RANK_HIGH
+	alpha = 100
+	var/obj/chemholder
 
 /obj/effect/particle_effect/smoke/chem/Initialize()
 	. = ..()
@@ -138,10 +140,10 @@
 								var/dist = cheap_pythag(T.x - location.x, T.y - location.y)
 								if(!dist)
 									dist = 1
-								R.reaction_mob(A, volume = R.volume / dist, permeable = FALSE)
+								R.reaction_mob(A, volume = R.volume * POTENCY_MULTIPLIER_VLOW / dist, permeable = FALSE)
 							else if(istype(A, /obj))
 								R.reaction_obj(A, R.volume)
-					sleep(30)
+					sleep(3 SECONDS)
 
 
 	//build smoke icon
@@ -199,10 +201,7 @@
 	smoke.pixel_x = -32 + rand(-8,8)
 	smoke.pixel_y = -32 + rand(-8,8)
 	walk_to(smoke, T)
-	smoke.set_opacity(1) //switching opacity on after the smoke has spawned, and then
-	sleep(150+rand(0,20)) // turning it off before it is deleted results in cleaner
-	if(smoke.opacity)
-		smoke.set_opacity(0)
+	sleep(150+rand(0,20))
 	fadeOut(smoke)
 	qdel(smoke)
 
@@ -259,3 +258,8 @@
 	targetTurfs = complete
 
 	return
+
+/obj/effect/particle_effect/smoke/chem/affect(mob/living/carbon/M)
+	if(reagents.reagent_list.len)
+		for(var/datum/reagent/reagent in reagents.reagent_list)
+			reagent.reaction_mob(M, volume = reagent.volume * POTENCY_MULTIPLIER_VLOW, permeable = FALSE)

code/modules/reagents/Chemistry-Generator.dm

@@ -342,7 +342,9 @@
 											PROPERTY_NEUROSHIELDING = list(PROPERTY_ALCOHOLIC, PROPERTY_BALDING),\
 											PROPERTY_ANTIADDICTIVE = list(PROPERTY_PSYCHOSTIMULATING, PROPERTY_ANTIHALLUCINOGENIC),\
 											PROPERTY_ADDICTIVE = list(PROPERTY_PSYCHOSTIMULATING, PROPERTY_NEUROTOXIC),\
-											PROPERTY_CIPHERING_PREDATOR = list(PROPERTY_CIPHERING, PROPERTY_CROSSMETABOLIZING))
+											PROPERTY_CIPHERING_PREDATOR = list(PROPERTY_CIPHERING, PROPERTY_CROSSMETABOLIZING),\
+											PROPERTY_FIRE_PENETRATING = list(PROPERTY_OXYGENATING, PROPERTY_VISCOUS),\
+											PROPERTY_BONEMENDING = list(PROPERTY_HYPERDENSIFICATING, PROPERTY_NUTRITIOUS))
 	var/datum/chem_property/match
 	var/datum/chem_property/initial_property
 	for(var/datum/chem_property/P in properties)

code/modules/reagents/Chemistry-Reagents.dm

@@ -182,14 +182,17 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 		if(potency <= 0)
 			continue
 		P.process(M, potency, delta_time)
-		if(flags & REAGENT_CANNOT_OVERDOSE)
-			continue
 		if(overdose && volume > overdose)
-			P.process_overdose(M, potency, delta_time)
-			if(overdose_critical && volume > overdose_critical)
-				P.process_critical(M, potency, delta_time)
-			var/overdose_message = "[istype(src, /datum/reagent/generated) ? "custom chemical" : initial(name)] overdose"
-			M.last_damage_data = create_cause_data(overdose_message, last_source_mob?.resolve())
+			if(flags & REAGENT_CANNOT_OVERDOSE)
+				var/ammount_overdosed = volume - overdose
+				holder.remove_reagent(id, ammount_overdosed)
+				holder.add_reagent("sugar", ammount_overdosed)
+			else
+				P.process_overdose(M, potency, delta_time)
+				if(overdose_critical && volume > overdose_critical)
+					P.process_critical(M, potency, delta_time)
+				var/overdose_message = "[istype(src, /datum/reagent/generated) ? "custom chemical" : initial(name)] overdose"
+				M.last_damage_data = create_cause_data(overdose_message, last_source_mob?.resolve())
 
 	if(mods[REAGENT_PURGE])
 		holder.remove_all_type(/datum/reagent,mods[REAGENT_PURGE] * delta_time)

code/modules/reagents/chemistry_machinery/chem_simulator.dm

@@ -441,7 +441,7 @@
 	min_creation_cost += slots_used - 2
 	for(var/datum/chem_property/P in creation_template)
 		creation_cost += max(abs(P.value), 1) * P.level
-		if(P.level > 5) // a penalty is added at each level above 5 (+1 at 6, +2 at 7, +4 at 8, +5 at 9, +7 at 10)
+		if(P.level > 5 && P.cost_penalty) // a penalty is added at each level above 5 (+1 at 6, +2 at 7, +4 at 8, +5 at 9, +7 at 10)
 			creation_cost += P.level - 6 + ceil((P.level - 5) / 2)
 	creation_cost += ((new_od_level - 10) / 5) * 3 //3 cost for every 5 units above 10
 	for(var/rarity in creation_complexity)

code/modules/reagents/chemistry_properties/chem_property.dm

@@ -12,6 +12,8 @@
 	var/updates_stats = FALSE //should the property change other variables in the reagent when added or removed?
 	/// Should reagent with this property explode/start fire when mixed more than overdose threshold at once?
 	var/volatile = FALSE
+	/// a cost penalty is added at each level above 5 (+1 at 6, +2 at 7, +4 at 8, +5 at 9, +7 at 10)
+	var/cost_penalty = TRUE
 
 /datum/chem_property/Destroy()
 	holder = null

code/modules/reagents/chemistry_properties/prop_negative.dm

@@ -84,6 +84,7 @@
 	rarity = PROPERTY_COMMON
 	starter = TRUE
 	value = 1 //has a combat use
+	cost_penalty = FALSE
 
 /datum/chem_property/negative/corrosive/process(mob/living/M, potency = 1, delta_time)
 	..()
@@ -243,6 +244,7 @@
 	description = "Ruptures endothelial cells making up bloodvessels, causing blood to escape from the circulatory system."
 	rarity = PROPERTY_UNCOMMON
 	value = 2
+	cost_penalty = FALSE
 
 /datum/chem_property/negative/hemorrhaging/process(mob/living/M, potency = 1, delta_time)
 	if(!ishuman(M))
@@ -411,6 +413,7 @@
 	description = "Breaks down neurons causing widespread damage to the central nervous system and brain functions. Exposure may cause disorientation or unconsciousness to affected persons."
 	rarity = PROPERTY_COMMON
 	category = PROPERTY_TYPE_TOXICANT|PROPERTY_TYPE_STIMULANT
+	cost_penalty = FALSE
 
 /datum/chem_property/negative/neurotoxic/process(mob/living/M, potency = 1)
 	M.apply_damage(POTENCY_MULTIPLIER_MEDIUM * potency, BRAIN)

code/modules/reagents/chemistry_properties/prop_neutral.dm

@@ -592,6 +592,7 @@
 	rarity = PROPERTY_RARE
 	starter = FALSE
 	value = 3
+	cost_penalty = FALSE
 	var/heal_amount = 0.75
 
 /datum/chem_property/neutral/transformative/process(mob/living/M, potency = 1, delta_time)

code/modules/reagents/chemistry_properties/prop_positive.dm

@@ -28,6 +28,7 @@
 	rarity = PROPERTY_COMMON
 	starter = TRUE
 	value = 1
+	cost_penalty = FALSE
 
 /datum/chem_property/positive/anticorrosive/process(mob/living/M, potency = 1)
 	M.heal_limb_damage(0, potency)
@@ -47,6 +48,7 @@
 	rarity = PROPERTY_COMMON
 	starter = TRUE
 	value = 1
+	cost_penalty = FALSE
 
 /datum/chem_property/positive/neogenetic/process(mob/living/M, potency = 1)
 	M.heal_limb_damage(potency, 0)
@@ -167,10 +169,9 @@
 	value = 3
 
 /datum/chem_property/positive/nervestimulating/process(mob/living/M, potency = 1)
-	M.adjust_effect(potency*-1, PARALYZE)
-	M.adjust_effect(potency*-1, STUN)
-	M.adjust_effect(potency*-1, WEAKEN)
-	M.adjust_effect(-0.5*potency, STUN)
+	M.adjust_effect(potency*-0.80, PARALYZE)
+	M.adjust_effect(potency*-0.80, STUN)
+	M.adjust_effect(potency*-0.80, WEAKEN)
 	if(potency > CREATE_MAX_TIER_1)
 		M.stuttering = max(M.stuttering - POTENCY_MULTIPLIER_MEDIUM * potency, 0)
 		M.confused = max(M.confused - POTENCY_MULTIPLIER_MEDIUM * potency, 0)
@@ -199,7 +200,7 @@
 	category = PROPERTY_TYPE_STIMULANT
 
 /datum/chem_property/positive/musclestimulating/process(mob/living/M, potency = 1)
-	M.reagent_move_delay_modifier -= POTENCY_MULTIPLIER_VLOW * potency
+	M.reagent_move_delay_modifier -= 0.15 * potency
 	M.recalculate_move_delay = TRUE
 	M.nutrition = max (0, M.nutrition - 0.5 * HUNGER_FACTOR)
 	if(prob(10))
@@ -399,7 +400,7 @@
 				L.time_to_knit = 600 // 6 mins
 		if(L.time_to_knit && (L.status & LIMB_BROKEN) && L.knitting_time == -1)
 			if(!(L.status & LIMB_SPLINTED))
-				potency -= 2.5 // It'll work, but we're effectively 5 level lower.
+				potency -= 1 // It'll work, but we're effectively 2 levels lower.
 			if(potency > 0)
 				var/total_knitting_time = world.time + L.time_to_knit - min(150*potency, L.time_to_knit - 50)
 				L.knitting_time = total_knitting_time
@@ -450,6 +451,7 @@
 	description = "Causes a temporal freeze of all neurological processes and cellular respirations in the brain. This allows the brain to be preserved for long periods of time."
 	rarity = PROPERTY_UNCOMMON
 	category = PROPERTY_TYPE_REACTANT
+	cost_penalty = FALSE
 
 /datum/chem_property/positive/neurocryogenic/process(mob/living/M, potency = 1, delta_time)
 	if(prob(10 * delta_time))
@@ -548,6 +550,7 @@
 	rarity = PROPERTY_RARE
 	category = PROPERTY_TYPE_REACTANT
 	value = 3
+	cost_penalty = FALSE
 	COOLDOWN_DECLARE(ghost_notif)
 
 /datum/chem_property/positive/defibrillating/on_delete(mob/living/M)
@@ -684,6 +687,7 @@
 	rarity = PROPERTY_DISABLED
 	category = PROPERTY_TYPE_REACTANT|PROPERTY_TYPE_COMBUSTIBLE
 	value = 2
+	cost_penalty = FALSE
 
 	var/intensitymod_per_level = 0
 	var/radiusmod_per_level = 0
@@ -777,8 +781,6 @@
 	rarity = PROPERTY_COMMON
 	value = 1
 	range_per_level = 1
-	duration_per_level = -1
-	intensity_per_level = -1
 
 	intensitymod_per_level = -0.05
 	radiusmod_per_level = 0.05
@@ -835,6 +837,7 @@
 	description = "Disrupts certain neurological processes related to communication in animals."
 	rarity = PROPERTY_UNCOMMON
 	category = PROPERTY_TYPE_TOXICANT
+	cost_penalty = FALSE
 
 /datum/chem_property/positive/disrupting/process(mob/living/M, potency = 1)
 	to_chat(M, SPAN_NOTICE("Your mind feels oddly... quiet."))
@@ -857,6 +860,7 @@
 	description = "Neutralizes certain reactive chemicals and plasmas on contact. Unsafe to administer intravenously."
 	rarity = PROPERTY_UNCOMMON
 	category = PROPERTY_TYPE_IRRITANT
+	cost_penalty = FALSE
 
 /datum/chem_property/positive/neutralizing/process(mob/living/M, potency = 1)
 	M.apply_damages(0, potency, potency * POTENCY_MULTIPLIER_LOW)
@@ -992,3 +996,37 @@
 
 /datum/chem_property/positive/anticarcinogenic/process_critical(mob/living/M, potency = 1)
 	M.take_limb_damage(POTENCY_MULTIPLIER_MEDIUM * potency)//Hyperactive apoptosis
+
+/datum/chem_property/positive/regulating
+	name = PROPERTY_REGULATING
+	code = "REG"
+	description = "The chemical regulates its own metabolization, any ammount overdosed is turned into sugar."
+	rarity = PROPERTY_COMMON
+	category = PROPERTY_TYPE_METABOLITE
+	max_level = 1
+	value = 1
+
+/datum/chem_property/positive/regulating/reset_reagent()
+	holder.flags = initial(holder.flags)
+	..()
+
+/datum/chem_property/positive/regulating/update_reagent()
+	holder.flags |= REAGENT_CANNOT_OVERDOSE
+	..()
+
+/datum/chem_property/positive/firepenetrating
+	name = PROPERTY_FIRE_PENETRATING
+	code = "PTR"
+	description = "Gives the chemical a unique, anomalous combustion chemistry, causing the flame to react with flame-resistant material and obliterate through it."
+	rarity = PROPERTY_RARE
+	category = PROPERTY_TYPE_REACTANT
+	value = 8
+	max_level = 1
+
+/datum/chem_property/positive/firepenetrating/reset_reagent()
+	holder.fire_penetrating = initial(holder.fire_penetrating)
+	..()
+
+/datum/chem_property/positive/firepenetrating/update_reagent()
+	holder.fire_penetrating = TRUE
+	..()

code/modules/reagents/chemistry_properties/prop_special.dm

@@ -6,29 +6,16 @@
 /datum/chem_property/special/boosting
 	name = PROPERTY_BOOSTING
 	code = "BST"
-	description = "Boosts the potency of all other properties in this chemical when inside the body."
+	description = "Boosts the potency of all other properties in this chemical when inside the body by up to 4 levels."
 	rarity = PROPERTY_LEGENDARY
 	category = PROPERTY_TYPE_METABOLITE
+	max_level = 4
 
 /datum/chem_property/special/boosting/pre_process(mob/living/M)
+	if(level > max_level)
+		level = max_level
 	return list(REAGENT_BOOST = level)
 
-/datum/chem_property/special/regulating
-	name = PROPERTY_REGULATING
-	code = "REG"
-	description = "The chemical regulates its own metabolization and can thus never cause overdosis."
-	rarity = PROPERTY_LEGENDARY
-	category = PROPERTY_TYPE_METABOLITE
-	max_level = 1
-
-/datum/chem_property/special/regulating/reset_reagent()
-	holder.flags = initial(holder.flags)
-	..()
-
-/datum/chem_property/special/regulating/update_reagent()
-	holder.flags |= REAGENT_CANNOT_OVERDOSE
-	..()
-
 /datum/chem_property/special/hypergenetic
 	name = PROPERTY_HYPERGENETIC
 	code = "HGN"
@@ -352,20 +339,3 @@
 	holder.durationfire += 1 * level
 	holder.durationmod += 0.1 * level
 	..()
-
-/datum/chem_property/special/firepenetrating
-	name = PROPERTY_FIRE_PENETRATING
-	code = "PTR"
-	description = "Gives the chemical a unique, anomalous combustion chemistry, causing the flame to react with flame-resistant material and obliterate through it."
-	rarity = PROPERTY_LEGENDARY
-	category = PROPERTY_TYPE_REACTANT
-	value = 8
-	max_level = 1
-
-/datum/chem_property/special/firepenetrating/reset_reagent()
-	holder.fire_penetrating = initial(holder.fire_penetrating)
-	..()
-
-/datum/chem_property/special/firepenetrating/update_reagent()
-	holder.fire_penetrating = TRUE
-	..()

code/modules/reagents/chemistry_reagents/other.dm

@@ -254,7 +254,7 @@
 	color = "#484848" // rgb: 72, 72, 72
 	overdose = REAGENTS_OVERDOSE
 	chemclass = CHEM_CLASS_BASIC
-	properties = list(PROPERTY_NEUROTOXIC = 4)
+	properties = list(PROPERTY_NEUROTOXIC = 4, PROPERTY_NEUROCRYOGENIC = 1, PROPERTY_DISRUPTING = 1)
 
 /datum/reagent/sulfur
 	name = "Sulfur"
@@ -310,7 +310,7 @@
 	overdose = REAGENTS_OVERDOSE
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_BASIC
-	properties = list(PROPERTY_TOXIC = 1)
+	properties = list(PROPERTY_TOXIC = 1, PROPERTY_NEUTRALIZING = 1)
 
 /datum/reagent/sodium
 	name = "Sodium"
@@ -380,7 +380,7 @@
 	reagent_state = SOLID
 	color = "#C7C7C7" // rgb: 199,199,199
 	chemclass = CHEM_CLASS_BASIC
-	properties = list(PROPERTY_CARCINOGENIC = 2)
+	properties = list(PROPERTY_CARCINOGENIC = 2, PROPERTY_HEMORRAGING = 1)
 
 /datum/reagent/thermite
 	name = "Thermite"