Prebed tweaks

2019-05-26 05:34:28 +01:00
parent 91f10442cf
commit bd85095590
7 changed files with 86 additions and 62 deletions
@@ -60,7 +60,7 @@
 			desc += " They're very small and flatchested, however."
 		else
 			desc += " You estimate that they're [uppertext(size)]-cups."
-			string = "breasts_[lowertext(shape)]_[size]-s"
+			//string = "breasts_[lowertext(shape)]_[size]-s"

 	if(producing && aroused_state)
 		desc += " They're leaking [fluid_id]."
@@ -122,7 +122,7 @@
 	addiction_stage2_end = 30
 	addiction_stage3_end = 41
 	addiction_stage4_end = 44 //Incase it's too long
-	var/location_created
+	var/turf/open/location_created
 	var/turf/open/location_return = null
 	var/addictCyc1 = 0
 	var/addictCyc2 = 0
@@ -1185,6 +1185,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y


 /datum/reagent/fermi/enthrall/on_mob_life(mob/living/carbon/M)
+	. = ..()
 	if(purity < 0.5)//DO NOT SPLIT INTO DIFFERENT CHEM: This relies on DoNotSplit - has to be done this way.
 		if (M.ckey == creatorID && creatorName == M.real_name)//If the creator drinks it, they fall in love randomly. If someone else drinks it, the creator falls in love with them.
 			if(M.has_status_effect(STATUS_EFFECT_INLOVE))
@@ -1287,7 +1288,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 		if(!love)
 			return
 		M.apply_status_effect(STATUS_EFFECT_INLOVE, love)
-		to_chat(M, "<span class='notice'>You develop deep feelings for [love], your heart beginning to race as you look upon them with new eyes.</span>")
+		to_chat(M, "<span class='notice'>You develop overwhelmingly deep feelings for [love], your heart beginning to race as you look upon them with new eyes. You are determined to keep them safe above all other priorities.</span>")
 	else
 		if(get_dist(M, love) < 8)
 			if(M.has_trait(TRAIT_NYMPHO)) //Add this back when merged/updated.
@@ -1504,7 +1505,8 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	name = "Acid vapour"
 	id = "fermiAcid"
 	description = "Someone didn't do like an otter, and add acid to water."
-	taste_description = "acid burns, ow!!"
+	taste_description = "acid burns, ow"
+	color = "#000000"
 	pH = 0

 /datum/reagent/fermi/fermiAcid/on_mob_life(mob/living/carbon/C, method)
@@ -1577,6 +1579,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	id = "fermiTox"
 	description = "You should be really careful with this...! Also, how did you get this?"
 	data = "merge"
+	color = "#000000"

 /datum/reagent/fermi/fermiTox/on_mob_life(mob/living/carbon/C, method)
 	if(C.dna && istype(C.dna.species, /datum/species/jelly))
@@ -1592,10 +1595,11 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	taste_description = "an acidy sort of taste, blech."
 	color = "#fbc314"
 	addProc = FALSE
-	pH = 3
+	pH = 6

-/datum/reagent/fermi/fermiABuffer/on_new()
+/datum/reagent/fermi/fermiABuffer/on_new(oldpH)
 	if(LAZYLEN(holder.reagent_list) == 1)
+
 		return
 	pH = ((holder.pH * holder.total_volume)+(pH * src.volume))/(holder.total_volume + src.volume)
 	holder.remove_reagent(src.id, 1000)
@@ -1608,7 +1612,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	taste_description = "an soapy sort of taste, blech."
 	color = "#3853a4"
 	addProc = FALSE
-	pH = 11
+	pH = 8

 /datum/reagent/fermi/fermiBBuffer/on_new()
 	if(LAZYLEN(holder.reagent_list) == 1)
@@ -30,8 +30,9 @@
 		pHmod = 2

 	for (var/datum/reagent/reagent in my_atom.reagents.reagent_list) //make gas for reagents
