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

seriously where did these lines come from

Browse Source
This commit is contained in:
MMMiracles
2015-03-19 19:35:02 -04:00
parent 46a824c5cc
commit de9641edae
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/food/snacks_burgers.dm
-3
View File
@@ -55,15 +55,12 @@
desc = "Smells caustic. Tastes like heresy."
icon_state = "xburger"
bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
<<<<<<< HEAD
/obj/item/weapon/reagent_containers/food/snacks/burger/bearger
name = "bearger"
desc = "Best served rawr."
icon_state = "bearger"
bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
=======
>>>>>>> b5979a49fe43e9e059e6c165b309df0b1c018087
/obj/item/weapon/reagent_containers/food/snacks/burger/clown
name = "clown burger"