TO TEST - also needs #9099 merging.

2019-09-19 17:52:45 +01:00
parent 2c70bd097c
commit 7ef5ab0332
9 changed files with 47 additions and 23 deletions
@@ -136,7 +136,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	color = "#660015" // rgb: , 0, 255
 	taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
 	overdose_threshold = 100 //If this is too easy to get 100u of this, then double it please.
-	DoNotSplit = TRUE
+	reagentFlags = REAGENT_DONOTSPLIT
 	metabolization_rate = 0.1//It has to be slow, so there's time for the effect.
 	data = list("creatorID" = null, "creatorGender" = null, "creatorName" = null)
 	var/creatorID  //ckey
@@ -144,7 +144,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
-	OnMobMergeCheck = TRUE //Procs on_mob_add when merging into a human
+	reagentFlags = REAGENT_ONMOBMERGE //Procs on_mob_add when merging into a human
 	can_synth = FALSE


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

 /datum/reagent/fermi/enthrall/test/on_new()
 	id = "enthrall"
@@ -300,13 +300,13 @@ Creating a chem with a low purity will make you permanently fall in love with so

 //Creates a gas cloud when the reaction blows up, causing everyone in it to fall in love with someone/something while it's in their system.
 /datum/reagent/fermi/enthrallExplo//Created in a gas cloud when it explodes
-	name = "MKUltra"
+	name = "Gaseous MKUltra"
 	id = "enthrallExplo"
 	description = "A forbidden deep red mixture that overwhelms a foreign body with waves of desire, inducing a chemial love for another. Also, how the HECC did you get this?"
 	color = "#2C051A" // rgb: , 0, 255
 	metabolization_rate = 0.1
 	taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses."
-	DoNotSplit = TRUE
+	reagentFlags = REAGENT_DONOTSPLIT
 	can_synth = FALSE
 	var/mob/living/carbon/love

@@ -300,6 +300,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 	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
+	reagentFlags = 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)
 	M.blood_volume -= 10
@@ -14,7 +14,7 @@
 		return
 	if(purity < 0)
 		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
-	if (purity == 1 || DoNotSplit == TRUE)
+	if (purity == 1 || (reagentFlags & REAGENT_DONOTSPLIT))
 		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [id]")
 		return
 	else if (InverseChemVal > purity)//Turns all of a added reagent into the inverse chem
@@ -22,7 +22,7 @@
 		M.reagents.add_reagent(InverseChem, amount, FALSE, other_purity = 1)
 		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [InverseChem]")
 		return
-	else
+	else if(!(reagentFlags & REAGENT_ONLYINVERSE))
 		var/impureVol = amount * (1 - purity) //turns impure ratio into impure chem
 		M.reagents.remove_reagent(id, (impureVol), FALSE)
 		M.reagents.add_reagent(ImpureChem, impureVol, FALSE, other_purity = 1)
@@ -37,7 +37,7 @@
 		return
 	if (purity < 0)
 		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
-	if (purity == 1 || DoNotSplit == TRUE)
+	if (purity == 1 || (reagentFlags & REAGENT_DONOTSPLIT))
 		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume]u of [id] in themselves")
 		return
 	else if (InverseChemVal > purity)
@@ -48,7 +48,7 @@
 				R.name = name//Negative effects are hidden
 		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume]u of [InverseChem]")
 		return
-	else
+	else if(!(reagentFlags & REAGENT_ONLYINVERSE))
 		var/impureVol = amount * (1 - purity)
 		M.reagents.remove_reagent(id, impureVol, FALSE)
 		M.reagents.add_reagent(ImpureChem, impureVol, FALSE, other_purity = 1)
@@ -77,7 +77,7 @@
 	taste_description = "like jerky, whiskey and an off aftertaste of a crypt."
 	metabolization_rate = 0.2
 	overdose_threshold = 25
-	DoNotSplit = TRUE
+	reagentFlags = REAGENT_DONOTSPLIT
 	pH = 4
 	can_synth = TRUE

@@ -124,7 +124,7 @@
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	InverseChemVal 		= 0
 	var/obj/item/organ/tongue/nT
-	DoNotSplit = TRUE
+	reagentFlags = REAGENT_DONOTSPLIT
 	pH = 5
 	var/obj/item/organ/tongue/T
 	can_synth = TRUE
@@ -250,6 +250,7 @@
 	id = "nanite_b_goneTox"
 	description = "Poorly made, and shocks you!"
 	metabolization_rate = 1
+	reagentFlags = 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)
@@ -315,7 +316,7 @@
 	name = "Fermis Test Reagent"
 	id = "fermiTest"
 	description = "You should be really careful with this...! Also, how did you get this?"
-	addProc = TRUE
+	reagentFlags = REAGENT_FORCEONNEW
 	can_synth = FALSE

 /datum/reagent/fermi/fermiTest/on_new(datum/reagents/holder)
@@ -353,6 +354,7 @@
 	data = "merge"
 	color = "FFFFFF"
 	can_synth = FALSE
+	reagentFlags = 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)
@@ -80,6 +80,7 @@
 	taste_description = "a weird, syrupy flavour, yamero"
 	color = "#68e83a"
 	pH = 8.6
+	reagentFlags = REAGENT_INVISIBLE

 /datum/reagent/fermi/yamerol_tox/on_mob_life(mob/living/carbon/C)
 	var/obj/item/organ/tongue/T = C.getorganslot(ORGAN_SLOT_TONGUE)