-		if (istype(reagent, /datum/reagent/fermi))
+		/*if (istype(reagent, /datum/reagent/fermi))
 			continue //Don't allow fermichems into the mix (fermi explosions are handled elsewhere and it's a huge pain)
+		*/
 		R.add_reagent(reagent, reagent.volume)
 		if (reagent.purity < 0.6)
 			ImpureTot = (ImpureTot + (1-reagent.purity)) / 2
@@ -114,11 +115,11 @@
 	CurveSharpT 		= 4 		// How sharp the temperature exponential curve is (to the power of value)
 	CurveSharppH 		= 4 		// How sharp the pH exponential curve is (to the power of value)
 	ThermicConstant		= -5 		// Temperature change per 1u produced
-	HIonRelease 		= 0.05 		// pH change per 1u reaction
-	RateUpLim 			= 2 		// Optimal/max rate possible if all conditions are perfect
+	HIonRelease 		= 0.05 		// pH change per 1u reaction (inverse for some reason)
+	RateUpLim 			= 3 		// Optimal/max rate possible if all conditions are perfect
 	FermiChem 			= TRUE		// If the chemical uses the Fermichem reaction mechanics
 	FermiExplode 		= TRUE		// If the chemical explodes in a special way
-	PurityMin 			= 0.25
+	PurityMin 			= 0.2

 /datum/chemical_reaction/fermi/SDGF/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)//Spawns an angery teratoma!! Spooky..! be careful!! TODO: Add teratoma slime subspecies
 	var/turf/T = get_turf(my_atom)
@@ -201,8 +202,8 @@
 /datum/chemical_reaction/fermi/astral //done //BORKEN
 	name = "Astrogen"
 	id = "astral"
-	results = list("astral" = 5)
-	required_reagents = list("eigenstate" = 1, "plasma" = 1, "synaptizine" = 1, "aluminium" = 5)
+	results = list("astral" = 0.5)
+	required_reagents = list("eigenstate" = 0.1, "plasma" = 0.1, "synaptizine" = 0.1, "aluminium" = 0.5)
 	//FermiChem vars:
 	OptimalTempMin 			= 700
 	OptimalTempMax			= 800
@@ -328,7 +329,7 @@
 	CurveSharppH 	= 0.5
 	ThermicConstant = -10
 	HIonRelease 	= -0.1
-	RateUpLim 		= 2
+	RateUpLim 		= 10
 	FermiChem 		= TRUE
 	PurityMin		= 0.30

@@ -379,11 +380,15 @@
 	RateUpLim 		= 20
 	FermiChem 		= TRUE

-//This reaction bugs and turns everything in it to FermiABuffer - but now it's a feature instead!
+//This reaction bugs and turns everything in it to FermiABuffer - but now it's a feature instead! And then I fixed it anyways
 /datum/chemical_reaction/fermi/fermiABuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
 	var/datum/reagent/fermi/fermiABuffer/Fa = locate(/datum/reagent/fermi/fermiABuffer) in my_atom.reagents.reagent_list
+	if (Fa.pH <= 3)
+		Fa.pH = 3
+		Fa.data = 3
+		return
 	Fa.pH = my_atom.reagents.pH
-	Fa.data = "merge"
+	Fa.data = Fa.pH

 /datum/chemical_reaction/fermi/fermiBBuffer//done test
 	name = "Ethyl Ethanoate buffer"
@@ -406,8 +411,12 @@
 	RateUpLim 		= 15
 	FermiChem 		= TRUE

-//This reaction bugs and turns everything in it to FermiBBuffer - but now it's a feature instead!
+//This reaction bugs and turns everything in it to FermiBBuffer - but now it's a feature instead! And then I fixed it anyways
 /datum/chemical_reaction/fermi/fermiBBuffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
 	var/datum/reagent/fermi/fermiBBuffer/Fb = locate(/datum/reagent/fermi/fermiBBuffer) in my_atom.reagents.reagent_list
+	if (Fb.pH >= 11)
+		Fb.pH = 11
+		Fb.data = 11
+		return
 	Fb.pH = my_atom.reagents.pH
-	Fb.data = "merge"
+	Fb.data = Fb.pH