+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.

code/modules/food_and_drinks/food/snacks_vend.dm

@@ -7,7 +7,7 @@
 	desc = "Nougat love it or hate it."
 	icon_state = "candy"
 	trash = /obj/item/trash/candy
-	list_reagents = list("nutriment" = 1, "sugar" = 3)
+	list_reagents = list("nutriment" = 1, "sugar" = 3, "cocoa" = 3)
 	junkiness = 25
 	filling_color = "#D2691E"
 	tastes = list("candy" = 1)

code/modules/mob/living/carbon/human/species.dm

@@ -295,8 +295,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			A.cure(FALSE)
 
 	SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
-
-	C.lewd = C.client.prefs.lewdchem
+	if(C.client)
+		C.lewd = C.client.prefs.lewdchem
 
 //CITADEL EDIT
 	if(NOAROUSAL in species_traits)

code/modules/mob/living/living.dm

@@ -281,7 +281,7 @@
 				var/datum/disease/D = thing
 				if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
 					ContactContractDisease(D)
-					
+
 			if(iscarbon(L))
 				var/mob/living/carbon/C = L
 				if(HAS_TRAIT(src, TRAIT_STRONG_GRABBER))
@@ -329,6 +329,7 @@
 			to_chat(src, "<span class='notice'>You have given up life and succumbed to death.</span>")
 		death()
 
+
 /mob/living/incapacitated(ignore_restraints, ignore_grab)
 	if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here
 		return TRUE

code/modules/reagents/chemistry/holder.dm

@@ -544,7 +544,7 @@
 	for(var/B in cached_required_reagents) //
 		multiplier = min(multiplier, round((get_reagent_amount(B) / cached_required_reagents[B]), 0.001))
 	if (multiplier == 0)
-		fermiEnd(multiplier)
+		fermiEnd()
 		return
 	for(var/P in cached_results)
 		targetVol = cached_results[P]*multiplier
@@ -557,16 +557,16 @@
 			if (reactedVol < targetVol)
 				reactedVol = fermiReact(fermiReactID, chem_temp, pH, reactedVol, targetVol, cached_required_reagents, cached_results, multiplier)
 			else//Volume is used up
-				fermiEnd(multiplier)
+				fermiEnd()
 				return
 		else//pH is out of range
-			fermiEnd(multiplier)
+			fermiEnd()
 			return
 	else//Temperature is too low, or reaction has stopped.
-		fermiEnd(multiplier)
+		fermiEnd()
 		return
 
-/datum/reagents/proc/fermiEnd(multiplier)
+/datum/reagents/proc/fermiEnd()
 	var/datum/chemical_reaction/fermi/C = fermiReactID
 	STOP_PROCESSING(SSprocessing, src)
 	fermiIsReacting = FALSE
@@ -576,7 +576,7 @@
 	if(istype(my_atom, /obj/item/reagent_containers))
 		var/obj/item/reagent_containers/RC = my_atom
 		RC.pH_check()
-	C.FermiFinish(src, my_atom, multiplier)
+	C.FermiFinish(src, my_atom)
 	handle_reactions()
 	update_total()
 	//Reaction sounds and words

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -182,11 +182,13 @@
 				var/id = params["id"]
 				var/amount = text2num(params["amount"])
 				if (amount > 0)
+					end_fermi_reaction()
 					beaker.reagents.trans_id_to(src, id, amount)
 					. = TRUE
 				else if (amount == -1) // -1 means custom amount
 					useramount = input("Enter the Amount you want to transfer:", name, useramount) as num|null
 					if (useramount > 0)
+						end_fermi_reaction()
 						beaker.reagents.trans_id_to(src, id, useramount)
 						. = TRUE
 
@@ -358,6 +360,9 @@
 
 
 
+/obj/machinery/chem_master/proc/end_fermi_reaction()//Ends any reactions upon moving.
+	if(beaker.reagents.fermiIsReacting == 1)
+		beaker.reagents.fermiEnd()
 
 /obj/machinery/chem_master/proc/isgoodnumber(num)
 	if(isnum(num))

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -172,7 +172,7 @@
 	description = "A mixture of cryoxadone and slime jelly, that apparently inverses the requirement for its activation."
 	color = "#f7832a"
 	taste_description = "spicy jelly"
-	pH = 14
+	pH = 12
 
 /datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/M)
 	if(M.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
@@ -527,7 +527,7 @@
 	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body. Slimepeople friendly!"
 	color = "#91D865"
 	healtoxinlover = TRUE
-	pH = 14//invert
+	pH = 12//invert
 
 /datum/reagent/medicine/sal_acid
 	name = "Salicyclic Acid"
@@ -537,7 +537,7 @@
 	color = "#D2D2D2"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	overdose_threshold = 25
-	pH = 1
+	pH = 2.1
 
 
 /datum/reagent/medicine/sal_acid/on_mob_life(mob/living/carbon/M)
@@ -652,7 +652,7 @@
 	reagent_state = LIQUID
 	color = "#64FFE6"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
-	pH = 13
+	pH = 11.5
 
 /datum/reagent/medicine/diphenhydramine/on_mob_life(mob/living/carbon/M)
 	if(prob(10))
@@ -771,7 +771,7 @@
 	color = "#000000"
 	metabolization_rate = 0.25 * REAGENTS_METABOLISM
 	overdose_threshold = 35
-	pH = 14
+	pH = 12
 
 /datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/M)
 	if(M.health < 0)
@@ -1145,7 +1145,7 @@
 	color = "#91D865"
 	overdose_threshold = 30
 	taste_description = "jelly"
-	pH = 13
+	pH = 11.8
 
 /datum/reagent/medicine/neo_jelly/on_mob_life(mob/living/carbon/M)
     M.adjustBruteLoss(-1.5*REM, 0)