woooah.

2019-05-23 23:09:32 +01:00
parent 8a8178a0b1
commit 2f7a4082ab
12 changed files with 42 additions and 25 deletions
@@ -139,5 +139,7 @@
 			H.Force_update_genitals()
 		prev_size = size

-	else if (cached_size == 16.2)
-		to_chat(owner, "<span class='warning'>Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a hefty [uppertext(size)]cm diameter bosom.</b></span>")// taking both of your hands to hold!.</b></span>")
+	else if (cached_size >= 16)
+		if(size != "huge")
+			to_chat(owner, "<span class='warning'>Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a hefty [uppertext(size)]cm diameter bosom.</b></span>")// taking both of your hands to hold!.</b></span>")
+		size = "huge"
@@ -270,7 +270,7 @@
 		dna.species.handle_genitals(src)

 /mob/living/carbon/human/proc/Force_update_genitals(mob/living/carbon/human/H) //called in fermiChem
-	dna.species.handle_genitals(src, ignoreGenitalFlags = TRUE)
+	dna.species.handle_genitals(src)
 	//dna.species.handle_breasts(src)
 	//H.update_body()
 //species_traits = list(NOTRANSSTING,NOGENITALS)
@@ -316,8 +316,7 @@
 				if(/obj/item/organ/genital/breasts)
 					S = GLOB.breasts_shapes_list[G.shape]
 					aroused_state = 0//Breasts don't have aroused_states, there's literally no difference in the spite.
-					if ((G.cached_size > 5) && (layertext == "BEHIND"))
-						size = "e" //I don't understand the BEHIND sprite honestly, so this is a way to just use the largest.
+					if(size == "huge")



@@ -850,7 +850,7 @@ Buginess level: works as intended - except teleport makes sparks for some reason
 	//M.alpha = 255//Reset addiction
 	//antiGenetics = 255// DOesn't work for some reason?
 	switch(current_cycle)
-		if(1)//Require a minimum
+		if(0)//Require a minimum
 			origin = M
 			if (G == null)
 				G = new(get_turf(M.loc))
@@ -1072,6 +1072,8 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 (thats not written yet but thats the idea.)
 */

+//TODO rewrite code so that the low purity stuff is a seperate chem for clarity.
+
 /datum/reagent/fermi/enthrall
 	name = "MKUltra"
 	id = "enthrall"
@@ -1085,6 +1087,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	var/creatorGender
 	var/creatorName
 	var/mob/living/creator
+	pH = 10

 /datum/reagent/fermi/enthrall/test
 	name = "MKUltraTest"
@@ -1305,6 +1308,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	overdose_threshold = 25
 	var/obj/item/clothing/head/hattip/hat
 	DoNotSplit = TRUE
+	pH = 4


 /datum/reagent/fermi/hatmium/on_mob_add(mob/living/carbon/human/M)
@@ -1347,6 +1351,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	InverseChemVal 		= 0
 	var/obj/item/organ/tongue/nT
 	DoNotSplit = TRUE
+	pH = 5

 /datum/reagent/fermi/furranium/on_mob_life(mob/living/carbon/M)

@@ -1404,6 +1409,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	ImpureChem 			= "naninte_b_goneTox" //If you make an inpure chem, it stalls growth
 	InverseChemVal 		= 0.25
 	InverseChem 		= "naninte_b_goneTox" //At really impure vols, it just becomes 100% inverse
+	pH = 9

 /datum/reagent/fermi/naninte_b_gone/on_mob_life(mob/living/carbon/C)
 	//var/component/nanites/N = M.GetComponent(/datum/component/nanites)
@@ -1453,6 +1459,7 @@ 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."
+	pH = 0

 /datum/reagent/fermi/fermiAcid/on_mob_life(mob/living/carbon/C, method)
 	var/target = C.get_bodypart(BODY_ZONE_CHEST)
@@ -1490,7 +1497,7 @@ And as stated earlier, this chem is hard to make, and is punishing on failure. Y
 	//data = list("Big bang" = 1, "please work" = 2)
 	addProc = TRUE

-/datum/reagent/fermi/fermiTest/on_new()
+/datum/reagent/fermi/fermiTest/on_new(datum/reagents/holder)
 	..()
 	if(LAZYLEN(holder.reagent_list) == 1)
 		return
@@ -72,7 +72,7 @@
 	id = "eigenstate"
 	results = list("eigenstate" = 0.1)
 	required_reagents = list("bluespace" = 0.1, "stable_plasma" = 0.1, "sugar" = 0.1)
-	mix_message = "zaps brightly into existance, diffusing the energy from the localised gravity well as light"
+	mix_message = "the reaction zaps suddenly!"
 	//FermiChem vars:
 	OptimalTempMin = 350 // Lower area of bell curve for determining heat based rate reactions
 	OptimalTempMax = 500 // Upper end for above
@@ -229,14 +229,14 @@
 	OptimalTempMin 			= 780
 	OptimalTempMax			= 800
 	ExplodeTemp 			= 820
-	OptimalpHMin 			= 1
-	OptimalpHMax 			= 2
+	OptimalpHMin 			= 12
+	OptimalpHMax 			= 13
 	ReactpHLim 				= 2
 	//CatalystFact 			= 0
 	CurveSharpT 			= 0.5
 	CurveSharppH 			= 4
 	ThermicConstant 		= 20
-	HIonRelease 			= 0.1
+	HIonRelease 			= -0.1
 	RateUpLim 				= 5
 	FermiChem				= TRUE
 	FermiExplode 			= TRUE
@@ -248,7 +248,7 @@
 	message_admins("On finish for enthral proc'd")
 	var/datum/reagent/blood/B = locate(/datum/reagent/blood) in my_atom.reagents.reagent_list
 	var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
-	if(!B.data)
+	if(!B)
 		var/list/seen = viewers(5, get_turf(my_atom))
 		for(var/mob/M in seen)
 			to_chat(M, "<span class='warning'>The reaction splutters and fails to react.</span>")
@@ -20,6 +20,8 @@
 			numberOfPages--
 			playsound(user.loc, 'sound/items/poster_ripped.ogg', 50, 1)
 			add_fingerprint(user)
+            if(numberOfPages == 0)
+                icon_state = "pHbookletEmpty"
 			return
 		else
 			to_chat(user, "<span class='warning'>[src] is empty!</span>")