reagent_flags is used elsewhere, renamed to chemical_flags

2019-09-20 19:43:37 +01:00
parent 74cc70ed72
commit 9b2f67d67d
15 changed files with 144 additions and 120 deletions
@@ -143,7 +143,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	var/creatorName
 	var/mob/living/creator
 	pH = 10
-	reagent_flags = REAGENT_ONMOBMERGE | REAGENT_DONOTSPLIT //Procs on_mob_add when merging into a human
+	chemical_flags = REAGENT_ONMOBMERGE | REAGENT_DONOTSPLIT //Procs on_mob_add when merging into a human
 	can_synth = FALSE


@@ -156,7 +156,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	creatorGender = "Mistress"
 	creatorName = "Fermis Yakumo"
 	purity = 1
-	reagent_flags = REAGENT_DONOTSPLIT

 /datum/reagent/fermi/enthrall/test/on_new()
 	id = "enthrall"
@@ -305,7 +304,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	color = "#2C051A" // rgb: , 0, 255
 	metabolization_rate = 0.1
 	taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses."
-	reagent_flags = REAGENT_DONOTSPLIT
+	chemical_flags = REAGENT_DONOTSPLIT
 	can_synth = FALSE
 	var/mob/living/carbon/love

@@ -294,21 +294,21 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	..()

 //Unobtainable, used if SDGF is impure but not too impure
-/datum/reagent/fermi/SDGFtox
+/datum/reagent/impure/SDGFtox
 	name = "synthetic-derived growth factor"
 	id = "SDGFtox"
 	description = "A chem that makes a certain chemcat angry at you if you're reading this, how did you get this???"//i.e. tell me please, figure it's a good way to get pinged for bugfixes.
 	metabolization_rate = 1
 	can_synth = FALSE
-	reagent_flags = REAGENT_INVISIBLE
+	chemical_flags = REAGENT_INVISIBLE

-/datum/reagent/fermi/SDGFtox/on_mob_life(mob/living/carbon/M)//Damages the taker if their purity is low. Extended use of impure chemicals will make the original die. (thus can't be spammed unless you've very good)
+/datum/reagent/impure/SDGFtox/on_mob_life(mob/living/carbon/M)//Damages the taker if their purity is low. Extended use of impure chemicals will make the original die. (thus can't be spammed unless you've very good)
 	M.blood_volume -= 10
 	M.adjustCloneLoss(2, 0)
 	..()

 //Fail state of SDGF
-/datum/reagent/fermi/SDZF
+/datum/reagent/impure/SDZF
 	name = "synthetic-derived growth factor"
 	id = "SDZF"
 	description = "A horribly peverse mass of Embryonic stem cells made real by the hands of a failed chemist. This message should never appear, how did you manage to get a hold of this?"
@@ -316,9 +316,9 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	var/startHunger
 	can_synth = TRUE
-	reagent_flags = REAGENT_SNEAKYNAME
+	chemical_flags = REAGENT_SNEAKYNAME

-/datum/reagent/fermi/SDZF/on_mob_life(mob/living/carbon/M) //If you're bad at fermichem, turns your clone into a zombie instead.
+/datum/reagent/impure/SDZF/on_mob_life(mob/living/carbon/M) //If you're bad at fermichem, turns your clone into a zombie instead.
 	switch(current_cycle)//Pretends to be normal
 		if(20)
 			to_chat(M, "<span class='notice'>You feel the synethic cells rest uncomfortably within your body as they start to pulse and grow rapidly.</span>")
@@ -9,7 +9,7 @@
 	//SplitChem = TRUE
 	impure_chem 			= "fermiTox"// What chemical is metabolised with an inpure reaction
 	inverse_chem_val 		= 0.25		// If the impurity is below 0.5, replace ALL of the chem with inverse_chemupon metabolising
-	inverse_chem		= "fermiTox"
+	inverse_chem			= "fermiTox"

 //This should process fermichems to find out how pure they are and what effect to do.
 /datum/reagent/fermi/on_mob_add(mob/living/carbon/M, amount)
@@ -39,7 +39,7 @@
 	taste_description = "like jerky, whiskey and an off aftertaste of a crypt."
 	metabolization_rate = 0.2
 	overdose_threshold = 25
-	reagent_flags = REAGENT_DONOTSPLIT
+	chemical_flags = REAGENT_DONOTSPLIT
 	pH = 4
 	can_synth = TRUE

