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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-27 19:24:43 -04:00
committed by GitHub
parent 4a5b2182c1
commit e60a3245bc
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/reagents/reagents/food_drinks_vr.dm
View File

@@ -155,13 +155,6 @@
if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein
M.adjust_nutrition(alt_nutriment_factor * removed)
<<<<<<< HEAD
||||||| parent of 72a0e86484... Merge pull request #11705 from GhostActual/brainfood
=======
>>>>>>> 72a0e86484... Merge pull request #11705 from GhostActual/brainfood
/datum/reagent/nutriment/magicdust/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
playsound(M, 'sound/items/hooh.ogg', 50, 1, -1)
@@ -549,4 +542,4 @@
taste_description = "fatty, mushy meat and cheap tomato sauce"
color = "#a6898d"
////////////////END BrainzSnax Reagents////////////////
////////////////END BrainzSnax Reagents////////////////