Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992

[MIRROR] Spiderpalooza 1: Foods!
This commit is contained in:
LetterJay
2017-09-26 15:01:02 -04:00
committed by GitHub
3 changed files with 32 additions and 0 deletions

View File

@@ -188,6 +188,24 @@
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
/obj/item/reagent_containers/food/snacks/spiderling
name = "spiderling"
desc = "It's slightly twitching in your hand. Ew..."
icon_state = "spiderling"
list_reagents = list("nutrient" = 1, "toxin" = 4)
filling_color = "#00800"
tastes = list("cobwebs" = 1, "guts" = 2)
foodtype = MEAT | TOXIC
/obj/item/reagent_containers/food/snacks/spiderlollipop
name = "spider lollipop"
desc = "Still gross, but at least it has a mountain of sugar on it."
icon_state = "spiderlollipop"
list_reagents = list("nutriment" = 1, "toxin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2) //lollipop, but vitamins = toxins
filling_color = "#00800"
tastes = list("cobwebs" = 1, "sugar" = 2)
foodtype = JUNKFOOD | SUGAR
/obj/item/reagent_containers/food/snacks/chococoin
name = "chocolate coin"
desc = "A completely edible but nonflippable festive coin."

View File

@@ -12,6 +12,16 @@
result = /obj/item/reagent_containers/food/snacks/candiedapple
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/spiderlollipop
name = "Spider Lollipop"
reqs = list(/obj/item/stack/rods = 1,
/datum/reagent/consumable/sugar = 5,
/datum/reagent/water = 5,
/obj/item/reagent_containers/food/snacks/spiderling = 1
)
result = /obj/item/reagent_containers/food/snacks/spiderlollipop
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/chococoin
name = "Choco coin"
reqs = list(