cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6404 from Ketrai/iwantdie

Browse Source 
adds food cubes.
This commit is contained in:
Novacat
2020-01-09 22:51:32 -05:00
committed by GitHub
parent 744758091b 28eb142141
commit 4f6a7972d6
9 changed files with 162 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm
View File

@@ -1,12 +1,39 @@
/datum/reagent/nutriment
nutriment_factor = 10
/datum/reagent/toxin/meatcolony
name = "A colony of meat cells"
id = "meatcolony"
description = "Specialised cells designed to produce a large amount of meat once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous."
taste_description = "a fibrous mess"
reagent_state = LIQUID
color = "#ff2424"
strength = 10
/datum/reagent/toxin/plantcolony
name = "A colony of plant cells"
id = "plantcolony"
description = "Specialised cells designed to produce a large amount of nutriment once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous."
taste_description = "a fibrous mess"
reagent_state = LIQUID
color = "#7ce01f"
strength = 10
/datum/reagent/nutriment/grubshake
name = "Grub shake"
id = "grubshake"
description = "An odd fluid made from grub guts, supposedly filling."
taste_description = "sparkles"
taste_mult = 1.3
nutriment_factor = 5
color = "#fff200"
/datum/reagent/lipozine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.nutrition = max(M.nutrition - 20 * removed, 0)
M.overeatduration = 0
if(M.nutrition < 0)
M.nutrition = 0
/datum/reagent/ethanol/deathbell
name = "Deathbell"
id = "deathbell"
@@ -20,7 +47,7 @@
glass_name = "Deathbell"
glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on."
/datum/reagent/ethanol/deathbell/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
@@ -49,7 +76,7 @@
if(M.species.gets_food_nutrition) //it's still food!
switch(alien)
if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein.
if(IS_SKRELL)
if(IS_SKRELL)
M.adjustToxLoss(0.25 * removed) //Equivalent to half as much protein, since it's half protein.
if(IS_TESHARI)
M.nutrition += (alt_nutriment_factor * 1.2 * removed) //Give them the same nutrition they would get from protein.
@@ -57,7 +84,7 @@
M.nutrition += (alt_nutriment_factor * 1.125 * removed) //Give them the same nutrition they would get from protein.
//Takes into account the 0.5 factor for all nutriment which is applied on top of the 2.25 factor for protein.
//Chimera don't need their own case here since their factors for nutriment and protein cancel out.
else
else
M.nutrition += (alt_nutriment_factor * removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M

16
code/modules/reagents/Chemistry-Recipes_vr.dm
View File

@@ -129,6 +129,22 @@
required_reagents = list("whiskey" = 1, "protein" = 1)
result_amount = 2
///////////////////////////////////////////////////////////////////////////////////
/// Reagent colonies.
/datum/chemical_reaction/meatcolony
name = "protein"
id = "meatcolony"
result = "protein"
required_reagents = list("meatcolony" = 5, "virusfood" = 5)
result_amount = 60
/datum/chemical_reaction/plantcolony
name = "nutriment"
id = "plantcolony"
result = "nutriment"
required_reagents = list("plantcolony" = 5, "virusfood" = 5)
result_amount = 60
///////////////////////////////
//SLIME CORES BELOW HERE///////
///////////////////////////////