Merge branch 'master' into FERMICHEMCurTweaks

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -447,4 +447,8 @@ datum/gear/darksabresheath
 	path = /obj/item/clothing/head/blueberet
 	ckeywhitelist = list("foxystalin")
 
-
+/datum/gear/donorgoggles
+	name = "Flight Goggles"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/glasses/flight
+	ckeywhitelist = list("maxlynchy")

modular_citadel/code/modules/custom_loadout/custom_items.dm

@@ -493,3 +493,12 @@
 	item_state = "blueberet"
 	icon = 'icons/obj/custom.dmi'
 	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+
+/obj/item/clothing/glasses/flight
+	name = "flight goggles"
+	desc = "Old style flight goggles with a leather cap attached."
+	icon_state = "flight-g"
+	item_state = "flight-g"
+	icon = 'icons/obj/custom.dmi'
+	alternate_worn_icon = 'icons/mob/custom_w.dmi'
+	actions_types = list(/datum/action/item_action/toggle)

modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm

@@ -338,7 +338,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 		return ..()
 	data = datapH
 	if(LAZYLEN(holder.reagent_list) == 1)
-		return
+		return ..()
 	holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume))
 	var/list/seen = viewers(5, get_turf(holder))
 	for(var/mob/M in seen)
@@ -360,7 +360,7 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 		return ..()
 	data = datapH
 	if(LAZYLEN(holder.reagent_list) == 1)
-		return
+		return ..()
 	holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume))
 	var/list/seen = viewers(5, get_turf(holder))
 	for(var/mob/M in seen)

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -432,8 +432,8 @@
 	OptimalTempMin 	= 250
 	OptimalTempMax 	= 500
 	ExplodeTemp 	= 9999 //check to see overflow doesn't happen!
-	OptimalpHMin 	= 2
-	OptimalpHMax 	= 6
+	OptimalpHMin 	= 0
+	OptimalpHMax 	= 14
 	ReactpHLim 		= 0
 	//CatalystFact 	= 0 //To do 1
 	CurveSharpT 	= 4
@@ -454,14 +454,14 @@
 	name = "Ethyl Ethanoate buffer"
 	id = "basic_buffer"
 	results = list("basic_buffer" = 1.5)
-	required_reagents = list("acidic_buffer" = 0.5, "ethanol" = 0.5, "water" = 0.5)
+	required_reagents = list("lye" = 0.3, "ethanol" = 0.6, "water" = 0.6)
 	required_catalysts = list("sacid" = 1) //vagely acetic
 	//FermiChem vars:x
 	OptimalTempMin 	= 250
 	OptimalTempMax 	= 500
 	ExplodeTemp 	= 9999 //check to see overflow doesn't happen!
-	OptimalpHMin 	= 5
-	OptimalpHMax 	= 12
+	OptimalpHMin 	= 0
+	OptimalpHMax 	= 14
 	ReactpHLim 		= 0
 	//CatalystFact 	= 0 //To do 1
 	CurveSharpT 	= 4