cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

againwhy?

Browse Source
This commit is contained in:
MMMiracles
2015-03-19 19:34:36 -04:00
parent 9ed41e0510
commit 46a824c5cc
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/food/snacks_meat.dm
+1 -4
View File
@@ -70,7 +70,6 @@
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 5)
<<<<<<< HEAD
/obj/item/weapon/reagent_containers/food/snacks/bearsteak
name = "Filet migrawr"
@@ -79,8 +78,6 @@
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5)
=======
>>>>>>> b5979a49fe43e9e059e6c165b309df0b1c018087
/obj/item/weapon/reagent_containers/food/snacks/faggot
name = "faggot"
@@ -215,4 +212,4 @@
icon_state = "sashimi"
bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4)
list_reagents = list("nutriment" = 6, "capsaicin" = 5)
filling_color = "#FA8072"
filling_color = "#FA8072"