Merge branch 'master' into beakerpH_tweaks

2019-09-27 11:50:31 +01:00
parent 8dcf74d5f0 76d0cd7ef7
commit 146219edf9
70 changed files with 1100 additions and 414 deletions
@@ -746,7 +746,7 @@
 	total_volume = 0
 	for(var/reagent in cached_reagents)
 		var/datum/reagent/R = reagent
-		if(R.volume < CHEMICAL_QUANTISATION_LEVEL)
+		if((R.volume < 0.01) && !fermiIsReacting)
 			del_reagent(R.id)
 		else
 			total_volume += R.volume
@@ -191,6 +191,13 @@
 	color = "#731008" // rgb: 115, 16, 8
 	taste_description = "ketchup"

+/datum/reagent/consumable/mustard
+	name = "Mustard"
+	id = "mustard"
+	description = "Mustard, mostly used on hotdogs, corndogs and burgers."
+	nutriment_factor = 5 * REAGENTS_METABOLISM
+	color = "#DDED26" // rgb: 221, 237, 38
+	taste_description = "mustard"

 /datum/reagent/consumable/capsaicin
 	name = "Capsaicin Oil"
@@ -200,22 +200,20 @@
 	pH = 7.5 //God is alkaline

 /datum/reagent/water/holywater/on_mob_metabolize(mob/living/L)
-	..()
+	. = ..()
 	ADD_TRAIT(L, TRAIT_HOLY, id)

+	if(is_servant_of_ratvar(L))
+		to_chat(L, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
+	else if(iscultist(L))
+		to_chat(L, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
+
 /datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L)
 	REMOVE_TRAIT(L, TRAIT_HOLY, id)
-	..()
-
-/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
-	if(is_servant_of_ratvar(M))
-		to_chat(M, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
-	..()
-
-/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
-	if(iscultist(M))
-		to_chat(M, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
-	..()
+	if(iscultist(L))
+		for(var/datum/action/innate/cult/blood_magic/BM in L.actions)
+			BM.holy_dispel = FALSE
+	return ..()

 /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
 	if(!data)
@@ -224,9 +222,11 @@
 	M.jitteriness = min(M.jitteriness+4,10)
 	if(iscultist(M))
 		for(var/datum/action/innate/cult/blood_magic/BM in M.actions)
-			to_chat(M, "<span class='cultlarge'>Your blood rites falter as holy water scours your body!</span>")
-			for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
-				qdel(BS)
+			if(!BM.holy_dispel)
+				BM.holy_dispel = TRUE
+				to_chat(M, "<span class='cultlarge'>Your blood rites falter as holy water scours your body!</span>")
+				for(var/datum/action/innate/cult/blood_spell/BS in BM.spells)
+					qdel(BS)
 	if(data >= 25)		// 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec
 		if(!M.stuttering)
 			M.stuttering = 1
@@ -1445,9 +1445,6 @@
 	color = "#FFFFFF" // white
 	random_color_list = list("#FFFFFF") //doesn't actually change appearance at all

-
-
-
 //////////////////////////////////Hydroponics stuff///////////////////////////////

 /datum/reagent/plantnutriment
@@ -1489,16 +1486,8 @@
 	tox_prob = 15
 	pH = 1

-
-
-
-
-
-
 // GOON OTHERS

-
-
 /datum/reagent/oil
 	name = "Oil"
 	id = "oil"
@@ -2032,6 +2021,13 @@
 	qdel(original_dna)
 	return ..()

+/datum/reagent/mustardgrind
+	name = "Mustardgrind"
+	id = "mustardgrind"
+	description = "A powerd that is mixed with water and enzymes to make mustard."
+	color = "#BCC740" //RGB: 188, 199, 64
+	taste_description = "plant dust"
+
 /datum/reagent/pax/catnip
 	name = "catnip"
 	id = "catnip"
@@ -82,6 +82,12 @@
 	required_temp = 374
 	mob_react = FALSE

+/datum/chemical_reaction/mustard
+	name = "Mustard"
+	id = "mustard"
+	results = list("mustard" = 5)
+	required_reagents = list("mustardgrind" = 1, "water"  = 10, "enzyme"= 1)
+
 /datum/chemical_reaction/soapification/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
 	for(var/i = 1, i <= created_volume, i++)