Merge branch 'master' into NUMBING_BITE_V2

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm

@@ -58,3 +58,19 @@
 		if(prob(3))
 			to_chat(H,"<span class='warning'>Your tongue feels numb and unresponsive.</span>")
 			H.stuttering += 20
+
+/datum/reagent/vermicetol
+	name = "Vermicetol"
+	id = "vermicetol"
+	description = "A potent chemical that treats burn damage at an exceptional rate and lasts a while."
+	taste_description = "sparkles"
+	reagent_state = SOLID
+	color = "#964e06"
+	overdose = 10
+	scannable = 1
+	metabolism = 0.02
+	mrate_static = TRUE
+
+/datum/reagent/vermicetol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	if(alien != IS_DIONA)
+		M.heal_organ_damage(0, 21 * removed) //more potent than keloderm

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm

@@ -124,3 +124,17 @@
 				P.absorbed = 0
 				M.visible_message("<font color='green'><b>Something spills into [M]'s [lowertext(B.name)]!</b></font>")
 	return
+
+//Special toxins for solargrubs
+
+/datum/reagent/grubshock
+	name = "200 V" //in other words a painful shock
+	id = "shockchem"
+	description = "A liquid that quickly dissapates to deliver a painful shock."
+	reagent_state = LIQUID
+	color = "#E4EC2F"
+	metabolism = 2.50
+	var/power = 11
+
+/datum/reagent/grubshock/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+	M.take_organ_damage(0, removed * power * 0.2)

code/modules/reagents/Chemistry-Recipes_vr.dm

@@ -73,6 +73,23 @@
 	required_reagents = list("milk" = 2, "hydrogen" = 1, "potassium" = 1)
 	result_amount = 3
 
+/datum/chemical_reaction/vermicetol
+	name = "Vermicetol"
+	id = "vermicetol"
+	result = "vermicetol"
+	required_reagents = list("kelotane" = 1, "dermaline" = 1, "shockchem" = 1, "phoron" = 0.1)
+	catalysts = list("phoron" = 5)
+	result_amount = 3
+
+///////////////////////////////////////////////////////////////////////////////////
+/// Special drinks
+/datum/chemical_reaction/drinks/grubshake
+	name = "Grub protein drink"
+	id = "grubshake"
+	result = "grubshake"
+	required_reagents = list("shockchem" = 5, "water" = 25)
+	result_amount = 30
+
 ///////////////////////////////
 //SLIME CORES BELOW HERE///////
 ///////////////////////////////

code/modules/reagents/reagent_containers/food/snacks_vr.dm

@@ -190,6 +190,91 @@
 	reagents.add_reagent("protein", 4)
 	bitesize = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
+	name = "grubmeat"
+	desc = "A slab of grub meat, it gives a gentle shock if you touch it"
+	icon = 'icons/obj/food_vr.dmi'
+	icon_state = "grubmeat"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/New()
+	..()
+	reagents.add_reagent("protein", 1)
+	reagents.add_reagent("shockchem", 6)
+	bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/bugball
+	name = "bugball"
+	desc = "A hard chitin, dont chip a tooth!"
+	icon = 'icons/obj/food_vr.dmi'
+	icon_state = "pillbugball"
+	trash = /obj/item/weapon/reagent_containers/food/snacks/pillbug
+	nutriment_amt = 1
+	nutriment_desc = list("crunchy shell bits" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/grub/bugball/New()
+	..()
+	reagents.add_reagent("protein", 1)
+	reagents.add_reagent("carbon", 5)
+	bitesize = 7
+
+/obj/item/weapon/reagent_containers/food/snacks/pillbug
+	name = "pillbug"
+	desc = "A delicacy discovered and popularized by a famous restaurant called Mudca's Meat Hut."
+	icon = 'icons/obj/food_vr.dmi'
+	icon_state = "pillbug"
+	trash = /obj/item/weapon/reagent_containers/food/snacks/pillbugempty
+	nutriment_amt = 3
+	nutriment_desc = list("sparkles" = 5, "ancient inca culture" =3)
+
+/obj/item/weapon/reagent_containers/food/snacks/pillbug/New()
+	..()
+	reagents.add_reagent("protein", 3)
+	reagents.add_reagent("shockchem", 6)
+	bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/pillbugempty
+	name = "pillbug shell"
+	desc = "Waste not, want not."
+	icon = 'icons/obj/food_vr.dmi'
+	icon_state = "pillbugempty"
+	nutriment_amt = 1
+	nutriment_desc = list("crunchy shell bits" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/pillbug/New()
+	..()
+	reagents.add_reagent("protein", 1)
+	reagents.add_reagent("carbon", 5)
+	bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/mammi
+	name = "mämmi"
+	desc = "Traditional finnish desert, some like it, others don't. It's drifting in some milk, add sugar!"
+	icon = 'icons/obj/food_vr.dmi'
+	icon_state = "mammi"
+	trash = /obj/item/trash/plate
+	nutriment_amt = 3
+	nutriment_desc = list("brothy sweet goodness" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/mammi/New()
+	..()
+	bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/makaroni
+	name = "makaronilaatikko"
+	desc = "A special kind of macaroni, it's a big dish, and this one has special meat in it."
+	icon = 'icons/obj/food_vr.dmi'
+	icon_state = "makaroni"
+	trash = /obj/item/trash/plate
+	nutriment_amt = 15
+	nutriment_desc = list("Cheese" = 5, "eggs" = 3, "pasta" = 4, "sparkles" = 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/makaroni/New()
+	..()
+	reagents.add_reagent("protein", 1)
+	reagents.add_reagent("shockchem", 6)
+	bitesize = 7
+
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube
 	name = "sobaka cube"
 	monkey_type = "Sobaka"