cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13490 from Screemonster/pickupthatcan

Browse Source 
Makes brainzsnax actually snacks
This commit is contained in:
Casey
2022-08-14 20:38:24 +00:00
committed by CHOMPStation2
parent 79465280e1
commit 660e9df072
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/food/snacks.dm
+3 -5
View File
@@ -6928,10 +6928,11 @@
filling_color = "#caa3c9"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
var/brainmeat = "brain_protein"
/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax/Initialize()
. = ..()
reagents.add_reagent("brain_protein", 10)
reagents.add_reagent(brainmeat, 10)
/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax/red
name = "\improper BrainzSnax RED"
@@ -6945,10 +6946,7 @@
filling_color = "#a6898d"
center_of_mass = list("x"=15, "y"=9)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/canned/brainzsnax/red/Initialize()
. = ..()
reagents.add_reagent("red_brain_protein", 10)
brainmeat = "red_brain_protein"
//////////////Packaged Food - break open and eat//////////////
code/modules/reagents/reagents/food_drinks_vr.dm
+3 -2
View File
@@ -140,7 +140,7 @@
M.adjust_nutrition(alt_nutriment_factor * removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.jitteriness < 100) // same check as feral triggers to stop them immediately re-feralling
if(H.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (H.feral <=0) //check if they're unferalled
H.feral = 0
@@ -523,6 +523,7 @@
color = "#caa3c9"
/datum/reagent/nutriment/protein/brainzsnax/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(prob(5) && !(alien == IS_CHIMERA || alien == IS_SLIME || alien == IS_PLANT || alien == IS_DIONA || alien == IS_SHADEKIN && !M.isSynthetic()))
M.adjustBrainLoss(removed) //Any other species risks prion disease.
M.Confuse(5)
@@ -530,7 +531,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
if(H.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
H.feral -= removed * 3 //Should calm them down quick, provided they're actually in a state to STAY calm.
if(H.feral <=0) //Check if they're unferalled
H.feral = 0