Merge branch 'master' of https://github.com/PolarisSS13/Polaris into food2021

code/modules/reagents/reactions/instant/drinks.dm

@@ -399,7 +399,7 @@
 	name = "Singulo"
 	id = "singulo"
 	result = "singulo"
-	required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
+	required_reagents = list("vodka" = 5, "radium" = 1, "redwine" = 5)
 	result_amount = 10
 
 /decl/chemical_reaction/instant/drinks/alliescocktail
@@ -505,14 +505,14 @@
 	name = "Acid Spit"
 	id = "acidspit"
 	result = "acidspit"
-	required_reagents = list("sacid" = 1, "wine" = 5)
+	required_reagents = list("sacid" = 1, "redwine" = 5)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/amasec
 	name = "Amasec"
 	id = "amasec"
 	result = "amasec"
-	required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
+	required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5)
 	result_amount = 10
 
 /decl/chemical_reaction/instant/drinks/changelingsting
@@ -661,7 +661,7 @@
 	name = "Melon Spritzer"
 	id = "melonspritzer"
 	result = "melonspritzer"
-	required_reagents = list("watermelonjuice" = 2, "wine" = 2, "applejuice" = 1, "limejuice" = 1)
+	required_reagents = list("watermelonjuice" = 2, "redwine" = 2, "applejuice" = 1, "limejuice" = 1)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/fauxfizz
@@ -915,7 +915,7 @@
     name = "Wine brandy"
     id = "winebrandy"
     result = "winebrandy"
-    required_reagents = list("wine" = 10)
+    required_reagents = list("redwine" = 10)
     catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe
     result_amount = 5
 
@@ -937,7 +937,7 @@
 	name = "Vesper"
 	id = "vesper"
 	result = "vesper"
-	required_reagents = list("gin" = 3, "vodka" = 1, "wine" = 1)
+	required_reagents = list("gin" = 3, "vodka" = 1, "redwine" = 1)
 	result_amount = 4
 
 /decl/chemical_reaction/instant/drinks/rotgut

code/modules/reagents/reactions/instant/instant.dm

@@ -1105,14 +1105,12 @@
 	name = "Neutralize Carpotoxin"
 	id = "carpotoxin_neutral"
 	result = "protein"
-	required_reagents = list("radium" = 1, "carpotoxin" = 1, "sifsap" = 1)
-	catalysts = list("sifsap" = 10)
-	result_amount = 2
+	required_reagents = list("enzyme" = 1, "carpotoxin" = 1, "sifsap" = 1)
+	result_amount = 1
 
 /decl/chemical_reaction/instant/neutralize_spidertoxin
 	name = "Neutralize Spidertoxin"
 	id = "spidertoxin_neutral"
 	result = "protein"
-	required_reagents = list("radium" = 1, "spidertoxin" = 1, "sifsap" = 1)
-	catalysts = list("sifsap" = 10)
-	result_amount = 2
+	required_reagents = list("enzyme" = 1, "spidertoxin" = 1, "sifsap" = 1)
+	result_amount = 1

code/modules/reagents/reagent_containers/borghypo.dm

@@ -155,6 +155,7 @@
 		"milk",
 		"mint",
 		"orangejuice",
+		"redwine",
 		"rum",
 		"sake",
 		"sodawater",
@@ -172,8 +173,7 @@
 		"vodka",
 		"water",
 		"watermelonjuice",
-		"whiskey",
-		"wine")
+		"whiskey")
 
 /obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
 	return

code/modules/reagents/reagents/food_drinks.dm

@@ -297,13 +297,6 @@
 	color = "#FFFFAA"
 	allergen_type = ALLERGEN_EGGS //Eggs contain egg
 
-/datum/reagent/nutriment/protein/murk
-	name = "murkfin protein"
-	id = "murk_protein"
-	taste_description = "mud"
-	color = "#664330"
-	allergen_type = ALLERGEN_FISH //Murkfin is fish
-
 /datum/reagent/nutriment/honey
 	name = "Honey"
 	id = "honey"

code/modules/reagents/reagents/other.dm

@@ -627,10 +627,11 @@
 	M.adjustToxLoss(2 * removed)
 	M.adjustCloneLoss(2 * removed)
 
-/datum/reagent/fishbait
+/datum/reagent/nutriment/fishbait
 	name = "Fish Bait"
 	id = "fishbait"
 	description = "A natural slurry that particularily appeals to fish."
-	taste_description = "earthy"
+	taste_description = "slimy dirt"
 	reagent_state = LIQUID
-	color = "#62764E"
+	color = "#62764E"
+	nutriment_factor = 15

code/modules/reagents/reagents/toxins.dm

@@ -67,7 +67,7 @@
 /datum/reagent/toxin/neurotoxic_protein
 	name = "toxic protein"
 	id = "neurotoxic_protein"
-	description = "A weak neurotoxic chemical commonly found in Sivian fish meat."
+	description = "A weak neurotoxic chemical."
 	taste_description = "fish"
 	reagent_state = LIQUID
 	color = "#005555"