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

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
This commit is contained in:
PsiOmega
2015-03-20 08:34:43 +01:00
parent 04caac99ce 6080bc654b
commit 7ab57a4917
26 changed files with 2301 additions and 2250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -684,7 +684,8 @@
New()
..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("protein", 6)
reagents.add_reagent("pacid",6)
src.bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/meatball