@@ -86,7 +86,7 @@
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	inverse_chem_val 		= 0
 	var/obj/item/organ/tongue/nT
-	reagent_flags = REAGENT_DONOTSPLIT
+	chemical_flags = REAGENT_DONOTSPLIT
 	pH = 5
 	var/obj/item/organ/tongue/T
 	can_synth = TRUE
@@ -212,7 +212,7 @@
 	id = "nanite_b_goneTox"
 	description = "Poorly made, and shocks you!"
 	metabolization_rate = 1
-	reagent_flags = REAGENT_INVISIBLE
+	chemical_flags = REAGENT_INVISIBLE

 //Increases shock events.
 /datum/reagent/fermi/nanite_b_goneTox/on_mob_life(mob/living/carbon/C)//Damages the taker if their purity is low. Extended use of impure chemicals will make the original die. (thus can't be spammed unless you've very good)
@@ -278,7 +278,7 @@
 	name = "Fermis Test Reagent"
 	id = "fermiTest"
 	description = "You should be really careful with this...! Also, how did you get this?"
-	reagent_flags = REAGENT_FORCEONNEW
+	chemical_flags = REAGENT_FORCEONNEW
 	can_synth = FALSE

 /datum/reagent/fermi/fermiTest/on_new(datum/reagents/holder)
@@ -309,23 +309,6 @@
 		playsound(get_turf(M), 'modular_citadel/sound/voice/merowr.ogg', 50, 1)
 	holder.clear_reagents()

-/datum/reagent/fermi/fermiTox
-	name = "FermiTox"
-	id = "fermiTox"
-	description = "You should be really careful with this...! Also, how did you get this? You shouldn't have this!"
-	data = "merge"
-	color = "FFFFFF"
-	can_synth = FALSE
-	reagent_flags = REAGENT_INVISIBLE
-
-//I'm concerned this is too weak, but I also don't want deathmixes.
-/datum/reagent/fermi/fermiTox/on_mob_life(mob/living/carbon/C, method)
-	if(C.dna && istype(C.dna.species, /datum/species/jelly))
-		C.adjustToxLoss(-2)
-	else
-		C.adjustToxLoss(2)
-	..()
-
 /datum/reagent/fermi/acidic_buffer
 	name = "Acidic buffer"
 	id = "acidic_buffer"
@@ -73,16 +73,15 @@
 	C.adjustOxyLoss(-3)
 	..()

-/datum/reagent/fermi/yamerol_tox
+/datum/reagent/impure/yamerol_tox
 	name = "Yamerol"
 	id = "yamerol_tox"
 	description = "For when you've trouble speaking or breathing, just yell YAMEROL! A chem that helps soothe any congestion problems and at high concentrations restores damaged lungs and tongues!"
 	taste_description = "a weird, syrupy flavour, yamero"
 	color = "#68e83a"
 	pH = 8.6
-	reagent_flags = REAGENT_INVISIBLE

-/datum/reagent/fermi/yamerol_tox/on_mob_life(mob/living/carbon/C)
+/datum/reagent/impure/yamerol_tox/on_mob_life(mob/living/carbon/C)
 	var/obj/item/organ/tongue/T = C.getorganslot(ORGAN_SLOT_TONGUE)
 	var/obj/item/organ/lungs/L = C.getorganslot(ORGAN_SLOT_LUNGS)

@@ -6,7 +6,7 @@
 	return

 //Called when reaction STOP_PROCESSING
-/datum/chemical_reaction/proc/FermiFinish(datum/reagents/holder, var/atom/my_atom)
+/datum/chemical_reaction/proc/FermiFinish(datum/reagents/holder, var/atom/my_atom, reactVol)
 	if(clear_conversion == REACTION_CLEAR_IMPURE | REACTION_CLEAR_INVERSE)
 		for(var/id in results)
 			var/datum/reagent/R = my_atom.reagents.has_reagent("[id]")
@@ -23,6 +23,8 @@
 				var/impureVol = cached_volume * (1 - R.purity)
 				my_atom.reagents.remove_reagent(R.id, (impureVol), FALSE)
 				my_atom.reagents.add_reagent(R.impure_chem, impureVol, FALSE, other_purity = 1)
+				R.cached_purity = R.purity
+				R.purity = 1
 	return

 //Called when temperature is above a certain threshold, or if purity is too low.