-
-
Notifications
You must be signed in to change notification settings - Fork 685
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Newfood Atomization: Sandwiches (Ketchup isn't a Vegetable) (#10262)
* samimchesss * mapping * script * mapping * bread
- Loading branch information
1 parent
fe76f11
commit 219aadf
Showing
13 changed files
with
229 additions
and
186 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,156 @@ | ||
/obj/item/food/sandwich | ||
name = "sandwich" | ||
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "sandwich" | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 6, | ||
/datum/reagent/consumable/nutriment/protein = 7, | ||
/datum/reagent/consumable/nutriment/vitamin = 1 | ||
) | ||
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1) | ||
microwaved_type = /obj/item/food/toastedsandwich | ||
foodtypes = GRAIN | VEGETABLES | ||
food_flags = FOOD_FINGER_FOOD | ||
w_class = WEIGHT_CLASS_SMALL | ||
|
||
/obj/item/food/toastedsandwich | ||
name = "toasted sandwich" | ||
desc = "Now if you only had a pepper bar." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "toastedsandwich" | ||
trash_type = /obj/item/trash/plate | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 6, | ||
/datum/reagent/carbon = 2 | ||
) | ||
tastes = list("toast" = 1) | ||
foodtypes = GRAIN | ||
|
||
/obj/item/food/grilled_cheese_sandwich | ||
name = "grilled cheese sandwich" | ||
desc = "A warm, melty sandwich that goes perfectly with tomato soup." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "toastedsandwich" | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 6, | ||
/datum/reagent/consumable/nutriment/protein = 5, | ||
/datum/reagent/consumable/nutriment/vitamin = 1, | ||
/datum/reagent/carbon = 4 | ||
) | ||
tastes = list("toast" = 2, "cheese" = 3, "butter" = 1) | ||
foodtypes = GRAIN | ||
food_flags = FOOD_FINGER_FOOD | ||
w_class = WEIGHT_CLASS_SMALL | ||
|
||
/obj/item/food/jellysandwich | ||
name = "jelly sandwich" | ||
desc = "You wish you had some peanut butter to go with this..." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "jellysandwich" | ||
bite_consumption = 3 | ||
tastes = list("bread" = 1, "jelly" = 1) | ||
foodtypes = GRAIN | ||
food_flags = FOOD_FINGER_FOOD | ||
w_class = WEIGHT_CLASS_SMALL | ||
|
||
/obj/item/food/jellysandwich/slime | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 2, | ||
/datum/reagent/toxin/slimejelly = 10, | ||
/datum/reagent/consumable/nutriment/vitamin = 4 | ||
) | ||
foodtypes = GRAIN | TOXIC | ||
|
||
/obj/item/food/jellysandwich/cherry | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 2, | ||
/datum/reagent/consumable/cherryjelly = 8, | ||
/datum/reagent/consumable/nutriment/vitamin = 4 | ||
) | ||
foodtypes = GRAIN | FRUIT | SUGAR | ||
|
||
/obj/item/food/notasandwich | ||
name = "not-a-sandwich" | ||
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "notasandwich" | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 6, | ||
/datum/reagent/consumable/nutriment/vitamin = 10 | ||
) | ||
tastes = list("nothing suspicious" = 1) | ||
foodtypes = GRAIN | GROSS | ||
food_flags = FOOD_FINGER_FOOD | ||
w_class = WEIGHT_CLASS_SMALL | ||
|
||
/obj/item/food/butteredtoast | ||
name = "buttered toast" | ||
desc = "Butter lightly spread over a piece of toast." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "butteredtoast" | ||
bite_consumption = 3 | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 5, | ||
/datum/reagent/consumable/nutriment/vitamin = 1 | ||
) | ||
tastes = list("butter" = 1, "toast" = 1) | ||
foodtypes = GRAIN | BREAKFAST | ||
food_flags = FOOD_FINGER_FOOD | ||
w_class = WEIGHT_CLASS_SMALL | ||
|
||
/obj/item/food/jelliedtoast | ||
name = "jellied toast" | ||
desc = "A slice of toast covered with delicious jam." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "jellytoast" | ||
bite_consumption = 3 | ||
tastes = list("toast" = 1, "jelly" = 1) | ||
foodtypes = GRAIN | BREAKFAST | ||
food_flags = FOOD_FINGER_FOOD | ||
w_class = WEIGHT_CLASS_SMALL | ||
|
||
/obj/item/food/jelliedtoast/cherry | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 1, | ||
/datum/reagent/consumable/cherryjelly = 8, | ||
/datum/reagent/consumable/nutriment/vitamin = 4 | ||
) | ||
foodtypes = GRAIN | FRUIT | SUGAR | BREAKFAST | ||
|
||
/obj/item/food/jelliedtoast/slime | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 1, | ||
/datum/reagent/toxin/slimejelly = 8, | ||
/datum/reagent/consumable/nutriment/vitamin = 4 | ||
) | ||
foodtypes = GRAIN | TOXIC | SUGAR | BREAKFAST | ||
|
||
/obj/item/food/twobread | ||
name = "two bread" | ||
desc = "This seems awfully bitter." | ||
icon = 'icons/obj/food/burgerbread.dmi' | ||
icon_state = "twobread" | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 3, | ||
/datum/reagent/consumable/nutriment/vitamin = 4 | ||
) | ||
tastes = list("bread" = 2) | ||
foodtypes = GRAIN | ||
food_flags = FOOD_FINGER_FOOD | ||
w_class = WEIGHT_CLASS_SMALL | ||
|
||
/obj/item/food/hotdog | ||
name = "hotdog" | ||
desc = "Hot and steamy hotdog weenie." | ||
icon_state = "hotdog" | ||
bite_consumption = 3 | ||
food_reagents = list( | ||
/datum/reagent/consumable/nutriment = 3, | ||
/datum/reagent/consumable/nutriment/protein = 1, | ||
/datum/reagent/consumable/ketchup = 3, | ||
/datum/reagent/consumable/nutriment/vitamin = 6, | ||
) | ||
tastes = list("bun" = 3, "meat" = 2) | ||
foodtypes = GRAIN | MEAT //Ketchup is not a vegetable | ||
w_class = WEIGHT_CLASS_SMALL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 0 additions & 121 deletions
121
code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.