Almost done. Just need to update reagent vars.

2019-05-14 21:20:38 +01:00
parent 76aec5a5ed
commit 0d907db516
8 changed files with 86 additions and 21 deletions
@@ -8,9 +8,12 @@
 //Naninte chem

 /datum/reagent/fermi
-	name = "Fermi"
-	id = "fermi"
-	taste_description = "If affection had a taste, this would be it."
+	name = "Fermi" 	//Why did I putthis here?
+	id = "fermi"	//It's meeee
+	taste_description	= "If affection had a taste, this would be it."
+	var/ImpureChem 			= "toxin"			// What chemical is metabolised with an inpure reaction
+	var/InverseChemVal 		= 0					// If the impurity is below 0.5, replace ALL of the chem with InverseChem upon metabolising
+	var/InverseChem 		= "Initropidril" 	// What chem is metabolised when purity is below InverseChemVal

 ///datum/reagent/fermi/on_mob_life(mob/living/carbon/M)
 	//current_cycle++
@@ -22,15 +25,15 @@
 /datum/reagent/fermi/on_mob_add(mob/living/carbon/M)
 	if (src.purity == 1)
 		return
-	if (CR.InverseChemVal > src.purity)
+	else if (src.InverseChemVal > src.purity)
 		holder.remove_reagent(src.id, volume, FALSE)
-		holder.add_reagent(CR.InverseChem)
+		holder.add_reagent(src.InverseChem)
 		return
 	else
 		var/pureVol = volume * purity
 		var/impureVol = volume * (1 - pureVol)
 		holder.remove_reagent(src.id, (volume*impureVol), FALSE)
-		holder.add_reagent(CR.ImpureChem, impureVol, FALSE)
+		holder.add_reagent(src.ImpureChem, impureVol, FALSE)



@@ -21,7 +21,6 @@
 	RateUpLim = 5 //Optimal/max rate possible if all conditions are perfect
 	FermiChem = TRUE//If the chemical uses the Fermichem reaction mechanics
 	FermiExplode = FALSE //If the chemical explodes in a special way
-	ImpureChem = "toxin" //What chemical is produced with an inpure reaction

 /datum/chemical_reaction/eigenstate/on_reaction(datum/reagents/holder)
 	var/location = get_turf(holder.my_atom)
@@ -50,9 +49,6 @@
 	RateUpLim 			= 5 		// Optimal/max rate possible if all conditions are perfect
 	FermiChem 			= TRUE		// If the chemical uses the Fermichem reaction mechanics
 	FermiExplode 		= FALSE		// If the chemical explodes in a special way
-	ImpureChem 			= "SDGFTox"	// What chemical is metabolised with an inpure reaction
-	InverseChemVal 		= 0.5 		// If the impurity is below 0.5, replace ALL of the chem with InverseChem upon metabolising
-	InverseChem 		= "SDZF" 	// What chem is metabolised when purity is below InverseChemVal

 /datum/chemical_reaction/BElarger
 	name = ""
@@ -119,9 +115,6 @@
 	RateUpLim 			= 5 		// Optimal/max rate possible if all conditions are perfect
 	FermiChem 			= TRUE		// If the chemical uses the Fermichem reaction mechanics
 	FermiExplode 		= FALSE		// If the chemical explodes in a special way
-	//ImpureChem 			= "SDGFTox"	// What chemical is metabolised with an inpure reaction
-	//InverseChemVal 		= 0.5 		// If the impurity is below 0.5, replace ALL of the chem with InverseChem upon metabolising
-	//InverseChem 		= "SDZF" 	// What chem is metabolised when purity is below InverseChemVal


 /datum/chemical_reaction/enthral/on_reaction(datum/reagents/holder)
@@ -0,0 +1,27 @@
+//Fermiclothes!
+//Clothes made from FermiChem
+
+/obj/item/clothing/head/hattip	//I wonder if anyone else has played cryptworlds
+	name = "Sythetic hat"
+	icon = 'icons/obj/clothing/hats.dmi'
+	icon_state = "cowboy"
+	desc = "A sythesized hat, you can't seem to take it off. And tips their hat."
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	item_flags = NODROP //Tips their hat!
+
+/obj/item/clothing/head/hattip/attack_hand(mob/user)
+	if(iscarbon(user))
+		var/mob/living/carbon/C = user
+		if(src == C.head)
+			C.emote("me",1,"tips their hat.",TRUE)
+			return
+	else
+		user.emote("me",1,"admires such a spiffy hat.",TRUE)
+	return ..()
+
+/obj/item/clothing/head/hattip/speechModification(message)
+	if(prob(0.01))
+		message += "\" and tips their hat. \"Spy's sappin' my Sentry!"
+		return message
+	message += "\" and tips their hat. \"[pick("Yeehaw!", "Boy howdy.", "Darn tootin'.", "Well don't that beat all.", "Whoooowee, would ya look at that!", "Whoooowee! Makin' bacon!", "Cream Gravy!", "Yippekeeyah-heeyapeeah-kayoh!", "Move 'em out!", "Giddy up!")]"
+	return message
@@ -0,0 +1,67 @@
+/obj/item/pHbooklet
+    name = "pH indicator booklet"
+    desc = "A piece of paper that will change colour depending on the pH of what it's added to."
+    icon_state = "pHbooklet"
+    icon = 'modular_citadel/icons/obj/FermiChem.dmi'
+    item_flags = NOBLUDGEON
+    var/numberOfPages = 100
+
+/obj/item/pHbooklet/attack_hand(mob/user)
+	if(numberOfPages >= 1)
+		var/obj/item/pHpaper/P = new /obj/item/pHpaper
+		//P.add_fingerprint(user)
+		P.forceMove(user.loc)
+		user.put_in_hands(P)
+		to_chat(user, "<span class='notice'>You take [P] out of \the [src].</span>")
+		numberOfPages--
+	else
+		to_chat(user, "<span class='warning'>[src] is empty!</span>")
+	add_fingerprint(user)
+	return ..()
+
+/obj/item/pHpaper
+    name = "pH indicator strip"
+    desc = "A piece of paper that will change colour depending on the pH of a solution."
+    icon_state = "pHpaper"
+    icon = 'modular_citadel/icons/obj/FermiChem.dmi'
+    item_flags = NOBLUDGEON
+    color = "#f5c352"
+    var/used = FALSE
+
+/obj/item/pHpaper/attack_hand(mob/user, obj/I)
+	if(!I.reagents.pH)
+		return
+	if(used == TRUE)
+		to_chat(user, "<span class='warning'>[src] has already been used!</span>")
+		return
+	switch(I.reagents.pH)
+		if(14 to INFINITY)
+			src.color = "#462c83"
+		if(13 to 14)
+			src.color = "#63459b"
+		if(12 to 13)
+			src.color = "#5a51a2"
+		if(11 to 12)
+			src.color = "#3853a4"
+		if(10 to 11)
+			src.color = "#3f93cf"
+		if(9 to 10)
+			src.color = "#0bb9b7"
+		if(8 to 9)
+			src.color = "#23b36e"
+		if(7 to 8)
+			src.color = "#3aa651"
+		if(6 to 7)
+			src.color = "#4cb849"
+		if(5 to 6)
+			src.color = "#b5d335"
+		if(4 to 5)
+			src.color = "#b5d333"
+		if(3 to 4)
+			src.color = "#f7ec1e"
+		if(2 to 3)
+			src.color = "#fbc314"
+		if(1 to 2)
+			src.color = "#f26724"
+		if(0 to 1)
+			src.color = "#ef1d26"