cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 17:43:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the empty type of /snacks (#26010)

Browse Source 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-07-29 16:46:04 +02:00
committed by GitHub
parent 2e2569f1db
commit 098b13bb33
222 changed files with 3300 additions and 3347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+7 -7
View File
@@ -1798,10 +1798,10 @@
to_chat(usr, "<span class='warning'>This can only be used on instances of type /mob/living/carbon/human</span>")
return
H.equip_to_slot_or_del( new /obj/item/food/snacks/cookie(H), SLOT_HUD_LEFT_HAND )
if(!(istype(H.l_hand,/obj/item/food/snacks/cookie)))
H.equip_to_slot_or_del( new /obj/item/food/snacks/cookie(H), SLOT_HUD_RIGHT_HAND )
if(!(istype(H.r_hand,/obj/item/food/snacks/cookie)))
H.equip_to_slot_or_del( new /obj/item/food/cookie(H), SLOT_HUD_LEFT_HAND )
if(!(istype(H.l_hand,/obj/item/food/cookie)))
H.equip_to_slot_or_del( new /obj/item/food/cookie(H), SLOT_HUD_RIGHT_HAND )
if(!(istype(H.r_hand,/obj/item/food/cookie)))
log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
message_admins("[key_name_admin(H)] has [H.p_their()] hands full, so [H.p_they()] did not receive [H.p_their()] cookie, spawned by [key_name_admin(src.owner)].")
return
@@ -2134,7 +2134,7 @@
ADD_TRAIT(H, TRAIT_BADDNA, "smiting")
logmsg = "cluwned."
if("Mutagen Cookie")
var/obj/item/food/snacks/cookie/evilcookie = new /obj/item/food/snacks/cookie
var/obj/item/food/cookie/evilcookie = new /obj/item/food/cookie
evilcookie.reagents.add_reagent("mutagen", 10)
evilcookie.desc = "It has a faint green glow."
evilcookie.bitesize = 100
@@ -2143,7 +2143,7 @@
H.equip_to_slot_or_del(evilcookie, SLOT_HUD_LEFT_HAND)
logmsg = "a mutagen cookie."
if("Hellwater Cookie")
var/obj/item/food/snacks/cookie/evilcookie = new /obj/item/food/snacks/cookie
var/obj/item/food/cookie/evilcookie = new /obj/item/food/cookie
evilcookie.reagents.add_reagent("hell_water", 25)
evilcookie.desc = "Sulphur-flavored."
evilcookie.bitesize = 100
@@ -2208,7 +2208,7 @@
logmsg = "nugget"
if("Bread")
var/mob/living/simple_animal/shade/sword/bread/breadshade = new(H.loc)
var/bready = pick(/obj/item/food/snacks/customizable/cook/bread, /obj/item/food/snacks/sliceable/meatbread, /obj/item/food/snacks/sliceable/xenomeatbread, /obj/item/food/snacks/sliceable/spidermeatbread, /obj/item/food/snacks/sliceable/bananabread, /obj/item/food/snacks/sliceable/tofubread, /obj/item/food/snacks/sliceable/bread, /obj/item/food/snacks/sliceable/creamcheesebread, /obj/item/food/snacks/sliceable/banarnarbread, /obj/item/food/snacks/flatbread, /obj/item/food/snacks/baguette)
var/bready = pick(/obj/item/food/customizable/cook/bread, /obj/item/food/sliceable/meatbread, /obj/item/food/sliceable/xenomeatbread, /obj/item/food/sliceable/spidermeatbread, /obj/item/food/sliceable/bananabread, /obj/item/food/sliceable/tofubread, /obj/item/food/sliceable/bread, /obj/item/food/sliceable/creamcheesebread, /obj/item/food/sliceable/banarnarbread, /obj/item/food/flatbread, /obj/item/food/baguette)
var/obj/item/bread = new bready(get_turf(H))
breadshade.forceMove(bread)
breadshade.key = H.key
code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
+3 -3
View File
@@ -23,8 +23,8 @@
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/coin/antagtoken/syndicate,
/obj/item/poster/syndicate_recruitment,
/obj/item/food/snacks/syndicake,
/obj/item/food/snacks/tatortot,
/obj/item/food/syndicake,
/obj/item/food/tatortot,
/obj/item/storage/box/fakesyndiesuit,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
/obj/item/toy/figure/crew/syndie,
@@ -423,7 +423,7 @@
M.update_icons()
// Supply them with some chow. How generous is the Syndicate?
var/obj/item/food/snacks/breadslice/food = new(get_turf(M))
var/obj/item/food/breadslice/food = new(get_turf(M))
food.name = "stale bread"
food.desc = "Looks like your captors care for their prisoners as much as their bread."
food.trash = null
code/modules/awaymissions/mission_code/ruins/watcher_grave.dm
+6 -6
View File
@@ -16,7 +16,7 @@
#define WATCHER_EGG_ACTIVE_MOD 0.5
/// Egg which hatches into a helpful pet. Or you can eat it if you want.
/obj/item/food/snacks/egg/watcher
/obj/item/food/egg/watcher
name = "watcher egg"
desc = "A lonely egg still pulsing with life, somehow untouched by the corruption of the Necropolis."
icon_state = "egg_watcher"
@@ -30,15 +30,15 @@
/// Datum used to measure our steps
var/datum/movement_detector/pedometer
/obj/item/food/snacks/egg/watcher/Initialize(mapload)
/obj/item/food/egg/watcher/Initialize(mapload)
. = ..()
pedometer = new(src, CALLBACK(src, PROC_REF(on_stepped)))
/obj/item/food/snacks/egg/watcher/Destroy(force)
/obj/item/food/egg/watcher/Destroy(force)
. = ..()
QDEL_NULL(pedometer)
/obj/item/food/snacks/egg/watcher/examine(mob/user)
/obj/item/food/egg/watcher/examine(mob/user)
. = ..()
if(steps_travelled < (steps_to_hatch * WATCHER_EGG_ACTIVE_MOD))
. += "<span class='notice'>Something stirs listlessly inside.</span>"
@@ -50,7 +50,7 @@
/// Called when we are moved, whether inside an inventory or by ourself somehow
/obj/item/food/snacks/egg/watcher/proc/on_stepped(atom/movable/egg, atom/mover, atom/old_loc, direction)
/obj/item/food/egg/watcher/proc/on_stepped(atom/movable/egg, atom/mover, atom/old_loc, direction)
var/new_loc = get_turf(egg)
if(isnull(new_loc) || new_loc == get_turf(old_loc))
return // Didn't actually go anywhere
@@ -67,7 +67,7 @@
qdel(src)
/// Animate the egg
/obj/item/food/snacks/egg/watcher/proc/jiggle()
/obj/item/food/egg/watcher/proc/jiggle()
var/animation = isturf(loc) ? rand(1, 3) : 1 // Pixel_x/y animations don't work in an inventory
switch(animation)
if(1)
code/modules/clothing/head/job_hats.dm
+1 -1
View File
@@ -107,7 +107,7 @@
name = "hat"
desc = "Someone who wears this will look very smart."
icon_state = "detective"
allowed = list(/obj/item/food/snacks/candy/candy_corn, /obj/item/pen)
allowed = list(/obj/item/food/candy/candy_corn, /obj/item/pen)
armor = list(MELEE = 15, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 20, ACID = 50)
dog_fashion = /datum/dog_fashion/head/detective
code/modules/crafting/recipes.dm
+3 -3
View File
@@ -91,10 +91,10 @@
/datum/crafting_recipe/throwing_croissant
name = "Throwing croissant"
reqs = list(
/obj/item/food/snacks/croissant = 1,
/obj/item/food/croissant = 1,
/obj/item/stack/rods = 1
)
result = list(/obj/item/food/snacks/croissant/throwing)
result = list(/obj/item/food/croissant/throwing)
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
always_available = FALSE
@@ -924,7 +924,7 @@
name = "Snowman"
result = list(/obj/structure/snowman/built)
reqs = list(/obj/item/snowball = 10,
/obj/item/food/snacks/grown/carrot = 1,
/obj/item/food/grown/carrot = 1,
/obj/item/grown/log = 2)
time = 50
category = CAT_MISC
code/modules/crafting/tailoring.dm
+5 -5
View File
@@ -631,8 +631,8 @@
name = "Flower Crown"
result = list(/obj/item/clothing/head/flower_crown)
time = 2 SECONDS
reqs = list(/obj/item/food/snacks/grown/poppy = 3,
/obj/item/food/snacks/grown/lily = 3,
reqs = list(/obj/item/food/grown/poppy = 3,
/obj/item/food/grown/lily = 3,
/obj/item/grown/sunflower = 3)
category = CAT_CLOTHING
@@ -647,21 +647,21 @@
name = "Poppy Crown"
result = list(/obj/item/clothing/head/poppy_crown)
time = 2 SECONDS
reqs = list(/obj/item/food/snacks/grown/poppy = 5)
reqs = list(/obj/item/food/grown/poppy = 5)
category = CAT_CLOTHING
/datum/crafting_recipe/lily_crown
name = "Lily Crown"
result = list(/obj/item/clothing/head/lily_crown)
time = 2 SECONDS
reqs = list(/obj/item/food/snacks/grown/lily = 5)
reqs = list(/obj/item/food/grown/lily = 5)
category = CAT_CLOTHING
/datum/crafting_recipe/geranium_crown
name = "Geranium Crown"
result = list(/obj/item/clothing/head/geranium_crown)
time = 2 SECONDS
reqs = list(/obj/item/food/snacks/grown/geranium = 5)
reqs = list(/obj/item/food/grown/geranium = 5)
category = CAT_CLOTHING
#undef ALLOWED_INGREDIENT_SUNGLASSES
code/modules/customitems/item_defines.dm
+2 -3
View File
@@ -284,11 +284,10 @@
storage_slots = 3
/obj/item/storage/toolbox/fluff/lunchbox/populate_contents()
new /obj/item/food/snacks/sandwich(src)
new /obj/item/food/snacks/chips(src)
new /obj/item/food/customizable/sandwich(src)
new /obj/item/food/chips(src)
new /obj/item/reagent_containers/drinks/cans/cola(src)
/obj/item/fluff/wingler_comb
name = "blue comb"
desc = "A blue comb, it looks like it was made to groom a Tajaran's fur."
code/modules/events/meaty_ores.dm
+1 -1
View File
@@ -32,7 +32,7 @@
if(prob(80))
gibs(where)
if(prob(45))
new /obj/item/food/snacks/meat(where)
new /obj/item/food/meat(where)
else if(prob(10))
explosion(where, 0, pick(0,1), pick(2,3), 0)
else
code/modules/fish/fish_items.dm
+10 -10
View File
@@ -66,7 +66,7 @@
can_hold = list(
/obj/item/fish,
/obj/item/fish_eggs,
/obj/item/food/snacks/shrimp,
/obj/item/food/shrimp,
)
resistance_flags = FLAMMABLE
@@ -74,7 +74,7 @@
// Fish Items //
//////////////////////////////////////////////
/obj/item/food/snacks/shrimp
/obj/item/food/shrimp
name = "shrimp"
desc = "A single raw shrimp."
icon = 'icons/obj/food/seafood.dmi'
@@ -82,12 +82,12 @@
filling_color = "#FF1C1C"
bitesize = 1
/obj/item/food/snacks/shrimp/Initialize(mapload)
/obj/item/food/shrimp/Initialize(mapload)
. = ..()
desc = pick("Anyway, like I was sayin', shrimp is the fruit of the sea.", "You can barbecue it, boil it, broil it, bake it, saute it.")
reagents.add_reagent("protein", 1)
/obj/item/food/snacks/feederfish
/obj/item/food/feederfish
name = "feeder fish"
desc = "A tiny feeder fish. Sure doesn't look very filling..."
icon = 'icons/obj/food/seafood.dmi'
@@ -95,7 +95,7 @@
filling_color = "#FF1C1C"
bitesize = 1
/obj/item/food/snacks/feederfish/Initialize(mapload)
/obj/item/food/feederfish/Initialize(mapload)
. = ..()
reagents.add_reagent("protein", 1)
@@ -170,8 +170,8 @@
/obj/item/fish/catfish/attackby(obj/item/O, mob/user as mob)
if(O.sharp)
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/food/snacks/catfishmeat(get_turf(src))
new /obj/item/food/snacks/catfishmeat(get_turf(src))
new /obj/item/food/catfishmeat(get_turf(src))
new /obj/item/food/catfishmeat(get_turf(src))
qdel(src)
return
..()
@@ -189,8 +189,8 @@
/obj/item/fish/salmon/attackby(obj/item/O, mob/user as mob)
if(O.sharp)
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/food/snacks/salmonmeat(get_turf(src))
new /obj/item/food/snacks/salmonmeat(get_turf(src))
new /obj/item/food/salmonmeat(get_turf(src))
new /obj/item/food/salmonmeat(get_turf(src))
qdel(src)
return
..()
@@ -205,7 +205,7 @@
/obj/item/fish/babycarp/attackby(obj/item/O, mob/user as mob)
if(O.sharp)
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
new /obj/item/food/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
qdel(src)
return
..()
code/modules/fish/fish_types.dm
+2 -2
View File
@@ -52,13 +52,13 @@
/datum/fish/shrimp
fish_name = "shrimp"
egg_item = /obj/item/fish_eggs/shrimp
fish_item = /obj/item/food/snacks/shrimp
fish_item = /obj/item/food/shrimp
crossbreeder = 0
/datum/fish/feederfish
fish_name = "feeder fish"
egg_item = /obj/item/fish_eggs/feederfish
fish_item = /obj/item/food/snacks/feederfish
fish_item = /obj/item/food/feederfish
/datum/fish/feederfish/special_interact(obj/machinery/fishtank/my_tank)
if(!my_tank || !istype(my_tank))
code/modules/food_and_drinks/drinks/bottler/bottler.dm
+3 -3
View File
@@ -28,7 +28,7 @@
available_recipes = list()
acceptable_items = list()
//These are going to be acceptable even if they aren't in a recipe
acceptable_items |= /obj/item/food/snacks
acceptable_items |= /obj/item/food
acceptable_items |= /obj/item/reagent_containers/drinks/cans
//the rest is based on what is used in recipes so we don't have people destroying the nuke disc
for(var/type in subtypesof(/datum/bottler_recipe))
@@ -45,8 +45,8 @@
to_chat(user, "<span class='warning'>[O] is stuck to your hand, you can't seem to put it down!</span>")
return 0
if(is_type_in_list(O,acceptable_items))
if(istype(O, /obj/item/food/snacks))
var/obj/item/food/snacks/S = O
if(istype(O, /obj/item/food))
var/obj/item/food/S = O
user.unEquip(S)
if(S.reagents && !S.reagents.total_volume) //This prevents us from using empty foods, should one occur due to some sort of error
to_chat(user, "<span class='warning'>[S] is gone, oh no!</span>")
code/modules/food_and_drinks/drinks/bottler/bottler_recipes.dm
+16 -16
View File
@@ -22,48 +22,48 @@ There is no excuse to do this wrong now that there is an example for you. --Fals
/datum/bottler_recipe/Paradise_Punch
name = "Paradise Punch"
description = "Tastes just how you'd think Paradise would if you could bottle it."
ingredients = list(/obj/item/food/snacks/grown/grapes,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/cherries)
ingredients = list(/obj/item/food/grown/grapes,
/obj/item/food/grown/banana,
/obj/item/food/grown/cherries)
result = "paradise_punch"
/datum/bottler_recipe/Applepocalypse
name = "Apple-pocalypse"
description = "If doomsday came in fruit form, it'd probably be apples."
ingredients = list(/obj/item/food/snacks/grown/apple,
/obj/item/food/snacks/grown/apple,
/obj/item/food/snacks/grown/apple)
ingredients = list(/obj/item/food/grown/apple,
/obj/item/food/grown/apple,
/obj/item/food/grown/apple)
result = "apple-pocalypse"
/datum/bottler_recipe/Berry_Banned
name = "Berry Banned"
description = "Reason for ban: Excessive Flavor."
ingredients = list(/obj/item/food/snacks/grown/berries,
/obj/item/food/snacks/grown/berries,
/obj/item/food/snacks/grown/berries)
ingredients = list(/obj/item/food/grown/berries,
/obj/item/food/grown/berries,
/obj/item/food/grown/berries)
result = "berry_banned"
/datum/bottler_recipe/Berry_Banned2
name = "Berry Banned"
description = "Reason for ban: Excessive Flavor."
ingredients = list(/obj/item/food/snacks/grown/berries/poison,
/obj/item/food/snacks/grown/berries/poison,
/obj/item/food/snacks/grown/berries/poison)
ingredients = list(/obj/item/food/grown/berries/poison,
/obj/item/food/grown/berries/poison,
/obj/item/food/grown/berries/poison)
result = "berry_banned2"
/datum/bottler_recipe/Blackeye_Brew
name = "Blackeye Brew"
description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
ingredients = list(/obj/item/reagent_containers/drinks/cans/cola,
/obj/item/food/snacks/grown/sugarcane,
/obj/item/food/snacks/frozen/icecream)
/obj/item/food/grown/sugarcane,
/obj/item/food/frozen/icecream)
result = "blackeye_brew"
/datum/bottler_recipe/Grape_Granade
name = "Grape Granade"
description = "Exploding with grape flavor and a favorite among ERT members system-wide."
ingredients = list(/obj/item/reagent_containers/drinks/cans/grape_juice,
/obj/item/food/snacks/grown/grapes,
/obj/item/food/grown/grapes,
/obj/item/flash)
result = "grape_granade"
@@ -71,6 +71,6 @@ There is no excuse to do this wrong now that there is an example for you. --Fals
name = "Meteor Malt"
description = "Soft drinks have been detected on collision course with your tastebuds."
ingredients = list(/obj/item/stack/ore,
/obj/item/food/snacks/grown/wheat,
/obj/item/food/grown/wheat,
/obj/item/stack/ore)
result = "meteor_malt"
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+2 -2
View File
@@ -16,8 +16,8 @@
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
/obj/item/reagent_containers/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/food/snacks/egg)) //breaking eggs
var/obj/item/food/snacks/egg/E = I
if(istype(I, /obj/item/food/egg)) //breaking eggs
var/obj/item/food/egg/E = I
if(reagents)
if(reagents.total_volume >= reagents.maximum_volume)
to_chat(user, "<span class='notice'>[src] is full.</span>")
code/modules/food_and_drinks/food/condiment.dm
+2 -2
View File
@@ -85,7 +85,7 @@
to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [target].</span>")
//Something like a glass or a food item. Player probably wants to transfer TO it.
else if(target.is_drainable() || istype(target, /obj/item/food/snacks))
else if(target.is_drainable() || istype(target, /obj/item/food))
if(!reagents.total_volume)
to_chat(user, "<span class='warning'>[src] is empty!</span>")
return
@@ -317,7 +317,7 @@
if(!proximity) return
//You can tear the bag open above food to put the condiments on it, obviously.
if(istype(target, /obj/item/food/snacks))
if(istype(target, /obj/item/food))
if(!reagents.total_volume)
to_chat(user, "<span class='warning'>You tear open [src], but there's nothing in it.</span>")
qdel(src)
code/modules/food_and_drinks/food/customizables.dm
+61 -61
View File
@@ -1,40 +1,40 @@
#define MAKE_CUSTOM_FOOD(snack_to_add, user, type) \
do {\
var/obj/item/food/snacks/customizable/custom_snack = new type(get_turf(user));\
var/obj/item/food/customizable/custom_snack = new type(get_turf(user));\
custom_snack.add_ingredient(snack_to_add, user); \
user.put_in_active_hand(custom_snack); \
qdel(src);\
} while(FALSE)
/obj/item/food/snacks/breadslice/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/sandwich)
/obj/item/food/breadslice/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/sandwich)
return
..()
/obj/item/food/snacks/bun/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/burger)
/obj/item/food/bun/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/burger)
return
..()
/obj/item/food/snacks/sliceable/flatdough/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/pizza)
/obj/item/food/sliceable/flatdough/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/pizza)
return
..()
/obj/item/food/snacks/boiledspaghetti/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/pasta)
/obj/item/food/boiledspaghetti/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/pasta)
return
..()
/obj/item/trash/plate/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/food/snacks) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/snacks/customizable/fullycustom)
if(istype(W, /obj/item/food) && !(W.flags & NODROP))
MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/fullycustom)
return
..()
@@ -47,14 +47,14 @@ do {\
icon_state = "soup"
/obj/item/trash/bowl/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/food/snacks) && !(I.flags & NODROP))
var/obj/item/food/snacks/customizable/soup/S = new(get_turf(user))
if(istype(I, /obj/item/food) && !(I.flags & NODROP))
var/obj/item/food/customizable/soup/S = new(get_turf(user))
S.attackby(I, user, params)
qdel(src)
else
..()
/obj/item/food/snacks/customizable
/obj/item/food/customizable
name = "sandwich"
desc = "A sandwich! A timeless classic."
icon = 'icons/obj/food/custom.dmi'
@@ -74,20 +74,20 @@ do {\
var/list/ingredients = list()
list_reagents = list("nutriment" = 8)
/obj/item/food/snacks/customizable/Initialize(mapload)
/obj/item/food/customizable/Initialize(mapload)
. = ..()
if(top)
top_image = new(icon, "[baseicon]_top")
add_overlay(top_image)
/obj/item/food/snacks/customizable/sandwich
/obj/item/food/customizable/sandwich
name = "sandwich"
desc = "A sandwich! A timeless classic."
icon_state = "sandwichcustom"
baseicon = "sandwichcustom"
basename = "sandwich"
/obj/item/food/snacks/customizable/pizza
/obj/item/food/customizable/pizza
name = "personal pizza"
desc = "A personalized pan pizza meant for only one person."
icon_state = "personal_pizza"
@@ -97,7 +97,7 @@ do {\
top = 0
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
/obj/item/food/snacks/customizable/pasta
/obj/item/food/customizable/pasta
name = "spaghetti"
desc = "Noodles. With stuff. Delicious."
icon_state = "pasta_bot"
@@ -106,7 +106,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/cook/bread
/obj/item/food/customizable/cook/bread
name = "bread"
desc = "Tasty bread."
icon_state = "breadcustom"
@@ -116,7 +116,7 @@ do {\
top = 0
tastes = list("bread" = 10)
/obj/item/food/snacks/customizable/cook/pie
/obj/item/food/customizable/cook/pie
name = "pie"
desc = "Tasty pie."
icon_state = "piecustom"
@@ -126,7 +126,7 @@ do {\
top = 0
tastes = list("pie" = 1)
/obj/item/food/snacks/customizable/cook/cake
/obj/item/food/customizable/cook/cake
name = "cake"
desc = "A popular band."
icon_state = "cakecustom"
@@ -136,7 +136,7 @@ do {\
top = 0
tastes = list("cake" = 1)
/obj/item/food/snacks/customizable/cook/jelly
/obj/item/food/customizable/cook/jelly
name = "jelly"
desc = "Totally jelly."
icon_state = "jellycustom"
@@ -145,7 +145,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/cook/donkpocket
/obj/item/food/customizable/cook/donkpocket
name = "donk pocket"
desc = "You wanna put a bangin-Oh nevermind."
icon_state = "donkcustom"
@@ -154,7 +154,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/cook/kebab
/obj/item/food/customizable/cook/kebab
name = "kebab"
desc = "Kebab or Kabab?"
icon_state = "kababcustom"
@@ -164,7 +164,7 @@ do {\
top = 0
tastes = list("meat" = 3, "metal" = 1)
/obj/item/food/snacks/customizable/cook/salad
/obj/item/food/customizable/cook/salad
name = "salad"
desc = "Very tasty."
icon_state = "saladcustom"
@@ -174,7 +174,7 @@ do {\
top = 0
tastes = list("leaves" = 1)
/obj/item/food/snacks/customizable/cook/waffles
/obj/item/food/customizable/cook/waffles
name = "waffles"
desc = "Made with love."
icon_state = "wafflecustom"
@@ -184,7 +184,7 @@ do {\
top = 0
tastes = list("waffles" = 1)
/obj/item/food/snacks/customizable/candy/cookie
/obj/item/food/customizable/candy/cookie
name = "cookie"
desc = "COOKIE!!1!"
icon_state = "cookiecustom"
@@ -194,7 +194,7 @@ do {\
top = 0
tastes = list("cookie" = 1)
/obj/item/food/snacks/customizable/candy/cotton
/obj/item/food/customizable/candy/cotton
name = "flavored cotton candy"
desc = "Who can take a sunrise, sprinkle it with dew,"
icon_state = "cottoncandycustom"
@@ -203,7 +203,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/gummybear
/obj/item/food/customizable/candy/gummybear
name = "flavored giant gummy bear"
desc = "Cover it in chocolate and a miracle or two,"
icon_state = "gummybearcustom"
@@ -212,7 +212,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/gummyworm
/obj/item/food/customizable/candy/gummyworm
name = "flavored giant gummy worm"
desc = "The Candy Man can 'cause he mixes it with love,"
icon_state = "gummywormcustom"
@@ -221,7 +221,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/jellybean
/obj/item/food/customizable/candy/jellybean
name = "flavored giant jelly bean"
desc = "And makes the world taste good."
icon_state = "jellybeancustom"
@@ -230,7 +230,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/jawbreaker
/obj/item/food/customizable/candy/jawbreaker
name = "flavored jawbreaker"
desc = "Who can take a rainbow, Wrap it in a sigh,"
icon_state = "jawbreakercustom"
@@ -239,7 +239,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/candycane
/obj/item/food/customizable/candy/candycane
name = "flavored candy cane"
desc = "Soak it in the sun and make strawberry-lemon pie,"
icon_state = "candycanecustom"
@@ -248,7 +248,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/gum
/obj/item/food/customizable/candy/gum
name = "flavored gum"
desc = "The Candy Man can 'cause he mixes it with love and makes the world taste good. And the world tastes good 'cause the Candy Man thinks it should..."
icon_state = "gumcustom"
@@ -257,7 +257,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/donut
/obj/item/food/customizable/candy/donut
name = "filled donut"
desc = "Donut eat this!" // kill me
icon_state = "donutcustom"
@@ -266,7 +266,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/bar
/obj/item/food/customizable/candy/bar
name = "flavored chocolate bar"
desc = "Made in a factory downtown."
icon_state = "barcustom"
@@ -275,7 +275,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/sucker
/obj/item/food/customizable/candy/sucker
name = "flavored sucker"
desc = "Suck suck suck."
icon_state = "suckercustom"
@@ -284,7 +284,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/cash
/obj/item/food/customizable/candy/cash
name = "flavored chocolate cash"
desc = "I got piles!"
icon_state = "cashcustom"
@@ -293,7 +293,7 @@ do {\
snack_overlays = 0
top = 0
/obj/item/food/snacks/customizable/candy/coin
/obj/item/food/customizable/candy/coin
name = "flavored chocolate coin"
desc = "Clink, clink, clink."
icon_state = "coincustom"
@@ -303,7 +303,7 @@ do {\
top = 0
/// In the event you fuckers find something I forgot to add a customizable food for.
/obj/item/food/snacks/customizable/fullycustom
/obj/item/food/customizable/fullycustom
name = "on a plate"
desc = "A unique dish."
icon_state = "fullycustom"
@@ -314,7 +314,7 @@ do {\
ingredient_limit = 20
fullycustom = 1
/obj/item/food/snacks/customizable/soup
/obj/item/food/customizable/soup
name = "soup"
desc = "A bowl with liquid and... stuff in it."
icon_state = "soup"
@@ -326,7 +326,7 @@ do {\
top = 0
tastes = list("soup" = 1)
/obj/item/food/snacks/customizable/burger
/obj/item/food/customizable/burger
name = "burger bun"
desc = "A bun for a burger. Delicious."
icon_state = "burgercustom"
@@ -335,14 +335,14 @@ do {\
tastes = list("bun" = 4)
/obj/item/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
/obj/item/food/customizable/attackby(obj/item/I, mob/user, params)
if(is_pen(I))
var/new_name = rename_interactive(user, I, use_prefix = FALSE)
if(!isnull(new_name))
to_chat(user, "<span class='notice'>You declare this to be \a [name]. Delicious!</span>")
return
if(!istype(I, /obj/item/food/snacks))
if(!istype(I, /obj/item/food))
to_chat(user, "<span class='warning'>[I] isn't exactly something that you would want to eat.</span>")
return
@@ -354,14 +354,14 @@ do {\
* Arguments:
* * snack - The ingredient that will be added
*/
/obj/item/food/snacks/customizable/proc/add_ingredient(obj/item/food/snacks/snack, mob/user)
/obj/item/food/customizable/proc/add_ingredient(obj/item/food/snack, mob/user)
if(length(ingredients) > ingredient_limit)
to_chat(user, "<span class='warning'>If you put anything else in or on [src] it's going to make a mess.</span>")
return
// Fully custom snacks don't add the ingredients. So no need to check
if(!fullycustom && istype(snack, /obj/item/food/snacks/customizable))
var/obj/item/food/snacks/customizable/origin = snack
if(!fullycustom && istype(snack, /obj/item/food/customizable))
var/obj/item/food/customizable/origin = snack
if(length(ingredients) + length(origin.ingredients) > ingredient_limit)
to_chat(user, "<span class='warning'>Merging [snack] and [src] together is going to make a mess.</span>")
return
@@ -376,8 +376,8 @@ do {\
var/list/added_ingredients = list(snack)
// Only merge when it is not fullycustom. Else it looks weird
if(!fullycustom && istype(snack, /obj/item/food/snacks/customizable))
var/obj/item/food/snacks/customizable/origin = snack
if(!fullycustom && istype(snack, /obj/item/food/customizable))
var/obj/item/food/customizable/origin = snack
added_ingredients += origin.ingredients
origin.ingredients.Cut()
origin.name = initial(origin.name) // Reset the name for the examine text
@@ -394,12 +394,12 @@ do {\
* Arguments:
* * new_ingredients - The new ingredients to be added
*/
/obj/item/food/snacks/customizable/proc/add_ingredients(list/new_ingredients)
/obj/item/food/customizable/proc/add_ingredients(list/new_ingredients)
cut_overlay(top_image) // Remove the top image so we can change it again
var/ingredient_num = length(ingredients)
ingredients += new_ingredients
for(var/obj/item/food/snacks/food as anything in new_ingredients)
for(var/obj/item/food/food as anything in new_ingredients)
ingredient_num++
var/image/ingredient_image
if(!fullycustom)
@@ -425,20 +425,20 @@ do {\
add_overlay(top_image)
/obj/item/food/snacks/customizable/Destroy()
/obj/item/food/customizable/Destroy()
QDEL_LIST_CONTENTS(ingredients)
qdel(top_image)
return ..()
/obj/item/food/snacks/customizable/examine(mob/user)
/obj/item/food/customizable/examine(mob/user)
. = ..()
if(LAZYLEN(ingredients))
var/whatsinside = pick(ingredients)
. += "<span class='notice'>You think you can see [whatsinside] in there.</span>"
/obj/item/food/snacks/customizable/proc/newname()
/obj/item/food/customizable/proc/newname()
var/unsorteditems[0]
var/sorteditems[0]
var/unsortedtypes[0]
@@ -456,8 +456,8 @@ do {\
continue
if(istype(ing, /obj/item/food/snacks/customizable)) // split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
var/obj/item/food/snacks/customizable/gettype = ing
if(istype(ing, /obj/item/food/customizable)) // split the ingredients into ones with basenames (sandwich, burger, etc) and ones without, keeping track of how many of each there are
var/obj/item/food/customizable/gettype = ing
if(unsortedtypes[gettype.basename])
unsortedtypes[gettype.basename]++
if(unsortedtypes[gettype.basename] > ct)
@@ -518,7 +518,7 @@ do {\
sendback = "[pick("absurd", "colossal", "enormous", "ridiculous", "massive", "oversized", "cardiac-arresting", "pipe-clogging", "edible but sickening", "sickening", "gargantuan", "mega", "belly-burster", "chest-burster")] [basename]"
return sendback
/obj/item/food/snacks/customizable/proc/sortlist(list/unsorted, highest)
/obj/item/food/customizable/proc/sortlist(list/unsorted, highest)
var/sorted[0]
for(var/i = 1, i<= highest, i++)
for(var/it in unsorted)
code/modules/food_and_drinks/food/foods/baked_goods.dm
+72 -72
View File
@@ -5,12 +5,12 @@
// Cakes //
//////////////////////
/obj/item/food/snacks/sliceable/carrotcake
/obj/item/food/sliceable/carrotcake
name = "carrot cake"
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "carrotcake"
slice_path = /obj/item/food/snacks/carrotcakeslice
slice_path = /obj/item/food/carrotcakeslice
slices_num = 5
bitesize = 3
filling_color = "#FFD675"
@@ -18,7 +18,7 @@
tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/carrotcakeslice
/obj/item/food/carrotcakeslice
name = "carrot cake slice"
desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -29,12 +29,12 @@
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/braincake
/obj/item/food/sliceable/braincake
name = "brain cake"
desc = "A squishy cake-thing."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "braincake"
slice_path = /obj/item/food/snacks/braincakeslice
slice_path = /obj/item/food/braincakeslice
slices_num = 5
filling_color = "#E6AEDB"
bitesize = 3
@@ -42,7 +42,7 @@
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/braincakeslice
/obj/item/food/braincakeslice
name = "brain cake slice"
desc = "Lemme tell you something about brains. THEY'RE DELICIOUS."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -52,12 +52,12 @@
tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/sliceable/cheesecake
/obj/item/food/sliceable/cheesecake
name = "cheese cake"
desc = "DANGEROUSLY cheesy."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "cheesecake"
slice_path = /obj/item/food/snacks/cheesecakeslice
slice_path = /obj/item/food/cheesecakeslice
slices_num = 5
filling_color = "#FAF7AF"
bitesize = 3
@@ -65,7 +65,7 @@
tastes = list("cake" = 4, "cream cheese" = 3)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/cheesecakeslice
/obj/item/food/cheesecakeslice
name = "cheese cake slice"
desc = "Slice of pure cheestisfaction."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -75,12 +75,12 @@
tastes = list("cake" = 4, "cream cheese" = 3)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/plaincake
/obj/item/food/sliceable/plaincake
name = "vanilla cake"
desc = "A plain cake, not a lie."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "plaincake"
slice_path = /obj/item/food/snacks/plaincakeslice
slice_path = /obj/item/food/plaincakeslice
slices_num = 5
bitesize = 3
filling_color = "#F7EDD5"
@@ -88,7 +88,7 @@
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/plaincakeslice
/obj/item/food/plaincakeslice
name = "vanilla cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -98,12 +98,12 @@
tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/orangecake
/obj/item/food/sliceable/orangecake
name = "orange cake"
desc = "A cake with added orange."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "orangecake"
slice_path = /obj/item/food/snacks/orangecakeslice
slice_path = /obj/item/food/orangecakeslice
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
@@ -111,7 +111,7 @@
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/orangecakeslice
/obj/item/food/orangecakeslice
name = "orange cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -121,12 +121,12 @@
tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/bananacake
/obj/item/food/sliceable/bananacake
name = "banana cake"
desc = "A cake with added bananas."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "bananacake"
slice_path = /obj/item/food/snacks/bananacakeslice
slice_path = /obj/item/food/bananacakeslice
slices_num = 5
bitesize = 3
filling_color = "#FADA8E"
@@ -134,7 +134,7 @@
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/bananacakeslice
/obj/item/food/bananacakeslice
name = "banana cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -144,20 +144,20 @@
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/limecake
/obj/item/food/sliceable/limecake
name = "lime cake"
desc = "A cake with added lime."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "limecake"
bitesize = 3
slice_path = /obj/item/food/snacks/limecakeslice
slice_path = /obj/item/food/limecakeslice
slices_num = 5
filling_color = "#CBFA8E"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/limecakeslice
/obj/item/food/limecakeslice
name = "lime cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -167,12 +167,12 @@
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/lemoncake
/obj/item/food/sliceable/lemoncake
name = "lemon cake"
desc = "A cake with added lemon."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "lemoncake"
slice_path = /obj/item/food/snacks/lemoncakeslice
slice_path = /obj/item/food/lemoncakeslice
slices_num = 5
bitesize = 3
filling_color = "#FAFA8E"
@@ -180,7 +180,7 @@
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/lemoncakeslice
/obj/item/food/lemoncakeslice
name = "lemon cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -190,12 +190,12 @@
tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/chocolatecake
/obj/item/food/sliceable/chocolatecake
name = "chocolate cake"
desc = "A cake with added chocolate."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "chocolatecake"
slice_path = /obj/item/food/snacks/chocolatecakeslice
slice_path = /obj/item/food/chocolatecakeslice
slices_num = 5
bitesize = 3
filling_color = "#805930"
@@ -203,7 +203,7 @@
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/chocolatecakeslice
/obj/item/food/chocolatecakeslice
name = "chocolate cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -213,12 +213,12 @@
tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/birthdaycake
/obj/item/food/sliceable/birthdaycake
name = "birthday cake"
desc = "Happy Birthday..."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "birthdaycake"
slice_path = /obj/item/food/snacks/birthdaycakeslice
slice_path = /obj/item/food/birthdaycakeslice
slices_num = 5
filling_color = "#FFD6D6"
bitesize = 3
@@ -226,7 +226,7 @@
tastes = list("cake" = 5, "sweetness" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/birthdaycakeslice
/obj/item/food/birthdaycakeslice
name = "birthday cake slice"
desc = "A slice of your birthday"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -236,12 +236,12 @@
tastes = list("cake" = 5, "sweetness" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/sliceable/applecake
/obj/item/food/sliceable/applecake
name = "apple cake"
desc = "A cake centered with Apple."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "applecake"
slice_path = /obj/item/food/snacks/applecakeslice
slice_path = /obj/item/food/applecakeslice
slices_num = 5
bitesize = 3
filling_color = "#EBF5B8"
@@ -249,7 +249,7 @@
tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/applecakeslice
/obj/item/food/applecakeslice
name = "apple cake slice"
desc = "A slice of heavenly cake."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -264,7 +264,7 @@
// Cookies //
//////////////////////
/obj/item/food/snacks/cookie
/obj/item/food/cookie
name = "cookie"
desc = "COOKIE!!!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -275,7 +275,7 @@
tastes = list("cookie" = 1, "crunchy chocolate" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/fortunecookie
/obj/item/food/fortunecookie
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -286,7 +286,7 @@
tastes = list("cookie" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/sugarcookie
/obj/item/food/sugarcookie
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -300,7 +300,7 @@
// Pies //
//////////////////////
/obj/item/food/snacks/pie
/obj/item/food/pie
name = "banana cream pie"
desc = "One of the five essential food groups of clowns."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -312,13 +312,13 @@
tastes = list("pie" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/pie/throw_impact(atom/hit_atom)
/obj/item/food/pie/throw_impact(atom/hit_atom)
..()
new/obj/effect/decal/cleanable/pie_smudge(loc)
visible_message("<span class='warning'>[src] splats.</span>","<span class='warning'>You hear a splat.</span>")
qdel(src)
/obj/item/food/snacks/meatpie
/obj/item/food/meatpie
name = "meat-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "meatpie"
@@ -330,7 +330,7 @@
tastes = list("pie" = 1, "meat" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/tofupie
/obj/item/food/tofupie
name = "tofu-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "meatpie"
@@ -342,7 +342,7 @@
tastes = list("pie" = 1, "tofu" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/amanita_pie
/obj/item/food/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -353,7 +353,7 @@
tastes = list("pie" = 1, "mushroom" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/plump_pie
/obj/item/food/plump_pie
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -364,14 +364,14 @@
tastes = list("pie" = 1, "mushroom" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/plump_pie/Initialize(mapload)
/obj/item/food/plump_pie/Initialize(mapload)
. = ..()
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" // What
reagents.add_reagent("omnizine", 5)
/obj/item/food/snacks/xemeatpie
/obj/item/food/xemeatpie
name = "xeno-pie"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "xenomeatpie"
@@ -383,7 +383,7 @@
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/applepie
/obj/item/food/applepie
name = "apple pie"
desc = "A pie containing sweet sweet love... or apple."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -395,7 +395,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/cherrypie
/obj/item/food/cherrypie
name = "cherry pie"
desc = "Taste so good, make a grown man cry."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -406,12 +406,12 @@
tastes = list("pie" = 1, "cherries" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/sliceable/pumpkinpie
/obj/item/food/sliceable/pumpkinpie
name = "pumpkin pie"
desc = "A delicious treat for the autumn months."
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "pumpkinpie"
slice_path = /obj/item/food/snacks/pumpkinpieslice
slice_path = /obj/item/food/pumpkinpieslice
slices_num = 5
bitesize = 3
filling_color = "#F5B951"
@@ -419,7 +419,7 @@
tastes = list("pie" = 1, "pumpkin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/pumpkinpieslice
/obj/item/food/pumpkinpieslice
name = "pumpkin pie slice"
desc = "A slice of pumpkin pie, with whipped cream on top. Perfection."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -433,7 +433,7 @@
// Donuts //
//////////////////////
/obj/item/food/snacks/donut
/obj/item/food/donut
name = "donut"
desc = "Goes great with Robust Coffee."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -446,7 +446,7 @@
var/donut_sprite_type = DONUT_NORMAL
tastes = list("donut" = 1)
/obj/item/food/snacks/donut/Initialize(mapload)
/obj/item/food/donut/Initialize(mapload)
. = ..()
if(randomized_sprinkles && prob(30))
icon_state = "donut2"
@@ -455,7 +455,7 @@
donut_sprite_type = DONUT_FROSTED
filling_color = "#FF69B4"
/obj/item/food/snacks/donut/sprinkles
/obj/item/food/donut/sprinkles
name = "frosted donut"
icon_state = "donut2"
list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2)
@@ -463,14 +463,14 @@
donut_sprite_type = DONUT_FROSTED
randomized_sprinkles = 0
/obj/item/food/snacks/donut/chaos
/obj/item/food/donut/chaos
name = "chaos donut"
desc = "Like life, it never quite tastes the same."
bitesize = 10
tastes = list("donut" = 3, "chaos" = 1)
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/snacks/donut/chaos/Initialize(mapload)
/obj/item/food/donut/chaos/Initialize(mapload)
. = ..()
extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
reagents.add_reagent("[extra_reagent]", 3)
@@ -480,7 +480,7 @@
reagents.add_reagent("sprinkles", 2)
filling_color = "#FF69B4"
/obj/item/food/snacks/donut/jelly
/obj/item/food/donut/jelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
@@ -488,7 +488,7 @@
tastes = list("jelly" = 1, "donut" = 3)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/donut/jelly/Initialize(mapload)
/obj/item/food/donut/jelly/Initialize(mapload)
. = ..()
if(extra_reagent)
reagents.add_reagent("[extra_reagent]", 3)
@@ -499,14 +499,14 @@
reagents.add_reagent("sprinkles", 2)
filling_color = "#FF69B4"
/obj/item/food/snacks/donut/jelly/slimejelly
/obj/item/food/donut/jelly/slimejelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
extra_reagent = "slimejelly"
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/snacks/donut/jelly/cherryjelly
/obj/item/food/donut/jelly/cherryjelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
@@ -516,7 +516,7 @@
// Pancakes //
//////////////////////
/obj/item/food/snacks/pancake
/obj/item/food/pancake
name = "pancake"
desc = "A plain pancake."
icon = 'icons/obj/food/breakfast.dmi'
@@ -527,7 +527,7 @@
tastes = list("sweet cake" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/pancake/attack_tk(mob/user)
/obj/item/food/pancake/attack_tk(mob/user)
if(src in user.tkgrabbed_objects)
to_chat(user, "<span class='notice'>You start channeling psychic energy into [src].</span>")
visible_message("<span class='danger'>The syrup on [src] starts to boil...</span>")
@@ -542,7 +542,7 @@
return
return ..()
/obj/item/food/snacks/pancake/berry_pancake
/obj/item/food/pancake/berry_pancake
name = "berry pancake"
desc = "A pancake loaded with berries."
icon_state = "berry_pancake"
@@ -550,7 +550,7 @@
tastes = list("sweet cake" = 2, "berries" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/pancake/choc_chip_pancake
/obj/item/food/pancake/choc_chip_pancake
name = "choc-chip pancake"
desc = "A pancake loaded with chocolate chips."
icon_state = "choc_chip_pancake"
@@ -562,7 +562,7 @@
// Misc //
//////////////////////
/obj/item/food/snacks/muffin
/obj/item/food/muffin
name = "muffin"
desc = "A delicious and spongy little cake."
icon = 'icons/obj/food/breakfast.dmi'
@@ -572,7 +572,7 @@
tastes = list("muffin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/berryclafoutis
/obj/item/food/berryclafoutis
name = "berry clafoutis"
desc = "No black birds, this is a good sign."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -584,7 +584,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/poppypretzel
/obj/item/food/poppypretzel
name = "poppy pretzel"
desc = "A large soft pretzel full of POP! It's all twisted up!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -594,7 +594,7 @@
tastes = list("pretzel" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/plumphelmetbiscuit
/obj/item/food/plumphelmetbiscuit
name = "plump helmet biscuit"
desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
icon = 'icons/obj/food/breakfast.dmi'
@@ -604,14 +604,14 @@
tastes = list("mushroom" = 1, "biscuit" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/plumphelmetbiscuit/Initialize(mapload)
/obj/item/food/plumphelmetbiscuit/Initialize(mapload)
. = ..()
if(prob(10))
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" // Is this a reference?
reagents.add_reagent("omnizine", 5)
/obj/item/food/snacks/appletart
/obj/item/food/appletart
name = "golden apple streusel tart"
desc = "A tasty dessert that won't make it through a metal detector."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -624,7 +624,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/cracker
/obj/item/food/cracker
name = "cracker"
desc = "It's a salted cracker."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -635,7 +635,7 @@
tastes = list("cracker" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/croissant
/obj/item/food/croissant
name = "croissant"
desc = "Once a pastry reserved for the bourgeois, this flaky goodness is now on your table."
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -646,13 +646,13 @@
tastes = list("croissant" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/croissant/throwing
/obj/item/food/croissant/throwing
throwforce = 20
throw_range = 9 //now with extra throwing action
tastes = list("croissant" = 2, "butter" = 1, "metal" = 1)
list_reagents = list("nutriment" = 4, "sugar" = 2, "iron" = 1)
/obj/item/food/snacks/croissant/throwing/Initialize(mapload)
/obj/item/food/croissant/throwing/Initialize(mapload)
. = ..()
AddComponent(/datum/component/boomerang, throw_range, TRUE)
code/modules/food_and_drinks/food/foods/bread.dm
+36 -36
View File
@@ -3,19 +3,19 @@
// Breads //
//////////////////////
/obj/item/food/snacks/sliceable/meatbread
/obj/item/food/sliceable/meatbread
name = "meatbread loaf"
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "meatbread"
slice_path = /obj/item/food/snacks/meatbreadslice
slice_path = /obj/item/food/meatbreadslice
slices_num = 5
filling_color = "#FF7575"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "meat" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/meatbreadslice
/obj/item/food/meatbreadslice
name = "meatbread slice"
desc = "A slice of delicious meatbread."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -23,19 +23,19 @@
filling_color = "#FF7575"
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/xenomeatbread
/obj/item/food/sliceable/xenomeatbread
name = "xenomeatbread loaf"
desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "xenomeatbread"
slice_path = /obj/item/food/snacks/xenomeatbreadslice
slice_path = /obj/item/food/xenomeatbreadslice
slices_num = 5
filling_color = "#8AFF75"
list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5)
tastes = list("bread" = 10, "acid" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/xenomeatbreadslice
/obj/item/food/xenomeatbreadslice
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -43,18 +43,18 @@
filling_color = "#8AFF75"
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/sliceable/spidermeatbread
/obj/item/food/sliceable/spidermeatbread
name = "spider meat loaf"
desc = "Reassuringly green meatloaf made from spider meat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "spidermeatbread"
slice_path = /obj/item/food/snacks/spidermeatbreadslice
slice_path = /obj/item/food/spidermeatbreadslice
slices_num = 5
list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5)
tastes = list("bread" = 10, "cobwebs" = 5)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/spidermeatbreadslice
/obj/item/food/spidermeatbreadslice
name = "spider meat bread slice"
desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -63,19 +63,19 @@
list_reagents = list("toxin" = 2)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/sliceable/bananabread
/obj/item/food/sliceable/bananabread
name = "banana-nut bread"
desc = "A heavenly and filling treat."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bananabread"
slice_path = /obj/item/food/snacks/bananabreadslice
slice_path = /obj/item/food/bananabreadslice
slices_num = 5
filling_color = "#EDE5AD"
list_reagents = list("banana" = 20, "nutriment" = 20)
tastes = list("bread" = 10, "banana" = 5)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/bananabreadslice
/obj/item/food/bananabreadslice
name = "banana-nut bread slice"
desc = "A slice of delicious banana bread."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -84,19 +84,19 @@
tastes = list("bread" = 10, "banana" = 5)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/tofubread
/obj/item/food/sliceable/tofubread
name = "tofubread"
desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubread"
slice_path = /obj/item/food/snacks/tofubreadslice
slice_path = /obj/item/food/tofubreadslice
slices_num = 5
filling_color = "#F7FFE0"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "tofu" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/tofubreadslice
/obj/item/food/tofubreadslice
name = "tofubread slice"
desc = "A slice of delicious tofubread."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -104,19 +104,19 @@
filling_color = "#F7FFE0"
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/bread
/obj/item/food/sliceable/bread
name = "bread"
desc = "Some plain old Earthen bread."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bread"
slice_path = /obj/item/food/snacks/breadslice
slice_path = /obj/item/food/breadslice
slices_num = 6
filling_color = "#FFE396"
list_reagents = list("nutriment" = 10)
tastes = list("bread" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/breadslice
/obj/item/food/breadslice
name = "bread slice"
desc = "A slice of home."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -126,19 +126,19 @@
tastes = list("bread" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/creamcheesebread
/obj/item/food/sliceable/creamcheesebread
name = "cream cheese bread"
desc = "Yum yum yum!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "creamcheesebread"
slice_path = /obj/item/food/snacks/creamcheesebreadslice
slice_path = /obj/item/food/creamcheesebreadslice
slices_num = 5
filling_color = "#FFF896"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("bread" = 10, "cheese" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/creamcheesebreadslice
/obj/item/food/creamcheesebreadslice
name = "cream cheese bread slice"
desc = "A slice of yum!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -148,19 +148,19 @@
tastes = list("bread" = 10, "cheese" = 10)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/banarnarbread
/obj/item/food/sliceable/banarnarbread
name = "banarnarbread loaf"
desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "banarnarbread"
slice_path = /obj/item/food/snacks/banarnarbreadslice
slice_path = /obj/item/food/banarnarbreadslice
slices_num = 5
filling_color = "#6F0000"
list_reagents = list("nutriment" = 20, "vitamin" = 5)
tastes = list("heresy" = 10, "banana" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/banarnarbreadslice
/obj/item/food/banarnarbreadslice
name = "banarnarbread slice"
desc = "A slice of delicious mah'weyh pleggh at e'ntrath!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -175,7 +175,7 @@
// Misc //
//////////////////////
/obj/item/food/snacks/bun
/obj/item/food/bun
name = "bun"
desc = "The base for any self-respecting burger."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -185,7 +185,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/flatbread
/obj/item/food/flatbread
name = "flatbread"
desc = "Bland but filling."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -194,7 +194,7 @@
tastes = list("bread" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/baguette
/obj/item/food/baguette
name = "baguette"
desc = "Bon appetit!"
icon = 'icons/obj/food/bakedgoods.dmi'
@@ -207,15 +207,15 @@
tastes = list("bread" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/baguette/combat
/obj/item/food/baguette/combat
sharp = TRUE
force = 20
/obj/item/food/snacks/baguette/combat/Initialize(mapload)
/obj/item/food/baguette/combat/Initialize(mapload)
. = ..()
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES)
/obj/item/food/snacks/twobread
/obj/item/food/twobread
name = "two bread"
desc = "It is very bitter and winy."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -226,7 +226,7 @@
tastes = list("bread" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/toast
/obj/item/food/toast
name = "toast"
desc = "Yeah! Toast!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -237,7 +237,7 @@
tastes = list("toast" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/jelliedtoast
/obj/item/food/jelliedtoast
name = "jellied toast"
desc = "A slice of bread covered with delicious jam."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -246,15 +246,15 @@
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
/obj/item/food/snacks/jelliedtoast/cherry
/obj/item/food/jelliedtoast/cherry
list_reagents = list("nutriment" = 1, "cherryjelly" = 5, "vitamin" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/jelliedtoast/slime
/obj/item/food/jelliedtoast/slime
list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/rofflewaffles
/obj/item/food/rofflewaffles
name = "roffle waffles"
desc = "Waffles from Roffle. Co."
icon = 'icons/obj/food/breakfast.dmi'
@@ -266,7 +266,7 @@
tastes = list("waffle" = 1, "mushrooms" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/waffles
/obj/item/food/waffles
name = "waffles"
desc = "Mmm, waffles."
icon = 'icons/obj/food/breakfast.dmi'
code/modules/food_and_drinks/food/foods/candy.dm
+69 -69
View File
@@ -7,7 +7,7 @@
//Candy / Candy Ingredients
//Subclass so we can pass on values
/obj/item/food/snacks/candy
/obj/item/food/candy
name = "generic candy"
desc = "It's placeholder flavored. This shouldn't be seen."
icon = 'icons/obj/food/candy.dmi'
@@ -19,7 +19,7 @@
// Candy Ingredients / Flavorings / Byproduct
// ***********************************************************
/obj/item/food/snacks/candy/caramel
/obj/item/food/candy/caramel
name = "caramel"
desc = "Chewy and dense, yet it practically melts in your mouth!"
icon_state = "caramel"
@@ -28,7 +28,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/toffee
/obj/item/food/candy/toffee
name = "toffee"
desc = "A hard, brittle candy with a distinctive taste."
icon_state = "toffee"
@@ -36,7 +36,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 3)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/nougat
/obj/item/food/candy/nougat
name = "nougat"
desc = "A soft, chewy candy commonly found in candybars."
icon_state = "nougat"
@@ -44,7 +44,7 @@
list_reagents = list("nutriment" = 3, "sugar" = 3)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/taffy
/obj/item/food/candy/taffy
name = "saltwater taffy"
desc = "Old fashioned saltwater taffy. Chewy!"
icon_state = "candy1"
@@ -52,11 +52,11 @@
list_reagents = list("nutriment" = 3, "sugar" = 3)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/taffy/Initialize(mapload)
/obj/item/food/candy/taffy/Initialize(mapload)
. = ..()
icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5")
/obj/item/food/snacks/candy/fudge
/obj/item/food/candy/fudge
name = "fudge"
desc = "Chocolate fudge, a timeless classic treat."
icon_state = "fudge"
@@ -65,21 +65,21 @@
list_reagents = list("cream" = 3, "chocolate" = 6)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/fudge/peanut
/obj/item/food/candy/fudge/peanut
name = "peanut fudge"
desc = "Chocolate fudge, with bits of peanuts mixed in. People with nut allergies shouldn't eat this."
icon_state = "fudge_peanut"
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/fudge/cherry
/obj/item/food/candy/fudge/cherry
name = "chocolate cherry fudge"
desc = "Chocolate fudge surrounding sweet cherries. Good for tricking kids into eating some fruit."
icon_state = "fudge_cherry"
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/fudge/cookies_n_cream
/obj/item/food/candy/fudge/cookies_n_cream
name = "cookies 'n' cream fudge"
desc = "An extra creamy fudge with bits of real chocolate cookie mixed in. Crunchy!"
icon_state = "fudge_cookies_n_cream"
@@ -87,7 +87,7 @@
list_reagents = list("cream" = 6, "chocolate" = 6)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/fudge/turtle
/obj/item/food/candy/fudge/turtle
name = "turtle fudge"
desc = "Chocolate fudge with caramel and nuts. It doesn't contain real turtles, thankfully."
icon_state = "fudge_turtle"
@@ -98,14 +98,14 @@
// Candy Products (Pre-existing)
// ***********************************************************
/obj/item/food/snacks/candy/donor
/obj/item/food/candy/donor
name = "donor candy"
desc = "A little treat for blood donors."
trash = /obj/item/trash/candy
bitesize = 5
list_reagents = list("nutriment" = 10, "sugar" = 3)
/obj/item/food/snacks/candy/candy_corn
/obj/item/food/candy/candy_corn
name = "candy corn"
desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
icon_state = "candycorn"
@@ -117,7 +117,7 @@
// Candy Products (plain / unflavored)
// ***********************************************************
/obj/item/food/snacks/candy/cotton
/obj/item/food/candy/cotton
name = "cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_plain"
@@ -127,7 +127,7 @@
list_reagents = list("sugar" = 15)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/candy/candybar
/obj/item/food/candy/candybar
name = "candy"
desc = "A chocolate candybar, wrapped in a bit of foil."
icon_state = "candy"
@@ -141,7 +141,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/candycane
/obj/item/food/candy/candycane
name = "candy cane"
desc = "A festive mint candy cane."
icon_state = "candycane"
@@ -149,7 +149,7 @@
list_reagents = list("minttoxin" = 1, "sugar" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummybear
/obj/item/food/candy/gummybear
name = "gummy bear"
desc = "A small edible bear. It's squishy and chewy!"
icon_state = "gbear"
@@ -158,7 +158,7 @@
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/candy/gummyworm
/obj/item/food/candy/gummyworm
name = "gummy worm"
desc = "An edible worm, made from gelatin."
icon_state = "gworm"
@@ -167,7 +167,7 @@
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/candy/jellybean
/obj/item/food/candy/jellybean
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas."
icon_state = "jbean"
@@ -176,7 +176,7 @@
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/candy/jawbreaker
/obj/item/food/candy/jawbreaker
name = "jawbreaker"
desc = "An unbelievably hard candy. The name is fitting."
icon_state = "jawbreaker"
@@ -185,7 +185,7 @@
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cash
/obj/item/food/candy/cash
name = "candy cash"
desc = "Not legal tender. Tasty though."
icon_state = "candy_cash"
@@ -195,7 +195,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/coin
/obj/item/food/candy/coin
name = "chocolate coin"
desc = "Probably won't work in the vending machines."
icon_state = "choc_coin"
@@ -206,7 +206,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gum
/obj/item/food/candy/gum
name = "bubblegum"
desc = "Chewy!"
icon_state = "bubblegum"
@@ -216,7 +216,7 @@
list_reagents = list("sugar" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/sucker
/obj/item/food/candy/sucker
name = "sucker"
desc = "For being such a good sport!"
icon_state = "sucker"
@@ -228,7 +228,7 @@
// Gummy Bear Flavors
// ***********************************************************
/obj/item/food/snacks/candy/gummybear/red
/obj/item/food/candy/gummybear/red
name = "red gummy bear"
desc = "A small edible bear. It's red!"
icon_state = "gbear_red"
@@ -236,7 +236,7 @@
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummybear/blue
/obj/item/food/candy/gummybear/blue
name = "blue gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
@@ -244,14 +244,14 @@
list_reagents = list("sugar" = 10, "berryjuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummybear/poison
/obj/item/food/candy/gummybear/poison
name = "blue gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
/obj/item/food/snacks/candy/gummybear/green
/obj/item/food/candy/gummybear/green
name = "green gummy bear"
desc = "A small edible bear. It's green!"
icon_state = "gbear_green"
@@ -259,7 +259,7 @@
list_reagents = list("sugar" = 10, "limejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummybear/yellow
/obj/item/food/candy/gummybear/yellow
name = "yellow gummy bear"
desc = "A small edible bear. It's yellow!"
icon_state = "gbear_yellow"
@@ -267,7 +267,7 @@
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummybear/orange
/obj/item/food/candy/gummybear/orange
name = "orange gummy bear"
desc = "A small edible bear. It's orange!"
icon_state = "gbear_orange"
@@ -275,7 +275,7 @@
list_reagents = list("sugar" = 10, "orangejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummybear/purple
/obj/item/food/candy/gummybear/purple
name = "purple gummy bear"
desc = "A small edible bear. It's purple!"
icon_state = "gbear_purple"
@@ -283,7 +283,7 @@
list_reagents = list("sugar" = 10, "grapejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummybear/wtf
/obj/item/food/candy/gummybear/wtf
name = "rainbow gummy bear"
desc = "A small bear. Wait... what?"
icon_state = "gbear_rainbow"
@@ -295,7 +295,7 @@
// Gummy Worm Flavors
// ***********************************************************
/obj/item/food/snacks/candy/gummyworm/red
/obj/item/food/candy/gummyworm/red
name = "red gummy worm"
desc = "An edible worm, made from gelatin. It's red!"
icon_state = "gworm_red"
@@ -303,7 +303,7 @@
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummyworm/blue
/obj/item/food/candy/gummyworm/blue
name = "blue gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
@@ -311,14 +311,14 @@
list_reagents = list("sugar" = 10, "berryjuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummyworm/poison
/obj/item/food/candy/gummyworm/poison
name = "blue gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
/obj/item/food/snacks/candy/gummyworm/green
/obj/item/food/candy/gummyworm/green
name = "green gummy worm"
desc = "An edible worm, made from gelatin. It's green!"
icon_state = "gworm_green"
@@ -326,7 +326,7 @@
list_reagents = list("sugar" = 10, "limejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummyworm/yellow
/obj/item/food/candy/gummyworm/yellow
name = "yellow gummy worm"
desc = "An edible worm, made from gelatin. It's yellow!"
icon_state = "gworm_yellow"
@@ -334,7 +334,7 @@
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummyworm/orange
/obj/item/food/candy/gummyworm/orange
name = "orange gummy worm"
desc = "An edible worm, made from gelatin. It's orange!"
icon_state = "gworm_orange"
@@ -342,7 +342,7 @@
list_reagents = list("sugar" = 10, "orangejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummyworm/purple
/obj/item/food/candy/gummyworm/purple
name = "purple gummy worm"
desc = "An edible worm, made from gelatin. It's purple!"
icon_state = "gworm_purple"
@@ -350,7 +350,7 @@
list_reagents = list("sugar" = 10, "grapejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/gummyworm/wtf
/obj/item/food/candy/gummyworm/wtf
name = "rainbow gummy worm"
desc = "An edible worm. Did it just move?"
icon_state = "gworm_rainbow"
@@ -362,7 +362,7 @@
// Jelly Bean Flavors
// ***********************************************************
/obj/item/food/snacks/candy/jellybean/red
/obj/item/food/candy/jellybean/red
name = "red jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's red!"
icon_state = "jbean_red"
@@ -370,7 +370,7 @@
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/blue
/obj/item/food/candy/jellybean/blue
name = "blue jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
@@ -378,14 +378,14 @@
list_reagents = list("sugar" = 10, "berryjuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/poison
/obj/item/food/candy/jellybean/poison
name = "blue jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 12)
/obj/item/food/snacks/candy/jellybean/green
/obj/item/food/candy/jellybean/green
name = "green jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's green!"
icon_state = "jbean_green"
@@ -393,7 +393,7 @@
list_reagents = list("sugar" = 10, "limejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/yellow
/obj/item/food/candy/jellybean/yellow
name = "yellow jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's yellow!"
icon_state = "jbean_yellow"
@@ -401,7 +401,7 @@
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/orange
/obj/item/food/candy/jellybean/orange
name = "orange jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's orange!"
icon_state = "jbean_orange"
@@ -409,7 +409,7 @@
list_reagents = list("sugar" = 10, "orangejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/purple
/obj/item/food/candy/jellybean/purple
name = "purple jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's purple!"
icon_state = "jbean_purple"
@@ -417,7 +417,7 @@
list_reagents = list("sugar" = 10, "grapejuice" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/chocolate
/obj/item/food/candy/jellybean/chocolate
name = "chocolate jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's chocolate!"
icon_state = "jbean_choc"
@@ -425,7 +425,7 @@
list_reagents = list("sugar" = 10, "chocolate" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/popcorn
/obj/item/food/candy/jellybean/popcorn
name = "popcorn jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's popcorn flavored!"
icon_state = "jbean_popcorn"
@@ -433,7 +433,7 @@
list_reagents = list("sugar" = 10, "nutriment" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/cola
/obj/item/food/candy/jellybean/cola
name = "cola jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Cola flavored!"
icon_state = "jbean_cola"
@@ -441,7 +441,7 @@
list_reagents = list("sugar" = 10, "cola" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/drgibb
/obj/item/food/candy/jellybean/drgibb
name = "\improper Dr. Gibb jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Dr. Gibb flavored!"
icon_state = "jbean_cola"
@@ -449,7 +449,7 @@
list_reagents = list("sugar" = 10, "dr_gibb" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/coffee
/obj/item/food/candy/jellybean/coffee
name = "coffee jelly bean"
desc = "A candy bean, guaranteed to not give you gas. It's Coffee flavored!"
icon_state = "jbean_choc"
@@ -457,7 +457,7 @@
list_reagents = list("sugar" = 10, "coffee" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/jellybean/wtf
/obj/item/food/candy/jellybean/wtf
name = "rainbow jelly bean"
desc = "A candy bean, guaranteed to not give you gas. You aren't sure what color it is."
icon_state = "jbean_rainbow"
@@ -469,7 +469,7 @@
// Cotton Candy Flavors
// ***********************************************************
/obj/item/food/snacks/candy/cotton/red
/obj/item/food/candy/cotton/red
name = "red cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_red"
@@ -478,7 +478,7 @@
list_reagents = list("sugar" = 15, "cherryjelly" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cotton/blue
/obj/item/food/candy/cotton/blue
name = "blue cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
@@ -487,7 +487,7 @@
list_reagents = list("sugar" = 15, "berryjuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cotton/poison
/obj/item/food/candy/cotton/poison
name = "blue cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
@@ -495,7 +495,7 @@
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 20)
/obj/item/food/snacks/candy/cotton/green
/obj/item/food/candy/cotton/green
name = "green cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_green"
@@ -504,7 +504,7 @@
list_reagents = list("sugar" = 15, "limejuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cotton/yellow
/obj/item/food/candy/cotton/yellow
name = "yellow cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_yellow"
@@ -513,7 +513,7 @@
list_reagents = list("sugar" = 15, "lemonjuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cotton/orange
/obj/item/food/candy/cotton/orange
name = "orange cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_orange"
@@ -522,7 +522,7 @@
list_reagents = list("sugar" = 15, "orangejuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cotton/purple
/obj/item/food/candy/cotton/purple
name = "purple cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_purple"
@@ -531,7 +531,7 @@
list_reagents = list("sugar" = 15, "grapejuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cotton/pink
/obj/item/food/candy/cotton/pink
name = "pink cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_pink"
@@ -540,7 +540,7 @@
list_reagents = list("sugar" = 15, "watermelonjuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/cotton/rainbow
/obj/item/food/candy/cotton/rainbow
name = "rainbow cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
@@ -549,7 +549,7 @@
list_reagents = list("omnizine" = 20)
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/snacks/candy/cotton/bad_rainbow
/obj/item/food/candy/cotton/bad_rainbow
name = "rainbow cotton candy"
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
@@ -561,10 +561,10 @@
// Candybar Flavors
// ***********************************************************
/obj/item/food/snacks/candy/confectionery
/obj/item/food/candy/confectionery
list_reagents = list("nutriment" = 1, "chocolate" = 1)
/obj/item/food/snacks/candy/confectionery/rice
/obj/item/food/candy/confectionery/rice
name = "Asteroid Crunch Bar"
desc = "Crunchy rice deposits in delicious chocolate! A favorite of miners galaxy-wide."
icon_state = "asteroidcrunch"
@@ -572,28 +572,28 @@
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/confectionery/toffee
/obj/item/food/candy/confectionery/toffee
name = "Yum-Baton Bar"
desc = "Chocolate and toffee in the shape of a baton. Security sure knows how to pound these down!"
icon_state = "yumbaton"
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/confectionery/caramel
/obj/item/food/candy/confectionery/caramel
name = "Malper Bar"
desc = "A chocolate syringe filled with a caramel injection. Just what the doctor ordered!"
icon_state = "malper"
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/confectionery/caramel_nougat
/obj/item/food/candy/confectionery/caramel_nougat
name = "Toxins Test Bar"
desc = "An explosive combination of chocolate, caramel, and nougat. Research has never been so tasty!"
icon_state = "toxinstest"
filling_color = "#7D5F46"
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candy/confectionery/nougat
/obj/item/food/candy/confectionery/nougat
name = "Tool-erone Bar"
desc = "Chocolate-covered nougat, shaped like a wrench. Great for an engineer on the go!"
icon_state = "toolerone"
code/modules/food_and_drinks/food/foods/desserts.dm
+6 -6
View File
@@ -2,14 +2,14 @@
// Misc //
//////////////////////
/obj/item/food/snacks/friedbanana
/obj/item/food/friedbanana
name = "fried banana"
desc = "Goreng Pisang, also known as fried bananas."
icon_state = "friedbanana"
list_reagents = list("sugar" = 5, "nutriment" = 8, "cornoil" = 4)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/ricepudding
/obj/item/food/ricepudding
name = "rice pudding"
desc = "Where's the Jam!"
icon_state = "rpudding"
@@ -19,7 +19,7 @@
tastes = list("rice" = 1, "sweetness" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/spacylibertyduff
/obj/item/food/spacylibertyduff
name = "spacy liberty duff"
desc = "Jello gelatin, from Alfred Hubbard's cookbook."
icon_state = "spacylibertyduff"
@@ -30,7 +30,7 @@
tastes = list("jelly" = 1, "mushroom" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/amanitajelly
/obj/item/food/amanitajelly
name = "amanita jelly"
desc = "Looks curiously toxic."
icon_state = "amanitajelly"
@@ -41,7 +41,7 @@
tastes = list("jelly" = 1, "mushroom" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/candiedapple
/obj/item/food/candiedapple
name = "candied apple"
desc = "An apple coated in sugary sweetness."
icon_state = "candiedapple"
@@ -51,7 +51,7 @@
tastes = list("apple" = 2, "sweetness" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/mint
/obj/item/food/mint
name = "mint"
desc = "it is only wafer thin."
icon_state = "mint"
code/modules/food_and_drinks/food/foods/ethnic.dm
+17 -17
View File
@@ -3,7 +3,7 @@
// Mexican //
//////////////////////
/obj/item/food/snacks/taco
/obj/item/food/taco
name = "taco"
desc = "Take a bite!"
icon_state = "taco"
@@ -12,7 +12,7 @@
tastes = list("taco" = 4, "meat" = 2, "cheese" = 2, "lettuce" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burrito
/obj/item/food/burrito
name = "burrito"
desc = "Meat, beans, cheese, and rice wrapped up as an easy-to-hold meal."
icon_state = "burrito"
@@ -23,7 +23,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/chimichanga
/obj/item/food/chimichanga
name = "chimichanga"
desc = "Time to eat a chimi-f***ing-changa."
icon_state = "chimichanga"
@@ -32,7 +32,7 @@
list_reagents = list("omnizine" = 4, "cheese" = 2) //Deadpool reference. Deal with it.
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/enchiladas
/obj/item/food/enchiladas
name = "enchiladas"
desc = "Viva la Mexico!"
icon_state = "enchiladas"
@@ -43,7 +43,7 @@
tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/cornchips
/obj/item/food/cornchips
name = "corn chips"
desc = "Goes great with salsa! OLE!"
icon_state = "chips"
@@ -58,7 +58,7 @@
// Chinese //
//////////////////////
/obj/item/food/snacks/chinese/chowmein
/obj/item/food/chinese/chowmein
name = "chow mein"
desc = "What is in this anyways?"
icon_state = "chinese1"
@@ -67,7 +67,7 @@
list_reagents = list("nutriment" = 1, "beans" = 3, "msg" = 4, "sugar" = 2)
tastes = list("noodle" = 1, "vegetables" = 1)
/obj/item/food/snacks/chinese/sweetsourchickenball
/obj/item/food/chinese/sweetsourchickenball
name = "sweet & sour chicken balls"
desc = "Is this chicken cooked? The odds are better than wok paper scissors."
icon = 'icons/obj/food/meat.dmi'
@@ -77,7 +77,7 @@
list_reagents = list("nutriment" = 2, "msg" = 4, "sugar" = 2)
tastes = list("chicken" = 1, "sweetness" = 1)
/obj/item/food/snacks/chinese/tao
/obj/item/food/chinese/tao
name = "Admiral Yamamoto carp"
desc = "Tastes like chicken."
icon_state = "chinese2"
@@ -86,7 +86,7 @@
list_reagents = list("nutriment" = 1, "protein" = 1, "msg" = 4, "sugar" = 4)
tastes = list("chicken" = 1)
/obj/item/food/snacks/chinese/newdles
/obj/item/food/chinese/newdles
name = "chinese newdles"
desc = "Made fresh, weekly!"
icon_state = "chinese3"
@@ -95,7 +95,7 @@
list_reagents = list("nutriment" = 1, "msg" = 4, "sugar" = 3)
tastes = list("noodles" = 1)
/obj/item/food/snacks/chinese/rice
/obj/item/food/chinese/rice
name = "fried rice"
desc = "A timeless classic."
icon_state = "chinese4"
@@ -110,7 +110,7 @@
// Japanese //
//////////////////////
/obj/item/food/snacks/chawanmushi
/obj/item/food/chawanmushi
name = "chawanmushi"
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
@@ -120,7 +120,7 @@
tastes = list("custard" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/yakiimo
/obj/item/food/yakiimo
name = "yaki imo"
desc = "Made with roasted sweet potatoes!"
icon_state = "yakiimo"
@@ -135,7 +135,7 @@
// Middle Eastern //
//////////////////////
/obj/item/food/snacks/meatkebab
/obj/item/food/meatkebab
name = "meat-kebab"
desc = "Delicious meat, on a stick."
icon_state = "kebab"
@@ -144,7 +144,7 @@
list_reagents = list("nutriment" = 8)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/syntikebab
/obj/item/food/syntikebab
name = "synthimeat-kebab"
desc = "Delicious synthetic meat, on a stick."
icon_state = "kebab"
@@ -152,7 +152,7 @@
filling_color = "#A85340"
list_reagents = list("nutriment" = 8)
/obj/item/food/snacks/human/kebab
/obj/item/food/human/kebab
name = "-kebab"
desc = "Human meat, on a stick."
icon_state = "kebab"
@@ -160,7 +160,7 @@
filling_color = "#A85340"
list_reagents = list("nutriment" = 8)
/obj/item/food/snacks/tofukebab
/obj/item/food/tofukebab
name = "tofu-kebab"
desc = "Vegan meat, on a stick."
icon_state = "kebab"
@@ -169,7 +169,7 @@
list_reagents = list("nutriment" = 8)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/picoss_kebab
/obj/item/food/picoss_kebab
name = "picoss-kebab"
desc = "A popular Moghes street food consisting of vinegar-marinated space carp on a skewer with onion and chillis."
icon_state = "picoss_skewer"
code/modules/food_and_drinks/food/foods/frozen.dm
+44 -44
View File
@@ -5,25 +5,25 @@
//Abstract item for inheritence.
/obj/item/food/snacks/frozen
/obj/item/food/frozen
name = "frozen treat"
desc = "If you got this, something broke! Contact a coder if this somehow spawns."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "flavorless_sc"
/obj/item/food/snacks/sliceable/clowncake
/obj/item/food/sliceable/clowncake
name = "clown cake"
desc = "A funny cake with a clown face on it."
icon = 'icons/obj/food/frozen_treats.dmi'
icon_state = "clowncake"
slice_path = /obj/item/food/snacks/frozen/clowncakeslice
slice_path = /obj/item/food/frozen/clowncakeslice
slices_num = 5
bitesize = 3
list_reagents = list("nutriment" = 20, "sugar" = 5, "vitamin" = 5, "banana" = 15)
tastes = list("cake" = 5, "sweetness" = 2, "banana" = 1, "sad clowns" = 1, "ice-cream" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/frozen/clowncakeslice
/obj/item/food/frozen/clowncakeslice
name = "clown cake slice"
desc = "A slice of bad jokes, and silly props."
icon_state = "clowncake_slice"
@@ -37,7 +37,7 @@
// Ice Cream //
//////////////////
/obj/item/food/snacks/frozen/icecream
/obj/item/food/frozen/icecream
name = "ice cream"
desc = "Delicious ice cream."
icon_state = "icecream_cone"
@@ -45,11 +45,11 @@
list_reagents = list("nutriment" = 1, "sugar" = 1)
tastes = list("ice cream" = 1)
/obj/item/food/snacks/frozen/icecream/Initialize(mapload)
/obj/item/food/frozen/icecream/Initialize(mapload)
. = ..()
update_icon(UPDATE_OVERLAYS)
/obj/item/food/snacks/frozen/icecream/update_overlays()
/obj/item/food/frozen/icecream/update_overlays()
. = ..()
var/mutable_appearance/filling = mutable_appearance('icons/obj/food/frozen_treats.dmi', "icecream_color")
var/list/reagent_colors = rgb2num(mix_color_from_reagents(reagents.reagent_list), COLORSPACE_HSV) //switching to HSV colorspace lets us easily manipulate the saturation and brightness independently
@@ -57,7 +57,7 @@
filling.color = rgb(reagent_colors[1], ((1.5 * reagent_colors[2]) - 10), (clamp(reagent_colors[3], 85, 100) - 10), space = COLORSPACE_HSV)
. += filling
/obj/item/food/snacks/frozen/icecream/icecreamcone
/obj/item/food/frozen/icecream/icecreamcone
name = "ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone"
@@ -65,7 +65,7 @@
bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
/obj/item/food/snacks/frozen/icecream/wafflecone
/obj/item/food/frozen/icecream/wafflecone
name = "ice cream in a waffle cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone_waffle"
@@ -73,7 +73,7 @@
bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
/obj/item/food/snacks/frozen/icecream/icecreamcup
/obj/item/food/frozen/icecream/icecreamcup
name = "chocolate ice cream cone"
desc = "Delicious ice cream."
icon_state = "icecream_cone_chocolate"
@@ -81,7 +81,7 @@
bitesize = 3
list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2)
/obj/item/food/snacks/wafflecone
/obj/item/food/wafflecone
name = "waffle cone"
desc = "Delicious waffle cone, but no ice cream."
icon = 'icons/obj/food/frozen_treats.dmi'
@@ -89,7 +89,7 @@
list_reagents = list("nutriment" = 5)
tastes = list("cream" = 2, "waffle" = 1)
/obj/item/food/snacks/frozen/icecreamsandwich
/obj/item/food/frozen/icecreamsandwich
name = "icecream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "icecreamsandwich"
@@ -97,7 +97,7 @@
tastes = list("ice cream" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/berryicecreamsandwich
/obj/item/food/frozen/berryicecreamsandwich
name = "strawberry icecream sandwich"
desc = "Portable ice cream in its own packaging."
icon_state = "strawberryicecreamsandwich"
@@ -105,7 +105,7 @@
tastes = list("ice cream" = 1, "strawberry" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/sundae
/obj/item/food/frozen/sundae
name = "sundae"
desc = "A classic dessert."
icon_state = "sundae"
@@ -113,7 +113,7 @@
tastes = list("ice cream" = 1, "banana" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/honkdae
/obj/item/food/frozen/honkdae
name = "honkdae"
desc = "The clown's favorite dessert."
icon_state = "honkdae"
@@ -121,7 +121,7 @@
tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/cornuto
/obj/item/food/frozen/cornuto
name = "cornuto"
desc = "A neapolitan vanilla and chocolate ice cream cone. It menaces with a sprinkling of caramelized nuts."
icon_state = "cornuto"
@@ -129,7 +129,7 @@
tastes = list("chopped hazelnuts" = 3, "waffle" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/peanutbuttermochi
/obj/item/food/frozen/peanutbuttermochi
name = "peanut butter ice cream mochi"
desc = "A classic dessert at the Arabia Street Night Market in Prospect, peanut butter ice cream mochi is made with a peanut-butter flavoured ice cream as the main filling, and coated in crushed peanuts in the Taiwanese tradition."
icon_state = "pb_ice_cream_mochi"
@@ -137,7 +137,7 @@
tastes = list("peanut butter" = 1, "mochi" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/spacefreezy
/obj/item/food/frozen/spacefreezy
name = "spacefreezy"
desc = "The best ice cream in space."
icon_state = "spacefreezy"
@@ -149,7 +149,7 @@
// Snow Cones //
//////////////////
/obj/item/food/snacks/frozen/snowcone
/obj/item/food/frozen/snowcone
name = "flavorless snowcone"
desc = "It's just shaved ice. Still fun to chew on."
icon_state = "flavorless_sc"
@@ -158,7 +158,7 @@
tastes = list("cold water" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/frozen/snowcone/apple
/obj/item/food/frozen/snowcone/apple
name = "apple snowcone"
desc = "Apple syrup drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
@@ -166,7 +166,7 @@
tastes = list("ice" = 1, "water" = 1, "apples" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/berry
/obj/item/food/frozen/snowcone/berry
name = "berry snowcone"
desc = "Berry syrup drizzled over a snowball in a paper cup."
icon_state = "berry_sc"
@@ -174,7 +174,7 @@
tastes = list("ice" = 1, "water" = 1, "berries" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/bluecherry
/obj/item/food/frozen/snowcone/bluecherry
name = "bluecherry snowcone"
desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
icon_state = "blue_sc"
@@ -182,7 +182,7 @@
tastes = list("ice" = 1, "water" = 1, "bluecherries" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/cherry
/obj/item/food/frozen/snowcone/cherry
name = "cherry snowcone"
desc = "Cherry syrup drizzled over a snowball in a paper cup."
icon_state = "red_sc"
@@ -190,7 +190,7 @@
tastes = list("ice" = 1, "water" = 1, "cherries" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/fruitsalad
/obj/item/food/frozen/snowcone/fruitsalad
name = "fruit salad snowcone"
desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
icon_state = "fruitsalad_sc"
@@ -198,7 +198,7 @@
tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "lemons" = 5, "limes" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/grape
/obj/item/food/frozen/snowcone/grape
name = "grape snowcone"
desc = "Grape syrup drizzled over a snowball in a paper cup."
icon_state = "grape_sc"
@@ -206,7 +206,7 @@
tastes = list("ice" = 1, "water" = 1, "grapes" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/honey
/obj/item/food/frozen/snowcone/honey
name = "honey snowcone"
desc = "Honey drizzled over a snowball in a paper cup."
icon_state = "amber_sc"
@@ -214,7 +214,7 @@
tastes = list("ice" = 1, "water" = 1, "honey" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/lemon
/obj/item/food/frozen/snowcone/lemon
name = "lemon snowcone"
desc = "Lemon syrup drizzled over a snowball in a paper cup."
icon_state = "lemon_sc"
@@ -222,7 +222,7 @@
tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/lime
/obj/item/food/frozen/snowcone/lime
name = "lime snowcone"
desc = "Lime syrup drizzled over a snowball in a paper cup."
icon_state = "lime_sc"
@@ -230,7 +230,7 @@
tastes = list("ice" = 1, "water" = 1, "limes" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/mime
/obj/item/food/frozen/snowcone/mime
name = "mime snowcone"
desc = "..."
icon_state = "mime_sc"
@@ -238,7 +238,7 @@
tastes = list("ice" = 1, "water" = 1, "silence" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/orange
/obj/item/food/frozen/snowcone/orange
name = "orange snowcone"
desc = "Orange syrup drizzled over a snowball in a paper cup."
icon_state = "orange_sc"
@@ -246,7 +246,7 @@
tastes = list("ice" = 1, "water" = 1, "oranges" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/pineapple
/obj/item/food/frozen/snowcone/pineapple
name = "pineapple snowcone"
desc = "Pineapple syrup drizzled over a snowball in a paper cup."
icon_state = "pineapple_sc"
@@ -254,7 +254,7 @@
tastes = list("ice" = 1, "water" = 1, "pineapple" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/rainbow
/obj/item/food/frozen/snowcone/rainbow
name = "rainbow snowcone"
desc = "A very colorful snowball in a paper cup."
icon_state = "rainbow_sc"
@@ -262,7 +262,7 @@
tastes = list("ice" = 1, "water" = 1, "rainbows" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/cola
/obj/item/food/frozen/snowcone/cola
name = "space cola snowcone"
desc = "Space Cola drizzled over a snowball in a paper cup."
icon_state = "soda_sc"
@@ -270,7 +270,7 @@
tastes = list("ice" = 1, "water" = 1, "soda" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/snowcone/spacemountain
/obj/item/food/frozen/snowcone/spacemountain
name = "space mountain wind snowcone"
desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
icon_state = "mountainwind_sc"
@@ -282,7 +282,7 @@
// Popsicles //
/////////////////
/obj/item/food/snacks/frozen/popsicle
/obj/item/food/frozen/popsicle
name = "jumbo icecream"
desc = "A luxurious ice cream covered in rich chocolate. It seems smaller than you remember it being."
icon_state = "jumbo"
@@ -291,7 +291,7 @@
tastes = list("ice cream" = 1, "chocolate" = 1, "vanilla" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/bananatop
/obj/item/food/frozen/popsicle/bananatop
name = "banana topsicle"
desc = "A frozen treat made from tofu and banana juice blended smooth, then frozen. Popular in rural Japan in the summer."
icon_state = "topsicle_banana"
@@ -299,7 +299,7 @@
tastes = list("bananas" = 1, "tofu" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/berrytop
/obj/item/food/frozen/popsicle/berrytop
name = "berry topsicle"
desc = "A frozen treat made from tofu and berry juice blended smooth, then frozen. Supposedly a favourite of bears, but that makes no sense..."
icon_state = "topsicle_berry"
@@ -307,7 +307,7 @@
tastes = list("berries" = 1, "tofu" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/pineappletop
/obj/item/food/frozen/popsicle/pineappletop
name = "pineapple topsicle"
desc = "A frozen treat made from tofu and pineapple juice blended smooth, then frozen. As seen on TV."
icon_state = "topsicle_pineapple"
@@ -315,7 +315,7 @@
tastes = list("pineapples" = 1, "tofu" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/licoricecream
/obj/item/food/frozen/popsicle/licoricecream
name = "licorice creamsicle"
desc = "A salty licorice ice cream. A salty frozen treat."
icon_state = "licorice_creamsicle"
@@ -323,7 +323,7 @@
tastes = list("salty licorice" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/orangecream
/obj/item/food/frozen/popsicle/orangecream
name = "orange creamsicle"
desc = "A classic orange creamsicle. A sunny frozen treat."
icon_state = "creamsicle_o"
@@ -331,7 +331,7 @@
tastes = list("ice cream" = 1, "oranges" = 1, "vanilla" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/berrycream
/obj/item/food/frozen/popsicle/berrycream
name = "berry creamsicle"
desc = "A vibrant berry creamsicle. A berry good frozen treat."
icon_state = "creamsicle_m"
@@ -339,7 +339,7 @@
tastes = list("ice cream" = 1, "berries" = 1, "vanilla" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/frozenpineapple
/obj/item/food/frozen/popsicle/frozenpineapple
name = "frozen pineapple pop"
desc = "Few cultures love pineapple as much as the Martians, and this dessert proves that- frozen pineapple, on a stick, with just a little dunk of dark chocolate."
icon_state = "pineapple_pop"
@@ -347,7 +347,7 @@
tastes = list("cold pineapple" = 1, "chocolate" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/sea_salt
/obj/item/food/frozen/popsicle/sea_salt
name = "sea salt ice-cream bar"
desc = "This sky-blue ice-cream bar is flavoured with only the finest imported sea salt. Salty... no, sweet!"
icon_state = "sea_salt_pop"
@@ -355,7 +355,7 @@
tastes = list("salt" = 1, "sweet" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/frozen/popsicle/ant
/obj/item/food/frozen/popsicle/ant
name = "ant popsicle"
desc = "A colony of ants suspended in hardened sugar. Those things are dead, right?"
icon_state = "ant_pop"
code/modules/food_and_drinks/food/foods/ingredients.dm
+34 -34
View File
@@ -3,7 +3,7 @@
// Tofu & Soy //
//////////////////////
/obj/item/food/snacks/tofu
/obj/item/food/tofu
name = "tofu"
icon_state = "tofu"
desc = "We all love tofu."
@@ -13,7 +13,7 @@
tastes = list("tofu" = 1)
ingredient_name = "tofu chunk"
/obj/item/food/snacks/fried_tofu
/obj/item/food/fried_tofu
name = "fried tofu"
icon_state = "tofu"
desc = "Proof that even vegetarians crave unhealthy foods."
@@ -23,7 +23,7 @@
tastes = list("tofu" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soydope
/obj/item/food/soydope
name = "soy dope"
icon_state = "soydope"
desc = "Like regular dope, but for the health conscious consumer."
@@ -37,32 +37,32 @@
// Cheese //
//////////////////////
/obj/item/food/snacks/sliceable/cheesewheel
/obj/item/food/sliceable/cheesewheel
name = "cheese wheel"
desc = "A big wheel of delicious Cheddar."
icon_state = "cheesewheel"
slice_path = /obj/item/food/snacks/cheesewedge
slice_path = /obj/item/food/cheesewedge
slices_num = 5
filling_color = "#FFF700"
list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20)
tastes = list("cheese" = 1)
/obj/item/food/snacks/cheesewedge
/obj/item/food/cheesewedge
name = "cheese wedge"
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
icon_state = "cheesewedge"
filling_color = "#FFF700"
tastes = list("cheese" = 1)
/obj/item/food/snacks/cheesewedge/checkpass(passflag)
/obj/item/food/cheesewedge/checkpass(passflag)
if((passflag & PASSDOOR) && ismouse(pulledby))
return TRUE
return ..()
/obj/item/food/snacks/cheesewedge/presliced
/obj/item/food/cheesewedge/presliced
list_reagents = list("nutriment" = 3, "vitamin" = 1, "cheese" = 4)
/obj/item/food/snacks/weirdcheesewedge
/obj/item/food/weirdcheesewedge
name = "weird cheese"
desc = "Some kind of... gooey, messy, gloopy thing. Similar to cheese, but only in the broad sense of the word."
icon_state = "weirdcheesewedge"
@@ -74,7 +74,7 @@
// Plants //
//////////////////////
/obj/item/food/snacks/hugemushroomslice
/obj/item/food/hugemushroomslice
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
icon_state = "hugemushroomslice"
@@ -83,14 +83,14 @@
list_reagents = list("plantmatter" = 3, "vitamin" = 1)
tastes = list("mushroom" = 1)
/obj/item/food/snacks/watermelonslice
/obj/item/food/watermelonslice
name = "watermelon slice"
desc = "A slice of watery goodness."
icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#FF3867"
tastes = list("watermelon" = 1)
/obj/item/food/snacks/tomatoslice
/obj/item/food/tomatoslice
name = "tomato slice"
desc = "A fresh slice of tomato."
icon_state = "tomatoslice"
@@ -98,7 +98,7 @@
list_reagents = list("plantmatter" = 2)
tastes = list("tomato" = 1)
/obj/item/food/snacks/pineappleslice
/obj/item/food/pineappleslice
name = "pineapple slices"
desc = "Rings of pineapple."
icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
@@ -110,7 +110,7 @@
// Dough //
//////////////////////
/obj/item/food/snacks/dough
/obj/item/food/dough
name = "dough"
desc = "A piece of dough."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -119,10 +119,10 @@
tastes = list("dough" = 1)
// Dough + rolling pin = flat dough
/obj/item/food/snacks/dough/attackby(obj/item/I, mob/user, params)
/obj/item/food/dough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/rollingpin))
if(isturf(loc))
new /obj/item/food/snacks/sliceable/flatdough(loc)
new /obj/item/food/sliceable/flatdough(loc)
to_chat(user, "<span class='notice'>You flatten [src].</span>")
qdel(src)
else
@@ -131,18 +131,18 @@
..()
// slicable into 3xdoughslices
/obj/item/food/snacks/sliceable/flatdough
/obj/item/food/sliceable/flatdough
name = "flat dough"
desc = "Some flattened dough."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flat dough"
slice_path = /obj/item/food/snacks/doughslice
slice_path = /obj/item/food/doughslice
slices_num = 3
list_reagents = list("nutriment" = 6)
tastes = list("dough" = 1)
/obj/item/food/snacks/doughslice
/obj/item/food/doughslice
name = "dough slice"
desc = "The building block of an impressive dish."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -153,7 +153,7 @@
///cookies by Ume
/obj/item/food/snacks/cookiedough
/obj/item/food/cookiedough
var/flat = FALSE
name = "pastry dough"
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -162,19 +162,19 @@
list_reagents = list("nutriment" = 5, "sugar" = 5)
tastes = list("dough" = 1, "sugar" = 1)
/obj/item/food/snacks/cookiedough/update_name()
/obj/item/food/cookiedough/update_name()
. = ..()
if(flat)
name = "flat pastry dough"
/obj/item/food/snacks/cookiedough/update_icon_state()
/obj/item/food/cookiedough/update_icon_state()
if(flat)
icon_state = "cookiedough_flat"
else
icon_state = "cookiedough"
// Dough + rolling pin = flat cookie dough // Flat dough + circular cutter = unbaked cookies
/obj/item/food/snacks/cookiedough/attackby(obj/item/I, mob/user, params)
/obj/item/food/cookiedough/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/rollingpin) && !flat)
if(isturf(loc))
to_chat(user, "<span class='notice'>You flatten [src].</span>")
@@ -184,7 +184,7 @@
to_chat(user, "<span class='notice'>You need to put [src] on a surface to roll it out!</span>")
else if(istype(I, /obj/item/kitchen/cutter) && flat)
if(isturf(loc))
new /obj/item/food/snacks/rawcookies(loc)
new /obj/item/food/rawcookies(loc)
to_chat(user, "<span class='notice'>You cut [src] into cookies.</span>")
qdel(src)
else
@@ -193,17 +193,17 @@
return ..()
/obj/item/food/snacks/rawcookies
/obj/item/food/rawcookies
name = "raw cookies"
desc = "Ready for oven!"
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "unbaked_cookies"
list_reagents = list("nutriment" = 5, "sugar" = 5)
/obj/item/food/snacks/rawcookies/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/food/snacks/choc_pile))
/obj/item/food/rawcookies/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/food/choc_pile))
if(isturf(loc))
new /obj/item/food/snacks/rawcookies/chocochips(loc)
new /obj/item/food/rawcookies/chocochips(loc)
to_chat(user, "<span class='notice'>You sprinkle [I] all over the cookies.</span>")
qdel(src)
qdel(I)
@@ -212,7 +212,7 @@
else
return ..()
/obj/item/food/snacks/rawcookies/chocochips
/obj/item/food/rawcookies/chocochips
name = "raw cookies"
desc = "Ready for oven! They have little pieces of chocolate all over them"
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -224,7 +224,7 @@
// Chocolate //
//////////////////////
/obj/item/food/snacks/chocolatebar
/obj/item/food/chocolatebar
name = "chocolate bar"
desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
@@ -234,10 +234,10 @@
goal_difficulty = FOOD_GOAL_EASY
///Chocolate crumbles/pile
/obj/item/food/snacks/chocolatebar/attackby(obj/item/I, mob/user, params)
/obj/item/food/chocolatebar/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/kitchen/knife))
if(isturf(loc))
new /obj/item/food/snacks/choc_pile(loc)
new /obj/item/food/choc_pile(loc)
to_chat(user, "<span class='notice'>You cut [src] into little crumbles.</span>")
qdel(src)
else
@@ -247,7 +247,7 @@
/// for reagent chocolate being spilled on turfs
/obj/item/food/snacks/choc_pile
/obj/item/food/choc_pile
name = "pile of chocolate"
desc = "A pile of pure chocolate pieces."
icon_state = "cocoa"
@@ -260,7 +260,7 @@
// Misc //
//////////////////////
/obj/item/food/snacks/ectoplasm
/obj/item/food/ectoplasm
name = "ectoplasm"
desc = "A luminescent blob of what scientists refer to as 'ghost goo'."
icon = 'icons/obj/wizard.dmi'
code/modules/food_and_drinks/food/foods/junkfood.dm
+13 -13
View File
@@ -3,7 +3,7 @@
// Vendor //
//////////////////////
/obj/item/food/snacks/chips
/obj/item/food/chips
name = "chips"
desc = "Commander Riker's What-The-Crisps."
icon_state = "chips"
@@ -15,7 +15,7 @@
list_reagents = list("nutriment" = 1, "sodiumchloride" = 1, "sugar" = 3)
tastes = list("crisps" = 1)
/obj/item/food/snacks/sosjerky
/obj/item/food/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
@@ -26,7 +26,7 @@
list_reagents = list("protein" = 1, "sugar" = 3)
tastes = list("chewy beef" = 1)
/obj/item/food/snacks/pistachios
/obj/item/food/pistachios
name = "pistachios"
icon_state = "pistachios"
desc = "Deliciously salted pistachios. A perfectly valid choice..."
@@ -37,7 +37,7 @@
list_reagents = list("plantmatter" = 2, "sodiumchloride" = 1, "sugar" = 4)
tastes = list("pistachios" = 1)
/obj/item/food/snacks/no_raisin
/obj/item/food/no_raisin
name = "4no Raisins"
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
@@ -48,7 +48,7 @@
list_reagents = list("plantmatter" = 2, "sugar" = 4)
tastes = list("dried raisins" = 1)
/obj/item/food/snacks/spacetwinkie
/obj/item/food/spacetwinkie
name = "Space Twinkie"
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer then you will."
@@ -58,7 +58,7 @@
list_reagents = list("sugar" = 4)
tastes = list("twinkies" = 1)
/obj/item/food/snacks/cheesiehonkers
/obj/item/food/cheesiehonkers
name = "Cheesie Honkers"
icon_state = "cheesie_honkers"
desc = "Bite sized cheesie snacks that will honk all over your mouth."
@@ -69,7 +69,7 @@
list_reagents = list("nutriment" = 1, "fake_cheese" = 2, "sugar" = 3)
tastes = list("cheese" = 1, "crisps" = 2)
/obj/item/food/snacks/syndicake
/obj/item/food/syndicake
name = "Syndi-Cakes"
icon_state = "syndi_cakes"
desc = "An extremely moist snack cake that tastes just as good after being nuked."
@@ -80,7 +80,7 @@
list_reagents = list("nutriment" = 4, "salglu_solution" = 5)
tastes = list("sweetness" = 3, "cake" = 1)
/obj/item/food/snacks/tastybread
/obj/item/food/tastybread
name = "bread tube"
desc = "Bread in a tube. Chewy and surprisingly tasty."
icon_state = "tastybread"
@@ -91,7 +91,7 @@
list_reagents = list("nutriment" = 2, "sugar" = 4)
tastes = list("bread" = 1)
/obj/item/food/snacks/stroopwafel
/obj/item/food/stroopwafel
name = "stroopwafel"
desc = "Straight from the snack factories of Space Den Haag comes a classic dutch treat!"
icon_state = "stroopwafel"
@@ -100,7 +100,7 @@
list_reagents = list("nutriment" = 10, "sugar" = 4)
tastes = list("syrup" = 3, "waffle" = 2)
/obj/item/food/snacks/twimsts
/obj/item/food/twimsts
name = "Twimsts"
desc = "Sweet twisted sticks made of liquorice, can be used to make edible handcuffs!"
icon_state = "twimsts"
@@ -111,7 +111,7 @@
list_reagents = list("nutriment" = 2, "sugar" = 10)
tastes = list("sweetness" = 3, "liquorice" = 2)
/obj/item/food/snacks/twimsts/attack_self(mob/user)
/obj/item/food/twimsts/attack_self(mob/user)
var/obj/item/restraints/handcuffs/twimsts/L = new /obj/item/restraints/handcuffs/twimsts
L.create_reagents(100)
reagents.copy_to(L, reagents.total_volume)
@@ -125,13 +125,13 @@
// Homemade //
//////////////////////
/obj/item/food/snacks/sosjerky/healthy
/obj/item/food/sosjerky/healthy
name = "homemade beef jerky"
desc = "Homemade beef jerky made from the finest space cows."
list_reagents = list("nutriment" = 3, "vitamin" = 1)
junkiness = 0
/obj/item/food/snacks/no_raisin/healthy
/obj/item/food/no_raisin/healthy
name = "homemade raisins"
desc = "homemade raisins, the best in all of spess."
list_reagents = list("nutriment" = 3, "vitamin" = 2)
code/modules/food_and_drinks/food/foods/meat.dm
+84 -84
View File
@@ -3,7 +3,7 @@
// Raw Meat //
//////////////////////
/obj/item/food/snacks/meat
/obj/item/food/meat
name = "meat"
desc = "A slab of meat."
icon = 'icons/obj/food/meat.dmi'
@@ -15,11 +15,11 @@
ingredient_name = "slab of meat"
ingredient_name_plural = "slabs of meat"
/obj/item/food/snacks/meat/attackby(obj/item/W, mob/user, params)
/obj/item/food/meat/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
new /obj/item/food/snacks/rawcutlet(src)
new /obj/item/food/snacks/rawcutlet(src)
new /obj/item/food/snacks/rawcutlet(src)
new /obj/item/food/rawcutlet(src)
new /obj/item/food/rawcutlet(src)
new /obj/item/food/rawcutlet(src)
user.visible_message( \
"<span class ='notice'>[user] cuts [src] with [W]!</span>", \
"<span class ='notice'>You cut [src] with [W]!</span>" \
@@ -28,53 +28,53 @@
else
..()
/obj/item/food/snacks/meat/syntiflesh
/obj/item/food/meat/syntiflesh
name = "synthetic meat"
desc = "A synthetic slab of flesh."
/obj/item/food/snacks/meat/human
/obj/item/food/meat/human
name = "-meat"
var/subjectname = ""
var/subjectjob = null
tastes = list("salty meat" = 1)
/obj/item/food/snacks/meat/slab/meatproduct
/obj/item/food/meat/slab/meatproduct
name = "meat product"
desc = "A slab of reclaimed and chemically processed meat product."
/obj/item/food/snacks/meat/slab/gorilla
/obj/item/food/meat/slab/gorilla
name = "gorilla meat"
desc = "Much meatier than monkey meat."
list_reagents = list("nutriment" = 5, "vitamin" = 1)
/obj/item/food/snacks/meat/kangaroo
/obj/item/food/meat/kangaroo
name = "kangaroo meat"
desc = "Extremely muscular and tender meat."
list_reagents = list("protein" = 4, "iron" = 5, "vitamin" = 1)
tastes = list("a punch in the face" = 1, "fowl" = 3)
/obj/item/food/snacks/meat/monkey
/obj/item/food/meat/monkey
//same as plain meat
/obj/item/food/snacks/meat/corgi
/obj/item/food/meat/corgi
name = "corgi meat"
desc = "Tastes like the Head of Personnel's hopes and dreams."
/obj/item/food/snacks/meat/pug
/obj/item/food/meat/pug
name = "pug meat"
desc = "Slightly less adorable in sliced form."
/obj/item/food/snacks/meat/ham
/obj/item/food/meat/ham
name = "ham"
desc = "For when you need to go ham."
list_reagents = list("protein" = 3, "porktonium" = 10)
/obj/item/food/snacks/meat/chicken
/obj/item/food/meat/chicken
name = "chicken meat"
desc = "Cluck cluck!"
icon_state = "birdmeat"
/obj/item/food/snacks/meat/meatwheat
/obj/item/food/meat/meatwheat
name = "meatwheat clump"
desc = "This doesn't look like meat, but your standards aren't <i>that</i> high to begin with."
list_reagents = list("nutriment" = 3, "vitamin" = 2, "blood" = 5)
@@ -82,7 +82,7 @@
icon_state = "meatwheat_clump"
bitesize = 4
/obj/item/food/snacks/meat/tomatomeat
/obj/item/food/meat/tomatomeat
name = "tomato meat slice"
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
@@ -91,7 +91,7 @@
list_reagents = list("protein" = 2)
tastes = list("tomato" = 1)
/obj/item/food/snacks/rawcutlet
/obj/item/food/rawcutlet
name = "raw cutlet"
desc = "A thin strip of raw meat."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -99,13 +99,13 @@
bitesize = 1
list_reagents = list("protein" = 1)
/obj/item/food/snacks/rawcutlet/attackby(obj/item/W, mob/user, params)
/obj/item/food/rawcutlet/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/kitchen/knife) || istype(W, /obj/item/scalpel))
user.visible_message( \
"<span class ='notice'>[user] cuts the raw cutlet with [W]!</span>", \
"<span class ='notice'>You cut the raw cutlet with [W]!</span>" \
)
var/obj/item/food/snacks/raw_bacon/bacon = new(get_turf(src))
var/obj/item/food/raw_bacon/bacon = new(get_turf(src))
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
qdel(src)
@@ -119,7 +119,7 @@
// Cannot be used in the usual meat-based food recipies but can be used as cloning pod biomass.
/obj/item/food/snacks/monstermeat
/obj/item/food/monstermeat
// Abstract object used for inheritance. I don't see why you would want one.
// It's just a convenience to set all monstermeats as biomass-able at once,
// in the GLOB.cloner_biomass_items list.
@@ -129,7 +129,7 @@
icon = 'icons/obj/food/meat.dmi'
icon_state = "bearmeat"
/obj/item/food/snacks/monstermeat/bearmeat
/obj/item/food/monstermeat/bearmeat
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
@@ -138,7 +138,7 @@
list_reagents = list("protein" = 12, "methamphetamine" = 5, "vitamin" = 2)
tastes = list("meat" = 1, "salmon" = 1)
/obj/item/food/snacks/monstermeat/xenomeat
/obj/item/food/monstermeat/xenomeat
name = "meat"
desc = "A slab of meat. It's green!"
icon_state = "xenomeat"
@@ -147,7 +147,7 @@
list_reagents = list("protein" = 3, "vitamin" = 1)
tastes = list("meat" = 1, "acid" = 1)
/obj/item/food/snacks/monstermeat/spidermeat
/obj/item/food/monstermeat/spidermeat
name = "spider meat"
desc = "A slab of spider meat. Not very appetizing."
icon_state = "spidermeat"
@@ -155,7 +155,7 @@
list_reagents = list("protein" = 3, "toxin" = 3, "vitamin" = 1)
tastes = list("cobwebs" = 1)
/obj/item/food/snacks/monstermeat/lizardmeat
/obj/item/food/monstermeat/lizardmeat
name = "mutant lizard meat"
desc = "A peculiar slab of meat. It looks scaly and radioactive."
icon_state = "xenomeat"
@@ -164,14 +164,14 @@
list_reagents = list("protein" = 3, "toxin" = 3)
tastes = list("tough meat" = 1)
/obj/item/food/snacks/monstermeat/spiderleg
/obj/item/food/monstermeat/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider. You don't really want to eat this, do you?"
icon_state = "spiderleg"
list_reagents = list("protein" = 2, "toxin" = 2)
tastes = list("cobwebs" = 1, "creepy motion" = 1)
/obj/item/food/snacks/raw_bacon
/obj/item/food/raw_bacon
name = "raw bacon"
desc = "God's gift to man in uncooked form."
icon = 'icons/obj/food/meat.dmi'
@@ -179,30 +179,30 @@
list_reagents = list("nutriment" = 1, "porktonium" = 10)
tastes = list("bacon" = 1)
/obj/item/food/snacks/monstermeat/spidereggs
/obj/item/food/monstermeat/spidereggs
name = "spider eggs"
desc = "A cluster of juicy spider eggs. A great side dish for when you don't care about your health."
icon_state = "spidereggs"
list_reagents = list("protein" = 2, "toxin" = 2)
tastes = list("cobwebs" = 1, "spider juice" = 1)
/obj/item/food/snacks/monstermeat/goliath
/obj/item/food/monstermeat/goliath
name = "goliath meat"
desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
icon_state = "goliathmeat"
list_reagents = list("protein" = 3, "toxin" = 5)
tastes = list("tough meat" = 1)
/obj/item/food/snacks/monstermeat/goliath/burn()
/obj/item/food/monstermeat/goliath/burn()
visible_message("<span class='notice'>[src] finishes cooking!</span>")
new /obj/item/food/snacks/goliath_steak(loc)
new /obj/item/food/goliath_steak(loc)
qdel(src)
//////////////////////
// Cooked Meat //
//////////////////////
/obj/item/food/snacks/meatsteak
/obj/item/food/meatsteak
name = "meat steak"
desc = "A piece of hot spicy meat."
icon = 'icons/obj/food/meat.dmi'
@@ -214,13 +214,13 @@
tastes = list("meat" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/meatsteak/chicken
/obj/item/food/meatsteak/chicken
name = "cooked chicken"
desc = "Cluck cluck!"
icon_state = "birdsteak"
tastes = list("chicken" = 1, "meat" = 1)
/obj/item/food/snacks/bacon
/obj/item/food/bacon
name = "bacon"
desc = "It looks crispy and tastes amazing! Mmm... Bacon."
icon = 'icons/obj/food/meat.dmi'
@@ -229,7 +229,7 @@
tastes = list("bacon" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/telebacon
/obj/item/food/telebacon
name = "tele bacon"
desc = "It tastes a little odd but it's still delicious."
icon = 'icons/obj/food/meat.dmi'
@@ -239,21 +239,21 @@
tastes = list("bacon" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/telebacon/Initialize(mapload)
/obj/item/food/telebacon/Initialize(mapload)
. = ..()
baconbeacon = new /obj/item/beacon/bacon(src)
/obj/item/food/snacks/telebacon/Destroy()
/obj/item/food/telebacon/Destroy()
QDEL_NULL(baconbeacon)
return ..()
/obj/item/food/snacks/telebacon/On_Consume(mob/M, mob/user)
/obj/item/food/telebacon/On_Consume(mob/M, mob/user)
if(!reagents.total_volume)
baconbeacon.forceMove(user)
baconbeacon.digest_delay()
baconbeacon = null
/obj/item/food/snacks/meatball
/obj/item/food/meatball
name = "meatball"
desc = "A great meal all round."
icon = 'icons/obj/food/meat.dmi'
@@ -262,7 +262,7 @@
list_reagents = list("protein" = 4, "vitamin" = 1)
tastes = list("meat" = 1)
/obj/item/food/snacks/sausage
/obj/item/food/sausage
name = "sausage"
desc = "A piece of mixed and cased meat."
icon = 'icons/obj/food/meat.dmi'
@@ -272,7 +272,7 @@
tastes = list("meat" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/cutlet
/obj/item/food/cutlet
name = "cutlet"
desc = "A tasty meat slice."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -281,7 +281,7 @@
tastes = list("meat" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/spidereggsham
/obj/item/food/spidereggsham
name = "green eggs and ham"
desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
icon = 'icons/obj/food/meat.dmi'
@@ -292,7 +292,7 @@
tastes = list("cobwebs" = 1, "the colour green" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/boiledspiderleg
/obj/item/food/boiledspiderleg
name = "boiled spider leg"
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
icon = 'icons/obj/food/meat.dmi'
@@ -303,7 +303,7 @@
tastes = list("cobwebs" = 1, "hot peppers" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/wingfangchu
/obj/item/food/wingfangchu
name = "wing fang chu"
desc = "A savory dish of alien wing wang in soy. Wait, what?"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -314,7 +314,7 @@
tastes = list("soy" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/goliath_steak
/obj/item/food/goliath_steak
name = "goliath steak"
desc = "A delicious, lava cooked steak."
resistance_flags = LAVA_PROOF | FIRE_PROOF
@@ -325,7 +325,7 @@
tastes = list("meat" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/fried_vox
/obj/item/food/fried_vox
name = "Kentucky Fried Vox"
desc = "Bucket of voxxy, yaya!"
icon = 'icons/obj/food/meat.dmi'
@@ -339,7 +339,7 @@
// Cubes //
//////////////////////
/obj/item/food/snacks/monkeycube
/obj/item/food/monkeycube
name = "monkey cube"
desc = "Just add water!"
icon_state = "monkeycube"
@@ -350,17 +350,17 @@
list_reagents = list("nutriment" = 2)
tastes = list("the jungle" = 1, "bananas" = 1)
/obj/item/food/snacks/monkeycube/water_act(volume, temperature, source, method = REAGENT_TOUCH)
/obj/item/food/monkeycube/water_act(volume, temperature, source, method = REAGENT_TOUCH)
. = ..()
if(volume >= 1)
return Expand()
/obj/item/food/snacks/monkeycube/wash(mob/user, atom/source)
/obj/item/food/monkeycube/wash(mob/user, atom/source)
user.drop_item()
forceMove(get_turf(source))
return 1
/obj/item/food/snacks/monkeycube/proc/Expand()
/obj/item/food/monkeycube/proc/Expand()
if(LAZYLEN(SSmobs.cubemonkeys) >= GLOB.configuration.general.monkey_cube_cap)
return
if(!QDELETED(src))
@@ -380,26 +380,26 @@
SSmobs.cubemonkeys += creature
qdel(src)
/obj/item/food/snacks/monkeycube/syndicate
/obj/item/food/monkeycube/syndicate
faction = list("neutral", "syndicate")
/obj/item/food/snacks/monkeycube/farwacube
/obj/item/food/monkeycube/farwacube
name = "farwa cube"
monkey_type = /datum/species/monkey/tajaran
/obj/item/food/snacks/monkeycube/wolpincube
/obj/item/food/monkeycube/wolpincube
name = "wolpin cube"
monkey_type = /datum/species/monkey/vulpkanin
/obj/item/food/snacks/monkeycube/nian_wormecube
/obj/item/food/monkeycube/nian_wormecube
name = "nian worme cube"
monkey_type = /datum/species/monkey/nian_worme
/obj/item/food/snacks/monkeycube/stokcube
/obj/item/food/monkeycube/stokcube
name = "stok cube"
monkey_type = /datum/species/monkey/unathi
/obj/item/food/snacks/monkeycube/neaeracube
/obj/item/food/monkeycube/neaeracube
name = "neaera cube"
monkey_type = /datum/species/monkey/skrell
@@ -408,7 +408,7 @@
// Eggs //
//////////////////////
/obj/item/food/snacks/egg
/obj/item/food/egg
name = "egg"
desc = "An egg!"
icon = 'icons/obj/food/breakfast.dmi'
@@ -418,7 +418,7 @@
tastes = list("egg" = 1)
var/amount_grown = 0
/obj/item/food/snacks/egg/throw_impact(atom/hit_atom)
/obj/item/food/egg/throw_impact(atom/hit_atom)
..()
var/turf/T = get_turf(hit_atom)
new/obj/effect/decal/cleanable/egg_smudge(T)
@@ -426,7 +426,7 @@
reagents.reaction(hit_atom, REAGENT_TOUCH)
qdel(src)
/obj/item/food/snacks/egg/attackby(obj/item/W, mob/user, params)
/obj/item/food/egg/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/toy/crayon))
var/obj/item/toy/crayon/C = W
var/clr = C.colourName
@@ -441,49 +441,49 @@
else
..()
/obj/item/food/snacks/egg/blue
/obj/item/food/egg/blue
icon_state = "egg-blue"
item_color = "blue"
/obj/item/food/snacks/egg/green
/obj/item/food/egg/green
icon_state = "egg-green"
item_color = "green"
/obj/item/food/snacks/egg/mime
/obj/item/food/egg/mime
icon_state = "egg-mime"
item_color = "mime"
/obj/item/food/snacks/egg/orange
/obj/item/food/egg/orange
icon_state = "egg-orange"
item_color = "orange"
/obj/item/food/snacks/egg/purple
/obj/item/food/egg/purple
icon_state = "egg-purple"
item_color = "purple"
/obj/item/food/snacks/egg/rainbow
/obj/item/food/egg/rainbow
icon_state = "egg-rainbow"
item_color = "rainbow"
/obj/item/food/snacks/egg/red
/obj/item/food/egg/red
icon_state = "egg-red"
item_color = "red"
/obj/item/food/snacks/egg/yellow
/obj/item/food/egg/yellow
icon_state = "egg-yellow"
item_color = "yellow"
/obj/item/food/snacks/egg/gland
/obj/item/food/egg/gland
desc = "An egg! It looks weird..."
/obj/item/food/snacks/egg/gland/Initialize(mapload)
/obj/item/food/egg/gland/Initialize(mapload)
. = ..()
reagents.add_reagent(get_random_reagent_id(), 15)
var/reagent_color = mix_color_from_reagents(reagents.reagent_list)
color = reagent_color
/obj/item/food/snacks/friedegg
/obj/item/food/friedegg
name = "fried egg"
desc = "A fried egg, with a touch of salt and pepper."
icon = 'icons/obj/food/breakfast.dmi'
@@ -494,7 +494,7 @@
tastes = list("egg" = 1, "salt" = 1, "pepper" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/boiledegg
/obj/item/food/boiledegg
name = "boiled egg"
desc = "A hard boiled egg."
icon = 'icons/obj/food/breakfast.dmi'
@@ -503,7 +503,7 @@
list_reagents = list("nutriment" = 2, "egg" = 5, "vitamin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/chocolateegg
/obj/item/food/chocolateegg
name = "chocolate egg"
desc = "Such sweet, fattening food."
icon = 'icons/obj/food/breakfast.dmi'
@@ -512,7 +512,7 @@
list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/omelette
/obj/item/food/omelette
name = "omelette du fromage"
desc = "That's all you can say!"
icon = 'icons/obj/food/breakfast.dmi'
@@ -524,7 +524,7 @@
tastes = list("egg" = 1, "cheese" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/benedict
/obj/item/food/benedict
name = "eggs benedict"
desc = "There is only one egg on this, how rude."
icon = 'icons/obj/food/breakfast.dmi'
@@ -539,7 +539,7 @@
// Misc //
//////////////////////
/obj/item/food/snacks/hotdog
/obj/item/food/hotdog
name = "hotdog"
desc = "Not made with actual dogs. Hopefully."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -549,7 +549,7 @@
tastes = list("bun" = 3, "meat" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/meatbun
/obj/item/food/meatbun
name = "meat bun"
desc = "Has the potential to not be dog."
icon = 'icons/obj/food/meat.dmi'
@@ -559,18 +559,18 @@
tastes = list("bun" = 3, "meat" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/sliceable/turkey
/obj/item/food/sliceable/turkey
name = "turkey"
desc = "A traditional turkey served with stuffing."
icon = 'icons/obj/food/meat.dmi'
icon_state = "turkey"
slice_path = /obj/item/food/snacks/turkeyslice
slice_path = /obj/item/food/turkeyslice
slices_num = 6
list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5)
tastes = list("turkey" = 2, "stuffing" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/turkeyslice
/obj/item/food/turkeyslice
name = "turkey serving"
desc = "A serving of some tender and delicious turkey."
icon = 'icons/obj/food/meat.dmi'
@@ -580,7 +580,7 @@
tastes = list("turkey" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/organ
/obj/item/food/organ
name = "organ"
desc = "Technically qualifies as organic."
icon = 'icons/obj/surgery.dmi'
@@ -589,11 +589,11 @@
bitesize = 3
list_reagents = list("protein" = 4, "vitamin" = 4)
/obj/item/food/snacks/organ/Initialize(mapload)
/obj/item/food/organ/Initialize(mapload)
. = ..()
reagents.add_reagent("nutriment", 5)
/obj/item/food/snacks/appendix
/obj/item/food/appendix
//yes, this is the same as meat. I might do something different in future
name = "appendix"
desc = "An appendix which looks perfectly healthy."
@@ -603,13 +603,13 @@
bitesize = 3
list_reagents = list("protein" = 3, "vitamin" = 2)
/obj/item/food/snacks/appendix/inflamed
/obj/item/food/appendix/inflamed
name = "inflamed appendix"
desc = "An appendix which appears to be inflamed."
icon_state = "appendixinflamed"
filling_color = "#E00D7A"
/obj/item/food/snacks/bbqribs
/obj/item/food/bbqribs
name = "BBQ ribs"
desc = "Sweet, smokey, savory, and gets everywhere. Perfect for Grilling."
icon = 'icons/obj/food/meat.dmi'
code/modules/food_and_drinks/food/foods/misc_food.dm
+35 -35
View File
@@ -3,7 +3,7 @@
// Meals //
//////////////////////
/obj/item/food/snacks/eggplantparm
/obj/item/food/eggplantparm
name = "eggplant parmigiana"
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
@@ -13,7 +13,7 @@
tastes = list("eggplant" = 2, "cheese" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soylentgreen
/obj/item/food/soylentgreen
name = "soylent green"
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
@@ -22,7 +22,7 @@
list_reagents = list("nutriment" = 10, "vitamin" = 1)
tastes = list("waffles" = 7, "people" = 1)
/obj/item/food/snacks/soylentviridians
/obj/item/food/soylentviridians
name = "soylent virdians"
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
@@ -32,7 +32,7 @@
tastes = list("waffles" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/monkeysdelight
/obj/item/food/monkeysdelight
name = "monkey's delight"
desc = "Eeee Eee!"
icon_state = "monkeysdelight"
@@ -43,7 +43,7 @@
tastes = list("banana" = 1, "the jungle" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/dionaroast
/obj/item/food/dionaroast
name = "roast diona"
desc = "It's like an enormous leathery carrot... With an eye."
icon_state = "dionaroast"
@@ -53,7 +53,7 @@
tastes = list("chewy vegetables" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/tofurkey
/obj/item/food/tofurkey
name = "tofurkey"
desc = "A fake turkey made from tofu."
icon_state = "tofurkey"
@@ -68,7 +68,7 @@
// Salads //
//////////////////////
/obj/item/food/snacks/salad
/obj/item/food/salad
name = "salad"
desc = "This salad is blander than the jokes of the clown, but is also low in carbohydrates!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -80,7 +80,7 @@
tastes = list("lettuce" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/aesir
/obj/item/food/salad/aesir
name = "aesir salad"
desc = "Probably too incredible for mortal men to fully enjoy."
icon_state = "aesirsalad"
@@ -88,7 +88,7 @@
tastes = list("divinity" = 1, "lettuce" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/antipasto
/obj/item/food/salad/antipasto
name = "antipasto salad"
desc = "A traditional Italian salad made of salami, mozzarella cheese, olives, and tomatoes. Often served as a first course meal."
icon_state = "antipasto_salad"
@@ -96,7 +96,7 @@
tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/caesar
/obj/item/food/salad/caesar
name = "Caesar salad"
desc = "A simple yet flavorful salad of onions, lettuce, croutons, and shreds of cheese dressed in oil. Comes with a slice of pita bread!"
icon_state = "caesar_salad"
@@ -104,7 +104,7 @@
tastes = list("healthy greens" = 2, "olive dressing" = 2, "feta cheese" = 2, "pita bread" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/fruit
/obj/item/food/salad/fruit
name = "fruit salad"
desc = "Your standard fruit salad."
icon_state = "fruitsalad"
@@ -112,7 +112,7 @@
tastes = list("fruit" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/greek
/obj/item/food/salad/greek
name = "Greek salad"
desc = "A popular salad made of tomatoes, onions, feta cheese, and olives all drizzled in olive oil. Though it feels like it's missing something..."
icon_state = "greek_salad"
@@ -120,7 +120,7 @@
tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/citrusdelight
/obj/item/food/salad/citrusdelight
name = "citrus delight"
desc = "Citrus overload!"
icon_state = "citrusdelight"
@@ -128,7 +128,7 @@
tastes = list("sourness" = 1, "leaves" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/jungle
/obj/item/food/salad/jungle
name = "jungle salad"
desc = "Exotic fruits in a bowl."
icon_state = "junglesalad"
@@ -136,7 +136,7 @@
tastes = list("fruit" = 1, "the jungle" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/kale
/obj/item/food/salad/kale
name = "kale salad"
desc = "A healthy kale salad drizzled in oil, perfect for warm summer months."
icon_state = "kale_salad"
@@ -144,7 +144,7 @@
tastes = list("healthy greens" = 2, "olive dressing" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/potato
/obj/item/food/salad/potato
name = "potato salad"
desc = "A dish of boiled potatoes mixed with boiled eggs, onions, and mayonnaise. A staple of every self-respecting barbeque."
icon_state = "potato_salad"
@@ -152,7 +152,7 @@
tastes = list("potato" = 2, "egg" = 2, "mayonnaise" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/melonfruitbowl
/obj/item/food/salad/melonfruitbowl
name = "melon fruit bowl"
desc = "For people who wants edible fruit bowls."
icon_state = "melonfruitbowl"
@@ -161,7 +161,7 @@
tastes = list("melon" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/herb
/obj/item/food/salad/herb
name = "herb salad"
desc = "A tasty salad with apples on top."
icon_state = "herbsalad"
@@ -170,7 +170,7 @@
tastes = list("lettuce" = 1, "apple" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/salad/valid
/obj/item/food/salad/valid
name = "valid salad"
desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
icon_state = "validsalad"
@@ -184,7 +184,7 @@
// Donk Pockets //
//////////////////////
/obj/item/food/snacks/donkpocket
/obj/item/food/donkpocket
name = "Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
@@ -193,7 +193,7 @@
tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
ingredient_name = "turnover"
/obj/item/food/snacks/warmdonkpocket
/obj/item/food/warmdonkpocket
name = "warm Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
@@ -209,20 +209,20 @@
/// This tracks how much time the donk pocket has already been cooling for when its timer is paused
var/subtracted_time = 0
/obj/item/food/snacks/warmdonkpocket/Initialize(mapload)
/obj/item/food/warmdonkpocket/Initialize(mapload)
. = ..()
donk_heat()
/obj/item/food/snacks/warmdonkpocket/proc/donk_heat()
/obj/item/food/warmdonkpocket/proc/donk_heat()
heated_at = world.time
cool_timer = addtimer(CALLBACK(src, PROC_REF(donk_cool)), 7 MINUTES - subtracted_time, TIMER_UNIQUE|TIMER_STOPPABLE)
/obj/item/food/snacks/warmdonkpocket/proc/donk_cool()
/obj/item/food/warmdonkpocket/proc/donk_cool()
name = "cold Donk-pocket"
desc = "The food of choice for the seasoned traitor. This one is cold."
warm = FALSE
/obj/item/food/snacks/warmdonkpocket/on_enter_storage(obj/item/storage/S)
/obj/item/food/warmdonkpocket/on_enter_storage(obj/item/storage/S)
. = ..()
if(!cool_timer)
return
@@ -231,25 +231,25 @@
subtracted_time += (world.time - heated_at)
cool_timer = null
/obj/item/food/snacks/warmdonkpocket/on_exit_storage(obj/item/storage/S)
/obj/item/food/warmdonkpocket/on_exit_storage(obj/item/storage/S)
. = ..()
if(warm)
donk_heat()
/obj/item/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
/obj/item/food/warmdonkpocket/Post_Consume(mob/living/M)
if(warm)
M.reagents.add_reagent("omnizine", 15)
return
M.reagents.add_reagent("weak_omnizine", 5)
/obj/item/food/snacks/warmdonkpocket_weak
/obj/item/food/warmdonkpocket_weak
name = "lukewarm Donk-pocket"
desc = "The food of choice for the seasoned traitor. This one is lukewarm."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
list_reagents = list("nutriment" = 4, "weak_omnizine" = 3)
/obj/item/food/snacks/syndidonkpocket
/obj/item/food/syndidonkpocket
name = "Donk-pocket"
desc = "This donk-pocket is emitting a small amount of heat."
icon_state = "donkpocket"
@@ -257,7 +257,7 @@
bitesize = 100 //nom the whole thing at once.
list_reagents = list("nutriment" = 1)
/obj/item/food/snacks/syndidonkpocket/Post_Consume(mob/living/M)
/obj/item/food/syndidonkpocket/Post_Consume(mob/living/M)
M.reagents.add_reagent("omnizine", 15)
M.reagents.add_reagent("teporone", 15)
M.reagents.add_reagent("synaptizine", 15)
@@ -271,7 +271,7 @@
// Misc //
//////////////////////
/obj/item/food/snacks/boiledslimecore
/obj/item/food/boiledslimecore
name = "boiled slime core"
desc = "A boiled red thing."
icon_state = "boiledrorocore"
@@ -280,7 +280,7 @@
tastes = list("jelly" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/popcorn
/obj/item/food/popcorn
name = "popcorn"
desc = "Now let's find some cinema."
icon_state = "popcorn"
@@ -293,17 +293,17 @@
tastes = list("popcorn" = 3, "butter" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/popcorn/Initialize(mapload)
/obj/item/food/popcorn/Initialize(mapload)
. = ..()
unpopped = rand(1,10)
/obj/item/food/snacks/popcorn/On_Consume(mob/M, mob/user)
/obj/item/food/popcorn/On_Consume(mob/M, mob/user)
if(prob(unpopped)) //lol ...what's the point?
to_chat(user, "<span class='userdanger'>You bite down on an un-popped kernel!</span>")
unpopped = max(0, unpopped-1)
..()
/obj/item/food/snacks/liquidfood
/obj/item/food/liquidfood
name = "\improper LiquidFood ration"
desc = "A prepackaged grey slurry of all the essential nutrients for a spacefarer on the go. Should this be crunchy?"
icon_state = "liquidfood"
code/modules/food_and_drinks/food/foods/pasta.dm
+8 -8
View File
@@ -3,7 +3,7 @@
// Raw Pasta //
//////////////////////
/obj/item/food/snacks/spaghetti
/obj/item/food/spaghetti
name = "spaghetti"
desc = "A bundle of raw spaghetti."
icon = 'icons/obj/food/pasta.dmi'
@@ -12,7 +12,7 @@
list_reagents = list("nutriment" = 1, "vitamin" = 1)
tastes = list("raw pasta" = 1)
/obj/item/food/snacks/macaroni
/obj/item/food/macaroni
name = "macaroni twists"
desc = "These are little twists of raw macaroni."
icon = 'icons/obj/food/pasta.dmi'
@@ -26,7 +26,7 @@
// Pasta Dishes //
//////////////////////
/obj/item/food/snacks/boiledspaghetti
/obj/item/food/boiledspaghetti
name = "boiled spaghetti"
desc = "A plain dish of noodles. This sucks."
icon = 'icons/obj/food/pasta.dmi'
@@ -37,7 +37,7 @@
tastes = list("pasta" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/pastatomato
/obj/item/food/pastatomato
name = "spaghetti"
desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
icon = 'icons/obj/food/pasta.dmi'
@@ -49,7 +49,7 @@
tastes = list("pasta" = 1, "tomato" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/meatballspaghetti
/obj/item/food/meatballspaghetti
name = "spaghetti & meatballs"
desc = "Now that's a nice'a meatball!"
icon = 'icons/obj/food/pasta.dmi'
@@ -60,7 +60,7 @@
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/spesslaw
/obj/item/food/spesslaw
name = "spesslaw"
desc = "A lawyer's favourite."
icon = 'icons/obj/food/pasta.dmi'
@@ -70,7 +70,7 @@
tastes = list("pasta" = 1, "tomato" = 1, "meat" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/macncheese
/obj/item/food/macncheese
name = "mac 'n' cheese"
desc = "One of the most comforting foods in the world. Apparently."
trash = /obj/item/trash/snack_bowl
@@ -81,7 +81,7 @@
tastes = list("pasta" = 1, "cheese" = 1, "comfort" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/lasagna
/obj/item/food/lasagna
name = "lasagna"
desc = "Tajara love to eat this, for some reason."
icon = 'icons/obj/food/pasta.dmi'
code/modules/food_and_drinks/food/foods/pizza.dm
+50 -50
View File
@@ -3,22 +3,22 @@
// Pizzas //
//////////////////////
/obj/item/food/snacks/sliceable/pizza
/obj/item/food/sliceable/pizza
icon = 'icons/obj/food/pizza.dmi'
slices_num = 6
filling_color = "#BAA14C"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
// Margherita
/obj/item/food/snacks/sliceable/pizza/margheritapizza
/obj/item/food/sliceable/pizza/margheritapizza
name = "margherita pizza"
desc = "The golden standard of pizzas."
icon_state = "margheritapizza"
slice_path = /obj/item/food/snacks/margheritapizzaslice
slice_path = /obj/item/food/margheritapizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/margheritapizzaslice
/obj/item/food/margheritapizzaslice
name = "margherita slice"
desc = "A slice of the classic pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -28,16 +28,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Meat Pizza
/obj/item/food/snacks/sliceable/pizza/meatpizza
/obj/item/food/sliceable/pizza/meatpizza
name = "meat pizza"
desc = "A pizza with meat topping."
icon_state = "meatpizza"
slice_path = /obj/item/food/snacks/meatpizzaslice
slice_path = /obj/item/food/meatpizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
tastes = list("crust" = 1, "cheese" = 1, "meat" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/meatpizzaslice
/obj/item/food/meatpizzaslice
name = "meat pizza slice"
desc = "A slice of a meaty pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -47,16 +47,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Mushroom Pizza
/obj/item/food/snacks/sliceable/pizza/mushroompizza
/obj/item/food/sliceable/pizza/mushroompizza
name = "mushroom pizza"
desc = "Very special pizza."
icon_state = "mushroompizza"
slice_path = /obj/item/food/snacks/mushroompizzaslice
slice_path = /obj/item/food/mushroompizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5)
tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/mushroompizzaslice
/obj/item/food/mushroompizzaslice
name = "mushroom pizza slice"
desc = "Maybe it is the last slice of pizza in your life."
icon = 'icons/obj/food/pizza.dmi'
@@ -66,16 +66,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Vegetable Pizza
/obj/item/food/snacks/sliceable/pizza/vegetablepizza
/obj/item/food/sliceable/pizza/vegetablepizza
name = "vegetable pizza"
desc = "No Tomato Sapiens were harmed during the making of this pizza."
icon_state = "vegetablepizza"
slice_path = /obj/item/food/snacks/vegetablepizzaslice
slice_path = /obj/item/food/vegetablepizzaslice
list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/vegetablepizzaslice
/obj/item/food/vegetablepizzaslice
name = "vegetable pizza slice"
desc = "A slice of the most green pizza of all pizzas not containing green ingredients."
icon = 'icons/obj/food/pizza.dmi'
@@ -85,16 +85,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Hawaiian Pizza
/obj/item/food/snacks/sliceable/pizza/hawaiianpizza
/obj/item/food/sliceable/pizza/hawaiianpizza
name = "hawaiian pizza"
desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple."
icon_state = "hawaiianpizza"
slice_path = /obj/item/food/snacks/hawaiianpizzaslice
slice_path = /obj/item/food/hawaiianpizzaslice
list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5)
tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/hawaiianpizzaslice
/obj/item/food/hawaiianpizzaslice
name = "hawaiian pizza slice"
desc = "A slice of polarising pizza."
icon = 'icons/obj/food/pizza.dmi'
@@ -104,17 +104,17 @@
goal_difficulty = FOOD_GOAL_EASY
// Mac 'n' Cheese Pizza
/obj/item/food/snacks/sliceable/pizza/macpizza
/obj/item/food/sliceable/pizza/macpizza
name = "mac 'n' cheese pizza"
desc = "Gastronomists have yet to classify this dish as 'pizza'."
icon_state = "macpizza"
slice_path = /obj/item/food/snacks/macpizzaslice
slice_path = /obj/item/food/macpizzaslice
list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious
filling_color = "#ffe45d"
tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/macpizzaslice
/obj/item/food/macpizzaslice
name = "mac 'n' cheese pizza slice"
desc = "A delicious slice of pizza topped with macaroni & cheese... wait, what the hell? Who would do this?!"
icon = 'icons/obj/food/pizza.dmi'
@@ -124,17 +124,17 @@
goal_difficulty = FOOD_GOAL_EASY
// Pepperoni Pizza
/obj/item/food/snacks/sliceable/pizza/pepperonipizza
/obj/item/food/sliceable/pizza/pepperonipizza
name = "pepperoni pizza"
desc = "What did the pepperoni say to the pizza?"
icon_state = "pepperonipizza"
slice_path = /obj/item/food/snacks/pepperonipizzaslice
slice_path = /obj/item/food/pepperonipizzaslice
list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8)
filling_color = "#ffe45d"
tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/pepperonipizzaslice
/obj/item/food/pepperonipizzaslice
name = "pepperoni pizza slice"
desc = "Nice to meat you!"
icon = 'icons/obj/food/pizza.dmi'
@@ -144,15 +144,15 @@
goal_difficulty = FOOD_GOAL_EASY
// Cheese Pizza
/obj/item/food/snacks/sliceable/pizza/cheesepizza
/obj/item/food/sliceable/pizza/cheesepizza
name = "cheese pizza"
desc = "Cheese, bread, cheese, tomato, and cheese."
icon_state = "cheesepizza"
slice_path = /obj/item/food/snacks/cheesepizzaslice
slice_path = /obj/item/food/cheesepizzaslice
list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/cheesepizzaslice
/obj/item/food/cheesepizzaslice
name = "cheese pizza slice"
desc = "Dangerously cheesy?"
icon = 'icons/obj/food/pizza.dmi'
@@ -162,16 +162,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Donk-pocket Pizza
/obj/item/food/snacks/sliceable/pizza/donkpocketpizza
/obj/item/food/sliceable/pizza/donkpocketpizza
name = "donk-pocket pizza"
desc = "Who thought this would be a good idea?"
icon_state = "donkpocketpizza"
slice_path = /obj/item/food/snacks/donkpocketpizzaslice
slice_path = /obj/item/food/donkpocketpizzaslice
list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6)
tastes = list("crust" = 1, "meat" = 1, "laziness" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/donkpocketpizzaslice
/obj/item/food/donkpocketpizzaslice
name = "donk-pocket pizza slice"
desc = "Smells like lukewarm donk-pocket."
icon = 'icons/obj/food/pizza.dmi'
@@ -181,16 +181,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Dank Pizza
/obj/item/food/snacks/sliceable/pizza/dankpizza
/obj/item/food/sliceable/pizza/dankpizza
name = "dank pizza"
desc = "The hippie's pizza of choice."
icon_state = "dankpizza"
slice_path = /obj/item/food/snacks/dankpizzaslice
slice_path = /obj/item/food/dankpizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6)
tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/dankpizzaslice
/obj/item/food/dankpizzaslice
name = "dank pizza slice"
desc = "So good, man..."
icon = 'icons/obj/food/pizza.dmi'
@@ -200,16 +200,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Firecracker Pizza
/obj/item/food/snacks/sliceable/pizza/firecrackerpizza
/obj/item/food/sliceable/pizza/firecrackerpizza
name = "firecracker pizza"
desc = "Tastes HOT HOT HOT!"
icon_state = "firecrackerpizza"
slice_path = /obj/item/food/snacks/firecrackerpizzaslice
slice_path = /obj/item/food/firecrackerpizzaslice
list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12)
tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/firecrackerpizzaslice
/obj/item/food/firecrackerpizzaslice
name = "firecracker pizza slice"
desc = "A spicy slice of something quite nice"
icon = 'icons/obj/food/pizza.dmi'
@@ -219,16 +219,16 @@
goal_difficulty = FOOD_GOAL_EASY
// "Pesto" Pizza
/obj/item/food/snacks/sliceable/pizza/pestopizza
/obj/item/food/sliceable/pizza/pestopizza
name = "\"pesto\" pizza"
desc = "Wait a second...this doesn't taste like pesto!"
icon_state = "pestopizza"
slice_path = /obj/item/food/snacks/pestopizzaslice
slice_path = /obj/item/food/pestopizzaslice
list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12)
tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/pestopizzaslice
/obj/item/food/pestopizzaslice
name = "\"pesto\" pizza slice"
desc = "Delicious and suspicious(ly green)."
icon = 'icons/obj/food/pizza.dmi'
@@ -238,16 +238,16 @@
goal_difficulty = FOOD_GOAL_EASY
// Garlic Pizza
/obj/item/food/snacks/sliceable/pizza/garlicpizza
/obj/item/food/sliceable/pizza/garlicpizza
name = "garlic pizza"
desc = "Ahh, garlic. A universally loved ingredient, except possibly by vampires."
icon_state = "garlicpizza"
slice_path = /obj/item/food/snacks/garlicpizzaslice
slice_path = /obj/item/food/garlicpizzaslice
list_reagents = list("plantmatter" = 30, "vitamin" = 5, "garlic" = 12)
tastes = list("crust" = 1, "cheese" = 1, "garlic" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/garlicpizzaslice
/obj/item/food/garlicpizzaslice
name = "garlic pizza slice"
desc = "What's not to love?"
icon = 'icons/obj/food/pizza.dmi'
@@ -269,7 +269,7 @@
var/open = FALSE // Is the box open?
var/is_messy = FALSE // Fancy mess on the lid
var/obj/item/food/snacks/sliceable/pizza/pizza // Content pizza
var/obj/item/food/sliceable/pizza/pizza // Content pizza
var/list/boxes = list() // If the boxes are stacked, they come here
var/box_tag = ""
@@ -382,7 +382,7 @@
to_chat(user, "<span class='warning'>Close [box] first!</span>")
return
if(istype(I, /obj/item/food/snacks/sliceable/pizza)) // Long ass fucking object name
if(istype(I, /obj/item/food/sliceable/pizza)) // Long ass fucking object name
if(open)
user.drop_item()
I.loc = src
@@ -411,42 +411,42 @@
/obj/item/pizzabox/margherita/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/margheritapizza(src)
pizza = new /obj/item/food/sliceable/pizza/margheritapizza(src)
box_tag = "margherita deluxe"
. = ..()
/obj/item/pizzabox/vegetable/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/vegetablepizza(src)
pizza = new /obj/item/food/sliceable/pizza/vegetablepizza(src)
box_tag = "gourmet vegetable"
. = ..()
/obj/item/pizzabox/mushroom/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/mushroompizza(src)
pizza = new /obj/item/food/sliceable/pizza/mushroompizza(src)
box_tag = "mushroom special"
. = ..()
/obj/item/pizzabox/meat/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/meatpizza(src)
pizza = new /obj/item/food/sliceable/pizza/meatpizza(src)
box_tag = "meatlover's supreme"
. = ..()
/obj/item/pizzabox/hawaiian/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/hawaiianpizza(src)
pizza = new /obj/item/food/sliceable/pizza/hawaiianpizza(src)
box_tag = "Hawaiian feast"
. = ..()
/obj/item/pizzabox/pepperoni/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/pepperonipizza(src)
pizza = new /obj/item/food/sliceable/pizza/pepperonipizza(src)
box_tag = "classic pepperoni"
. = ..()
/obj/item/pizzabox/garlic/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/garlicpizza(src)
pizza = new /obj/item/food/sliceable/pizza/garlicpizza(src)
box_tag = "triple garlic"
. = ..()
/obj/item/pizzabox/firecracker/Initialize(mapload)
pizza = new /obj/item/food/snacks/sliceable/pizza/firecrackerpizza(src)
pizza = new /obj/item/food/sliceable/pizza/firecrackerpizza(src)
box_tag = "extra spicy pie"
. = ..()
code/modules/food_and_drinks/food/foods/sandwiches.dm
+52 -52
View File
@@ -5,13 +5,13 @@
// Abstract object used for inheritance. Should never spawn. Needed to not break recipes that use plain burgers; recipes that use "burger" would accept any burger and transfer reagents otherwise.
/obj/item/food/snacks/burger
/obj/item/food/burger
name = "burger"
desc = "If you got this, something broke! Contact a coder if this somehow spawns."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "burger"
/obj/item/food/snacks/burger/plain
/obj/item/food/burger/plain
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
icon_state = "hburger"
@@ -21,7 +21,7 @@
tastes = list("bun" = 4, "meat" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/brain
/obj/item/food/burger/brain
name = "brainburger"
desc = "A strange looking burger. It appears almost sentient."
icon_state = "brainburger"
@@ -30,7 +30,7 @@
list_reagents = list("nutriment" = 6, "prions" = 10, "vitamin" = 1)
tastes = list("bun" = 4, "brains" = 2)
/obj/item/food/snacks/burger/ghost
/obj/item/food/burger/ghost
name = "ghost burger"
desc = "Spooky! It doesn't look very filling."
icon_state = "ghostburger"
@@ -40,12 +40,12 @@
tastes = list("bun" = 4, "ectoplasm" = 2)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/human
/obj/item/food/human
var/hname = ""
var/job = null
filling_color = "#D63C3C"
/obj/item/food/snacks/human/burger
/obj/item/food/human/burger
name = "-burger"
desc = "A bloody burger."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -54,7 +54,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "tender meat" = 2)
/obj/item/food/snacks/burger/cheese
/obj/item/food/burger/cheese
name = "cheeseburger"
desc = "The cheese adds a good flavor."
icon_state = "cheeseburger"
@@ -63,7 +63,7 @@
tastes = list("bun" = 4, "meat" = 1, "cheese" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/tofu
/obj/item/food/burger/tofu
name = "tofu burger"
desc = "Making this should probably be a criminal offense."
icon_state = "tofuburger"
@@ -73,7 +73,7 @@
tastes = list("bun" = 4, "tofu" = 4)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/hamborger
/obj/item/food/burger/hamborger
name = "hamborger"
desc = "Looking at this makes your flesh feel like a weakness."
icon_state = "roburger"
@@ -82,11 +82,11 @@
list_reagents = list("nutriment" = 6, "nanomachines" = 10, "vitamin" = 1)
tastes = list("bun" = 4, "metal" = 2, "sludge" = 1)
/obj/item/food/snacks/burger/hamborger/Initialize(mapload)
/obj/item/food/burger/hamborger/Initialize(mapload)
. = ..()
message_admins("A [name] has been created at [ADMIN_COORDJMP(src)].")
/obj/item/food/snacks/burger/xeno
/obj/item/food/burger/xeno
name = "xenoburger"
desc = "Smells caustic and tastes like heresy."
icon_state = "xburger"
@@ -96,7 +96,7 @@
tastes = list("bun" = 4, "acid" = 4)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/burger/clown
/obj/item/food/burger/clown
name = "clown burger"
desc = "This tastes funny..."
icon_state = "clownburger"
@@ -106,7 +106,7 @@
tastes = list("bun" = 4, "banana" = 1, "magic" = 2)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/burger/mime
/obj/item/food/burger/mime
name = "mime burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
@@ -116,7 +116,7 @@
tastes = list("bun" = 4, "silence" = 2)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/burger/baseball
/obj/item/food/burger/baseball
name = "home run baseball burger"
desc = "It's still warm. Batter up!"
icon_state = "baseball"
@@ -126,7 +126,7 @@
tastes = list("bun" = 4, "a homerun" = 3)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/burger/spell
/obj/item/food/burger/spell
name = "spell burger"
desc = "This is absolutely Ei Nath."
icon_state = "spellburger"
@@ -136,7 +136,7 @@
tastes = list("bun" = 4, "magic" = 2)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/burger/bigbite
/obj/item/food/burger/bigbite
name = "BigBite burger"
desc = "Forget the Big Mac, THIS is the future!"
icon_state = "bigbiteburger"
@@ -146,7 +146,7 @@
tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/superbite
/obj/item/food/burger/superbite
name = "SuperBite burger"
desc = "This is a mountain of a burger. FOOD!"
icon_state = "superbiteburger"
@@ -156,7 +156,7 @@
tastes = list("bun" = 4, "meat" = 2, "cheese" = 2, "type two diabetes" = 10)
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/snacks/burger/crazy
/obj/item/food/burger/crazy
name = "crazy hamburger"
desc = "This looks like the sort of food that a demented clown in a trenchcoat would make."
icon_state = "crazyburger"
@@ -166,7 +166,7 @@
tastes = list("bun" = 2, "meat" = 4, "cheese" = 2, "beef soaked in chili" = 3, "a smoking flare" = 2)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/burger/ppatty/white
/obj/item/food/burger/ppatty/white
name = "white pretty patty"
desc = "Delicious titanium!"
icon_state = "ppatty-mime"
@@ -176,7 +176,7 @@
tastes = list("bun" = 2, "meat" = 2, "white" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/ppatty/red
/obj/item/food/burger/ppatty/red
name = "red pretty patty"
desc = "Perfect for hiding the fact that it's burnt to a crisp."
icon_state = "ppatty-red"
@@ -186,7 +186,7 @@
tastes = list("bun" = 2, "meat" = 2, "red" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/ppatty/orange
/obj/item/food/burger/ppatty/orange
name = "orange pretty patty"
desc = "Contains 0% juice."
icon_state = "ppatty-orange"
@@ -196,7 +196,7 @@
tastes = list("bun" = 2, "meat" = 2, "orange" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/ppatty/yellow
/obj/item/food/burger/ppatty/yellow
name = "yellow pretty patty"
desc = "Bright to the last bite."
icon_state = "ppatty-yellow"
@@ -206,7 +206,7 @@
tastes = list("bun" = 2, "meat" = 2, "yellow" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/ppatty/green
/obj/item/food/burger/ppatty/green
name = "green pretty patty"
desc = "It's not tainted meat, it's painted meat!"
icon_state = "ppatty-green"
@@ -216,7 +216,7 @@
tastes = list("bun" = 2, "meat" = 2, "green" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/ppatty/blue
/obj/item/food/burger/ppatty/blue
name = "blue pretty patty"
desc = "Is this blue rare?"
icon_state = "ppatty-blue"
@@ -226,7 +226,7 @@
tastes = list("bun" = 2, "meat" = 2, "blue" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/ppatty/purple
/obj/item/food/burger/ppatty/purple
name = "purple pretty patty"
desc = "Regal and low class at the same time."
icon_state = "ppatty-purple"
@@ -236,7 +236,7 @@
tastes = list("bun" = 2, "meat" = 2, "purple" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/ppatty/rainbow
/obj/item/food/burger/ppatty/rainbow
name = "rainbow pretty patty"
desc = "Taste the rainbow, eat the rainbow."
icon_state = "ppatty-rainbow"
@@ -246,7 +246,7 @@
tastes = list("bun" = 2, "meat" = 2, "rainbow" = 5)
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/snacks/burger/elec
/obj/item/food/burger/elec
name = "empowered burger"
desc = "It's shockingly good, if you live off of electricity that is."
icon_state = "empoweredburger"
@@ -256,7 +256,7 @@
tastes = list("bun" = 2, "pure electricity" = 5)
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/snacks/burger/rat
/obj/item/food/burger/rat
name = "mouse burger"
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
@@ -265,7 +265,7 @@
list_reagents = list("nutriment" = 5, "protein" = 1)
tastes = list("bun" = 2, "dead rat" = 5)
/obj/item/food/snacks/burger/appendix
/obj/item/food/burger/appendix
name = "appendix burger"
desc = "Tastes like appendicitis."
icon_state = "appendixburger"
@@ -274,7 +274,7 @@
list_reagents = list("nutriment" = 2, "protein" = 6, "vitamin" = 6)
tastes = list("bun" = 1, "grass" = 1)
/obj/item/food/snacks/burger/bacon
/obj/item/food/burger/bacon
name = "bacon burger"
desc = "The perfect combination of all things American."
icon_state = "baconburger"
@@ -285,7 +285,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/bearger
/obj/item/food/burger/bearger
name = "bearger"
desc = "Best served rawr."
icon_state = "bearger"
@@ -295,7 +295,7 @@
tastes = list("bun" = 1, "meat" = 1, "salmon" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/burger/fivealarm
/obj/item/food/burger/fivealarm
name = "five alarm burger"
desc = "HOT! HOT!"
icon_state = "fivealarmburger"
@@ -305,7 +305,7 @@
tastes = list("bun" = 1, "extreme heat" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/mcguffin
/obj/item/food/burger/mcguffin
name = "mcGuffin"
desc = "A cheap and greasy imitation of an eggs benedict."
icon_state = "mcguffin"
@@ -315,7 +315,7 @@
tastes = list("muffin" = 1, "bacon" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/mcrib
/obj/item/food/burger/mcrib
name = "mcRib"
desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
icon_state = "mcrib"
@@ -325,7 +325,7 @@
tastes = list("bun" = 1, "pork" = 1, "patty" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/chicken
/obj/item/food/burger/chicken
name = "chicken burger"
desc = "May I mayo?"
icon_state = "chickenburger"
@@ -333,7 +333,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "chicken" = 2)
/obj/item/food/snacks/burger/jelly
/obj/item/food/burger/jelly
name = "jelly burger"
desc = "Culinary delight...?"
icon_state = "jellyburger"
@@ -341,12 +341,12 @@
bitesize = 3
tastes = list("bun" = 4, "jelly" = 2)
/obj/item/food/snacks/burger/jelly/slime
/obj/item/food/burger/jelly/slime
name = "slime burger"
list_reagents = list("nutriment" = 6, "slimejelly" = 5, "vitamin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/burger/jelly/cherry
/obj/item/food/burger/jelly/cherry
list_reagents = list("nutriment" = 6, "cherryjelly" = 5, "vitamin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -355,7 +355,7 @@
// Sandwiches //
//////////////////////
/obj/item/food/snacks/sandwich
/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'
@@ -365,7 +365,7 @@
tastes = list("meat" = 2, "cheese" = 1, "bread" = 2, "lettuce" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/toastedsandwich
/obj/item/food/toastedsandwich
name = "toasted sandwich"
desc = "Now if you only had a pepper bar."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -375,7 +375,7 @@
tastes = list("toast" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/grilledcheese
/obj/item/food/grilledcheese
name = "grilled cheese sandwich"
desc = "Goes great with tomato soup!"
icon = 'icons/obj/food/burgerbread.dmi'
@@ -385,7 +385,7 @@
tastes = list("toast" = 1, "grilled cheese" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/jellysandwich
/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'
@@ -394,16 +394,16 @@
bitesize = 3
tastes = list("toast" = 1, "jelly" = 1)
/obj/item/food/snacks/jellysandwich/slime
/obj/item/food/jellysandwich/slime
list_reagents = list("nutriment" = 2, "slimejelly" = 5, "vitamin" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/jellysandwich/cherry
/obj/item/food/jellysandwich/cherry
name = "slime sandwich"
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/notasandwich
/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'
@@ -412,7 +412,7 @@
tastes = list("nothing suspicious" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/wrap
/obj/item/food/wrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon = 'icons/obj/food/food.dmi'
@@ -421,7 +421,7 @@
tastes = list("egg" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/blt
/obj/item/food/blt
name = "\improper BLT"
desc = "A classic bacon, lettuce, and tomato sandwich."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -432,7 +432,7 @@
tastes = list("bacon" = 3, "lettuce" = 2, "tomato" = 2, "bread" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/peanut_butter_jelly
/obj/item/food/peanut_butter_jelly
name = "peanut butter and jelly sandwich"
desc = "A classic PB&J sandwich, just like your mom used to make."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -441,17 +441,17 @@
bitesize = 2
tastes = list("peanut butter" = 3, "jelly" = 3, "bread" = 2)
/obj/item/food/snacks/peanut_butter_jelly/slime
/obj/item/food/peanut_butter_jelly/slime
name = "peanut butter and slime sandwich"
desc = "A classic PB&J sandwich, just like your mom used to make?"
list_reagents = list("peanutbutter" = 2, "slimejelly" = 5, "nutriment" = 5, "protein" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/peanut_butter_jelly/cherry
/obj/item/food/peanut_butter_jelly/cherry
list_reagents = list("peanutbutter" = 2, "cherryjelly" = 5, "nutriment" = 5, "protein" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/philly_cheesesteak
/obj/item/food/philly_cheesesteak
name = "Philly cheesesteak"
desc = "A popular sandwich made of sliced meat, onions, melted cheese in a long hoagie roll. Mouthwatering doesn't even begin to describe it."
icon = 'icons/obj/food/burgerbread.dmi'
@@ -462,7 +462,7 @@
tastes = list("steak" = 3, "melted cheese" = 3, "onions" = 2, "bread" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/peanut_butter_banana
/obj/item/food/peanut_butter_banana
name = "peanut butter and banana sandwich"
desc = "A peanut butter sandwich with banana slices mixed in, a good high protein treat."
icon = 'icons/obj/food/burgerbread.dmi'
code/modules/food_and_drinks/food/foods/seafood.dm
+44 -44
View File
@@ -1,5 +1,5 @@
/obj/item/food/snacks/carpmeat
/obj/item/food/carpmeat
name = "carp fillet"
desc = "A fillet of spess carp meat."
icon = 'icons/obj/food/seafood.dmi'
@@ -11,7 +11,7 @@
ingredient_name = "fillet of meat"
ingredient_name_plural = "fillets of meat"
/obj/item/food/snacks/salmonmeat
/obj/item/food/salmonmeat
name = "raw salmon"
desc = "A fillet of raw salmon."
icon = 'icons/obj/food/seafood.dmi'
@@ -21,7 +21,7 @@
list_reagents = list("protein" = 3, "vitamin" = 2)
tastes = list("raw salmon" = 1)
/obj/item/food/snacks/salmonsteak
/obj/item/food/salmonsteak
name = "salmon steak"
desc = "A fillet of freshly-grilled salmon meat."
icon = 'icons/obj/food/seafood.dmi'
@@ -32,7 +32,7 @@
list_reagents = list("nutriment" = 4, "vitamin" = 2)
tastes = list("cooked salmon" = 1)
/obj/item/food/snacks/catfishmeat
/obj/item/food/catfishmeat
name = "raw catfish"
desc = "A fillet of raw catfish."
icon = 'icons/obj/food/seafood.dmi'
@@ -42,7 +42,7 @@
list_reagents = list("protein" = 3, "vitamin" = 2)
tastes = list("catfish" = 1)
/obj/item/food/snacks/fishfingers
/obj/item/food/fishfingers
name = "fish fingers"
desc = "A finger of fish."
icon = 'icons/obj/food/seafood.dmi'
@@ -53,7 +53,7 @@
tastes = list("fish" = 1, "bread" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/fishburger
/obj/item/food/fishburger
name = "Fillet-O-Carp sandwich"
desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
icon = 'icons/obj/food/seafood.dmi'
@@ -64,7 +64,7 @@
tastes = list("bun" = 4, "fish" = 4)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/cubancarp
/obj/item/food/cubancarp
name = "cuban carp"
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
icon = 'icons/obj/food/seafood.dmi'
@@ -76,7 +76,7 @@
tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/fishandchips
/obj/item/food/fishandchips
name = "fish and chips"
desc = "I do say so myself old chap. Indubitably!"
icon = 'icons/obj/food/seafood.dmi'
@@ -87,7 +87,7 @@
tastes = list("fish" = 1, "chips" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/sashimi
/obj/item/food/sashimi
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon = 'icons/obj/food/seafood.dmi'
@@ -97,7 +97,7 @@
tastes = list("raw carp" = 1, "hot peppers" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/fried_shrimp
/obj/item/food/fried_shrimp
name = "fried shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
@@ -107,7 +107,7 @@
tastes = list("shrimp" = 1, "bread crumbs" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/boiled_shrimp
/obj/item/food/boiled_shrimp
name = "boiled shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
@@ -117,7 +117,7 @@
tastes = list("shrimp" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/shrimp_skewer
/obj/item/food/shrimp_skewer
name = "shrimp skewer"
desc = "Four shrimp lightly grilled on a skewer. Yummy!"
trash = /obj/item/stack/rods
@@ -128,7 +128,7 @@
tastes = list("shrimp" = 4)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/fish_skewer
/obj/item/food/fish_skewer
name = "fish skewer"
desc = "A whole fish battered and grilled on a skewer. Hope you're hungry!"
trash = /obj/item/stack/rods
@@ -139,19 +139,19 @@
tastes = list("shrimp" = 1, "batter" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/sliceable/Ebi_maki
/obj/item/food/sliceable/Ebi_maki
name = "ebi maki roll"
desc = "A large unsliced roll of Ebi Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Ebi_maki"
slice_path = /obj/item/food/snacks/sushi_Ebi
slice_path = /obj/item/food/sushi_Ebi
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Ebi
/obj/item/food/sushi_Ebi
name = "ebi sushi"
desc = "A simple sushi consisting of cooked shrimp and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -161,19 +161,19 @@
tastes = list("shrimp" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/Ikura_maki
/obj/item/food/sliceable/Ikura_maki
name = "ikura maki roll"
desc = "A large unsliced roll of Ikura Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Ikura_maki"
slice_path = /obj/item/food/snacks/sushi_Ikura
slice_path = /obj/item/food/sushi_Ikura
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Ikura
/obj/item/food/sushi_Ikura
name = "ikura sushi"
desc = "A simple sushi consisting of salmon roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -183,19 +183,19 @@
tastes = list("salmon roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/Sake_maki
/obj/item/food/sliceable/Sake_maki
name = "sake maki roll"
desc = "A large unsliced roll of Sake Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Sake_maki"
slice_path = /obj/item/food/snacks/sushi_Sake
slice_path = /obj/item/food/sushi_Sake
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Sake
/obj/item/food/sushi_Sake
name = "sake sushi"
desc = "A simple sushi consisting of raw salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -205,19 +205,19 @@
tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/SmokedSalmon_maki
/obj/item/food/sliceable/SmokedSalmon_maki
name = "smoked salmon maki roll"
desc = "A large unsliced roll of Smoked Salmon Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "SmokedSalmon_maki"
slice_path = /obj/item/food/snacks/sushi_SmokedSalmon
slice_path = /obj/item/food/sushi_SmokedSalmon
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_SmokedSalmon
/obj/item/food/sushi_SmokedSalmon
name = "smoked salmon sushi"
desc = "A simple sushi consisting of cooked salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -227,19 +227,19 @@
tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/Tamago_maki
/obj/item/food/sliceable/Tamago_maki
name = "tamago maki roll"
desc = "A large unsliced roll of Tamago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tamago_maki"
slice_path = /obj/item/food/snacks/sushi_Tamago
slice_path = /obj/item/food/sushi_Tamago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Tamago
/obj/item/food/sushi_Tamago
name = "tamago sushi"
desc = "A simple sushi consisting of egg and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -249,19 +249,19 @@
tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/Inari_maki
/obj/item/food/sliceable/Inari_maki
name = "inari maki roll"
desc = "A large unsliced roll of Inari Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Inari_maki"
slice_path = /obj/item/food/snacks/sushi_Inari
slice_path = /obj/item/food/sushi_Inari
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Inari
/obj/item/food/sushi_Inari
name = "inari sushi"
desc = "A piece of fried tofu stuffed with rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -271,19 +271,19 @@
tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/Masago_maki
/obj/item/food/sliceable/Masago_maki
name = "masago maki roll"
desc = "A large unsliced roll of Masago Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Masago_maki"
slice_path = /obj/item/food/snacks/sushi_Masago
slice_path = /obj/item/food/sushi_Masago
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Masago
/obj/item/food/sushi_Masago
name = "masago sushi"
desc = "A simple sushi consisting of goldfish roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -293,19 +293,19 @@
tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/Tobiko_maki
/obj/item/food/sliceable/Tobiko_maki
name = "tobiko maki roll"
desc = "A large unsliced roll of Tobkio Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tobiko_maki"
slice_path = /obj/item/food/snacks/sushi_Tobiko
slice_path = /obj/item/food/sushi_Tobiko
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Tobiko
/obj/item/food/sushi_Tobiko
name = "tobiko sushi"
desc = "A simple sushi consisting of shark roe."
icon = 'icons/obj/food/seafood.dmi'
@@ -315,19 +315,19 @@
tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/TobikoEgg_maki
/obj/item/food/sliceable/TobikoEgg_maki
name = "tobiko and egg maki roll"
desc = "A large unsliced roll of Tobkio and Egg Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "TobikoEgg_maki"
slice_path = /obj/item/food/snacks/sushi_TobikoEgg
slice_path = /obj/item/food/sushi_TobikoEgg
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8, "protein" = 4)
tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_TobikoEgg
/obj/item/food/sushi_TobikoEgg
name = "tobiko and egg sushi"
desc = "A sushi consisting of shark roe and an egg."
icon = 'icons/obj/food/seafood.dmi'
@@ -337,19 +337,19 @@
tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sliceable/Tai_maki
/obj/item/food/sliceable/Tai_maki
name = "tai maki roll"
desc = "A large unsliced roll of Tai Sushi."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "Tai_maki"
slice_path = /obj/item/food/snacks/sushi_Tai
slice_path = /obj/item/food/sushi_Tai
slices_num = 4
bitesize = 3
list_reagents = list("nutriment" = 8)
tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_DUPLICATE
/obj/item/food/snacks/sushi_Tai
/obj/item/food/sushi_Tai
name = "tai sushi"
desc = "A simple sushi consisting of catfish and rice."
icon = 'icons/obj/food/seafood.dmi'
@@ -359,7 +359,7 @@
tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1)
goal_difficulty = FOOD_GOAL_EASY
/obj/item/food/snacks/sushi_Unagi
/obj/item/food/sushi_Unagi
name = "unagi sushi"
desc = "A simple sushi consisting of eel and rice."
icon = 'icons/obj/food/seafood.dmi'
code/modules/food_and_drinks/food/foods/side_dishes.dm
+15 -15
View File
@@ -3,7 +3,7 @@
// Raw //
//////////////////////
/obj/item/food/snacks/rawsticks
/obj/item/food/rawsticks
name = "raw potato sticks"
desc = "Raw fries, not very tasty."
icon = 'icons/obj/food/food_ingredients.dmi'
@@ -16,7 +16,7 @@
// Fried //
//////////////////////
/obj/item/food/snacks/fries
/obj/item/food/fries
name = "space fries"
desc = "AKA: French Fries, Freedom Fries, etc."
icon_state = "fries"
@@ -26,7 +26,7 @@
tastes = list("fries" = 3, "salt" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/cheesyfries
/obj/item/food/cheesyfries
name = "cheesy fries"
desc = "Fries. Covered in cheese. Duh."
icon_state = "cheesyfries"
@@ -36,7 +36,7 @@
tastes = list("fries" = 3, "cheese" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/tatortot
/obj/item/food/tatortot
name = "tator tot"
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
@@ -45,7 +45,7 @@
tastes = list("fried potato" = 3, "valids" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/onionrings
/obj/item/food/onionrings
name = "onion rings"
desc = "Onion slices coated in batter."
icon_state = "onionrings"
@@ -55,7 +55,7 @@
tastes = list("onion" = 3, "batter" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/carrotfries
/obj/item/food/carrotfries
name = "carrot fries"
desc = "Tasty fries from fresh carrots."
icon_state = "carrotfries"
@@ -70,7 +70,7 @@
// Misc //
//////////////////////
/obj/item/food/snacks/beans
/obj/item/food/beans
name = "tin of beans"
desc = "Musical fruit in a slightly less musical container."
icon_state = "beans"
@@ -79,7 +79,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/// mashed taters
/obj/item/food/snacks/mashed_potatoes
/obj/item/food/mashed_potatoes
name = "mashed potatoes"
desc = "Some soft, creamy, and irresistible mashed potatoes."
icon_state = "mashedtaters"
@@ -89,7 +89,7 @@
tastes = list("mashed potato" = 3, "gravy" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/stuffing
/obj/item/food/stuffing
name = "stuffing"
desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!"
icon_state = "stuffing"
@@ -98,7 +98,7 @@
tastes = list("bread crumbs" = 1, "herbs" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/loadedbakedpotato
/obj/item/food/loadedbakedpotato
name = "loaded baked potato"
desc = "Totally baked."
icon_state = "loadedbakedpotato"
@@ -107,7 +107,7 @@
tastes = list("potato" = 1, "cheese" = 1, "herbs" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/boiledrice
/obj/item/food/boiledrice
name = "boiled rice"
desc = "A boring dish of boring rice."
icon_state = "boiledrice"
@@ -117,18 +117,18 @@
tastes = list("rice" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/boiledrice/attackby(obj/item/I, mob/user, params)
/obj/item/food/boiledrice/attackby(obj/item/I, mob/user, params)
if(!istype(I, /obj/item/stack/seaweed))
return ..()
var/obj/item/stack/seaweed/S = I
if(!S.use(1))
return ..()
var/obj/item/food/snacks/onigiri/O = new(get_turf(user))
var/obj/item/food/onigiri/O = new(get_turf(user))
reagents.trans_to(O, reagents.total_volume)
qdel(src)
user.put_in_active_hand(O)
/obj/item/food/snacks/roastparsnip
/obj/item/food/roastparsnip
name = "roast parsnip"
desc = "Sweet and crunchy."
icon_state = "roastparsnip"
@@ -138,7 +138,7 @@
tastes = list("parsnip" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/onigiri
/obj/item/food/onigiri
name = "onigiri"
desc = "Rice and seaweed."
icon_state = "onigiri"
code/modules/food_and_drinks/food/foods/soups.dm
+35 -35
View File
@@ -4,7 +4,7 @@
//////////////////////
// Base object for soups, should never appear ingame.
/obj/item/food/snacks/soup
/obj/item/food/soup
name = "impossible soup"
desc = "This soup is so good, it shouldn't even exist!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -13,7 +13,7 @@
trash = /obj/item/trash/snack_bowl
bitesize = 5
/obj/item/food/snacks/soup/meatballsoup
/obj/item/food/soup/meatballsoup
name = "meatball soup"
desc = "You've got balls kid, BALLS!"
icon_state = "meatballsoup"
@@ -22,7 +22,7 @@
tastes = list("meatball" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/slimesoup
/obj/item/food/soup/slimesoup
name = "slime soup"
desc = "If no water is available, you may substitute tears."
icon_state = "slimesoup"
@@ -31,7 +31,7 @@
tastes = list("slime" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/bloodsoup
/obj/item/food/soup/bloodsoup
name = "tomato soup"
desc = "Smells like copper."
icon_state = "tomatosoup"
@@ -40,7 +40,7 @@
tastes = list("iron" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/clownstears
/obj/item/food/soup/clownstears
name = "clown's tears"
desc = "Not very funny."
icon_state = "clownstears"
@@ -49,7 +49,7 @@
tastes = list("a bad joke" = 1)
goal_difficulty = FOOD_GOAL_EXCESSIVE
/obj/item/food/snacks/soup/vegetablesoup
/obj/item/food/soup/vegetablesoup
name = "vegetable soup"
desc = "A true vegan meal." //TODO
icon_state = "vegetablesoup"
@@ -58,7 +58,7 @@
tastes = list("vegetables" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/nettlesoup
/obj/item/food/soup/nettlesoup
name = "nettle soup"
desc = "To think, the botanist would've beaten you to death with one of these."
icon_state = "nettlesoup"
@@ -67,7 +67,7 @@
tastes = list("nettles" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/mysterysoup
/obj/item/food/soup/mysterysoup
name = "mystery soup"
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
@@ -76,12 +76,12 @@
tastes = list("chaos" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/mysterysoup/Initialize(mapload)
/obj/item/food/soup/mysterysoup/Initialize(mapload)
. = ..()
extra_reagent = pick("capsaicin", "frostoil", "omnizine", "banana", "blood", "slimejelly", "toxin", "banana", "carbon", "oculine")
reagents.add_reagent("[extra_reagent]", 5)
/obj/item/food/snacks/soup/wishsoup
/obj/item/food/soup/wishsoup
name = "wish soup"
desc = "I wish this was soup."
icon_state = "wishsoup"
@@ -89,14 +89,14 @@
list_reagents = list("water" = 10)
tastes = list("wishes" = 1)
/obj/item/food/snacks/soup/wishsoup/Initialize(mapload)
/obj/item/food/soup/wishsoup/Initialize(mapload)
. = ..()
if(prob(25))
desc = "A wish come true!" // hue
reagents.add_reagent("nutriment", 9)
reagents.add_reagent("vitamin", 1)
/obj/item/food/snacks/soup/tomatosoup
/obj/item/food/soup/tomatosoup
name = "tomato soup"
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
@@ -105,7 +105,7 @@
tastes = list("tomato" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/misosoup
/obj/item/food/soup/misosoup
name = "miso soup"
desc = "The universe's best soup! Yum!!!"
icon_state = "misosoup"
@@ -113,7 +113,7 @@
tastes = list("miso" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/mushroomsoup
/obj/item/food/soup/mushroomsoup
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
@@ -122,7 +122,7 @@
tastes = list("mushroom" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/beetsoup
/obj/item/food/soup/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
@@ -131,11 +131,11 @@
tastes = list("beet" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/beetsoup/Initialize(mapload)
/obj/item/food/soup/beetsoup/Initialize(mapload)
. = ..()
name = pick("borsch", "bortsch", "borstch", "borsh", "borshch", "borscht")
/obj/item/food/snacks/soup/eyesoup
/obj/item/food/soup/eyesoup
name = "eyeball soup"
desc = "It looks back at you..."
icon_state = "eyeballsoup"
@@ -144,7 +144,7 @@
tastes = list("squirming" = 2, "tomato" = 2)
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/snacks/soup/sweetpotatosoup
/obj/item/food/soup/sweetpotatosoup
name = "sweet potato soup"
desc = "Delicious sweet potato in soup form."
icon_state = "sweetpotatosoup"
@@ -152,7 +152,7 @@
tastes = list("sweet potato" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/redbeetsoup
/obj/item/food/soup/redbeetsoup
name = "red beet soup"
desc = "Quite a delicacy."
icon_state = "redbeetsoup"
@@ -161,7 +161,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/frenchonionsoup
/obj/item/food/soup/frenchonionsoup
name = "french onion soup"
desc = "Good enough to make a grown mime cry."
icon_state = "onionsoup"
@@ -170,7 +170,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/zurek
/obj/item/food/soup/zurek
name = "zurek"
desc = "A traditional Polish soup composed of vegetables, meat, and an egg. Goes great with bread."
icon_state = "zurek"
@@ -179,7 +179,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/cullenskink
/obj/item/food/soup/cullenskink
name = "cullen skink"
desc = "A thick Scottish soup made of smoked fish, potatoes and onions."
icon_state = "cullen_skink"
@@ -188,7 +188,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/chicken_noodle_soup
/obj/item/food/soup/chicken_noodle_soup
name = "chicken noodle soup"
desc = "A hearty bowl of chicken noodle soup, perfect for when you're stuck at home and sick."
icon_state = "chicken_noodle_soup"
@@ -197,7 +197,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/cornchowder
/obj/item/food/soup/cornchowder
name = "corn chowder"
desc = "A creamy bowl of corn chowder, with bacon bits and mixed vegetables. One bowl is never enough."
icon_state = "corn_chowder"
@@ -206,7 +206,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/meatball_noodles
/obj/item/food/soup/meatball_noodles
name = "meatball noodle soup"
desc = "A hearty noodle soup made from meatballs and pasta in a rich broth. Commonly topped with a handful of chopped nuts."
icon_state = "meatball_noodles"
@@ -215,7 +215,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/seedsoup
/obj/item/food/soup/seedsoup
name = "Misklmæsch" //miskl = seed, mæsch = soup
desc = "A seed based soup, made by germinating seeds and then boiling them. \
Produces a particularly bitter broth which is usually balanced by the addition of vinegar."
@@ -229,7 +229,7 @@
// Stews //
//////////////////////
/obj/item/food/snacks/soup/stew
/obj/item/food/soup/stew
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
@@ -240,7 +240,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/stewedsoymeat
/obj/item/food/stewedsoymeat
name = "stewed soy meat"
desc = "Even non-vegetarians will LOVE this!"
icon = 'icons/obj/food/soupsalad.dmi'
@@ -251,7 +251,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/beanstew
/obj/item/food/soup/beanstew
name = "Prickeldröndolhaskl" //prickeld = spicy, röndol = bean, haskl = stew
desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread."
icon_state = "moth_bean_stew"
@@ -260,7 +260,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/oatstew
/obj/item/food/soup/oatstew
name = "Häfmisklhaskl" //häfmiskl = oat (häf from German hafer meaning oat, miskl meaning seed), haskl = stew
desc = "A spicy bean stew with lots of veggies, commonly served aboard the fleet as a filling and satisfying meal with rice or bread."
icon_state = "moth_oat_stew"
@@ -269,7 +269,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/hong_kong_borscht
/obj/item/food/soup/hong_kong_borscht
name = "hong kong borscht"
desc = "Also known as luo song tang or Russian soup, this dish bears little to no resemblance to Eastern European borscht- indeed, it's a tomato-based soup with no beets in sight."
icon_state = "hong_kong_borscht"
@@ -278,7 +278,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/hong_kong_macaroni
/obj/item/food/soup/hong_kong_macaroni
name = "hong kong macaroni"
desc = "A favourite from Hong Kong's Cha Chaan Tengs, this macaroni soup came to Mars with Cantonese settlers under Cybersun Industries, and has become as much of a breakfast staple there as it is in its homeland."
icon_state = "hong_kong_macaroni"
@@ -291,7 +291,7 @@
// Chili //
//////////////////////
/obj/item/food/snacks/soup/hotchili
/obj/item/food/soup/hotchili
name = "hot chili"
desc = "A five alarm Texan Chili!"
icon_state = "hotchili"
@@ -301,7 +301,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/coldchili
/obj/item/food/soup/coldchili
name = "cold chili"
desc = "This slush is barely a liquid!"
icon_state = "coldchili"
@@ -311,7 +311,7 @@
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/snacks/soup/clownchili
/obj/item/food/soup/clownchili
name = "chili con carnival"
desc = "A delicious stew of meat, chiles, and salty, salty clown tears."
icon_state = "clownchili"
code/modules/food_and_drinks/food/snacks.dm
-300
View File
@@ -1,300 +0,0 @@
#define MAX_WEIGHT_CLASS WEIGHT_CLASS_SMALL
//Food items that are eaten normally and don't leave anything behind.
/obj/item/food/snacks
name = "snack"
desc = "yummy"
icon = 'icons/obj/food/food.dmi'
icon_state = null
var/bitecount = 0
var/trash = null
var/slice_path
var/slices_num
var/dried_type = null
var/dry = FALSE
var/cooktype[0]
var/cooked_type = null //for microwave cooking. path of the resulting item after microwaving
var/total_w_class = 0 //for the total weight an item of food can carry
var/list/tastes // for example list("crisps" = 2, "salt" = 1)
/obj/item/food/snacks/add_initial_reagents()
if(tastes && length(tastes))
if(list_reagents)
for(var/rid in list_reagents)
var/amount = list_reagents[rid]
if(rid == "nutriment" || rid == "vitamin" || rid == "protein" || rid == "plantmatter")
reagents.add_reagent(rid, amount, tastes.Copy())
else
reagents.add_reagent(rid, amount)
else
..()
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/food/snacks/proc/On_Consume(mob/M, mob/user)
if(!user)
return
if(!reagents.total_volume)
if(M == user)
to_chat(user, "<span class='notice'>You finish eating [src].</span>")
user.visible_message("<span class='notice'>[M] finishes eating [src].</span>")
user.unEquip(src) //so icons update :[
Post_Consume(M)
var/obj/item/trash_item = generate_trash(usr)
usr.put_in_hands(trash_item)
qdel(src)
return
/obj/item/food/snacks/proc/Post_Consume(mob/living/M)
return
/obj/item/food/snacks/attack_self(mob/user)
return
/obj/item/food/snacks/attack(mob/M, mob/user, def_zone)
if(user.a_intent == INTENT_HARM && force)
return ..()
if(reagents && !reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
to_chat(user, "<span class='warning'>None of [src] left, oh no!</span>")
M.unEquip(src) //so icons update :[
qdel(src)
return FALSE
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.eat(src, user))
bitecount++
On_Consume(C, user)
return TRUE
return FALSE
/obj/item/food/snacks/afterattack(obj/target, mob/user, proximity)
return
/obj/item/food/snacks/examine(mob/user)
. = ..()
if(in_range(user, src))
if(bitecount > 0)
if(bitecount==1)
. += "<span class='notice'>[src] was bitten by someone!</span>"
else if(bitecount<=3)
. += "<span class='notice'>[src] was bitten [bitecount] times!</span>"
else
. += "<span class='notice'>[src] was bitten multiple times!</span>"
/obj/item/food/snacks/attackby(obj/item/W, mob/user, params)
if(is_pen(W))
rename_interactive(user, W, use_prefix = FALSE, prompt = "What would you like to name this dish?")
return
if(isstorage(W))
..() // -> item/attackby(, params)
else if(istype(W,/obj/item/kitchen/utensil))
var/obj/item/kitchen/utensil/U = W
if(length(U.contents) >= U.max_contents)
to_chat(user, "<span class='warning'>You cannot fit anything else on your [U].")
return
user.visible_message( \
"[user] scoops up some [src] with \the [U]!", \
"<span class='notice'>You scoop up some [src] with \the [U]!" \
)
bitecount++
U.overlays.Cut()
var/image/I = new(U.icon, "loadedfood")
I.color = filling_color
U.overlays += I
var/obj/item/food/snacks/collected = new type
collected.name = name
collected.loc = U
collected.reagents.remove_any(collected.reagents.total_volume)
collected.trash = null
if(reagents.total_volume > bitesize)
reagents.trans_to(collected, bitesize)
else
reagents.trans_to(collected, reagents.total_volume)
if(trash)
var/obj/item/TrashItem
if(ispath(trash,/obj/item))
TrashItem = new trash(src)
else if(isitem(trash))
TrashItem = trash
TrashItem.forceMove(loc)
qdel(src)
return TRUE
else
return ..()
/obj/item/food/snacks/proc/generate_trash(atom/location)
if(trash)
if(ispath(trash, /obj/item))
. = new trash(location)
trash = null
return
else if(isitem(trash))
var/obj/item/trash_item = trash
trash_item.forceMove(location)
. = trash
trash = null
return
/obj/item/food/snacks/Destroy()
if(contents)
for(var/atom/movable/something in contents)
something.loc = get_turf(src)
return ..()
/obj/item/food/snacks/attack_animal(mob/M)
if(isanimal(M))
M.changeNext_move(CLICK_CD_MELEE)
if(isdog(M))
var/mob/living/simple_animal/pet/dog/D = M
if(world.time < (D.last_eaten + 300))
to_chat(D, "<span class='notice'>You are too full to try eating [src] right now.</span>")
else if(bitecount >= 4)
D.visible_message("[D] [pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where [src] was")].","<span class='notice'>You swallow up the last part of [src].</span>")
playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
D.adjustHealth(-10)
D.last_eaten = world.time
D.taste(reagents)
qdel(src)
else
D.visible_message("[D] takes a bite of [src].","<span class='notice'>You take a bite of [src].</span>")
playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
bitecount++
D.last_eaten = world.time
D.taste(reagents)
else if(ismouse(M))
var/mob/living/simple_animal/mouse/N = M
to_chat(N, "<span class='notice'>You nibble away at [src].</span>")
if(prob(50))
N.visible_message("[N] nibbles away at [src].", "")
N.adjustHealth(-2)
N.taste(reagents)
else if(iscaterpillar(M))
var/mob/living/simple_animal/nian_caterpillar/W = M
W.taste(reagents)
W.consume(src)
/obj/item/food/snacks/sliceable/examine(mob/user)
. = ..()
. += "<span class='notice'>Alt-click to put something small inside.</span>"
/obj/item/food/snacks/sliceable/AltClick(mob/user)
if(!Adjacent(user))
return
var/obj/item/I = user.get_active_hand()
if(!I)
return
if(I.w_class > WEIGHT_CLASS_SMALL)
to_chat(user, "<span class='warning'>You cannot fit [I] in [src]!</span>")
return
var/newweight = GetTotalContentsWeight() + I.GetTotalContentsWeight() + I.w_class
if(newweight > MAX_WEIGHT_CLASS)
// Nope, no bluespace slice food
to_chat(user, "<span class='warning'>You cannot fit [I] in [src]!</span>")
return
if(!iscarbon(user))
return
if(!user.drop_item())
to_chat(user, "<span class='warning'>You cannot slip [I] inside [src]!</span>")
return
to_chat(user, "<span class='warning'>You slip [I] inside [src].</span>")
total_w_class += I.w_class
add_fingerprint(user)
I.forceMove(src)
/obj/item/food/snacks/sliceable/attackby(obj/item/I, mob/user, params)
if((slices_num <= 0 || !slices_num) || !slice_path)
return FALSE
var/inaccurate = TRUE
if(I.sharp)
if(istype(I, /obj/item/kitchen/knife) || istype(I, /obj/item/scalpel))
inaccurate = FALSE
else
return TRUE
if(!isturf(loc) || !(locate(/obj/structure/table) in loc) && \
!(locate(/obj/machinery/optable) in loc) && !(locate(/obj/item/storage/bag/tray) in loc))
to_chat(user, "<span class='warning'>You cannot slice [src] here! You need a table or at least a tray to do it.</span>")
return TRUE
var/slices_lost = 0
if(!inaccurate)
user.visible_message("<span class='notice'>[user] slices [src]!</span>",
"<span class='notice'>You slice [src]!</span>")
else
user.visible_message("<span class='notice'>[user] crudely slices [src] with [I]!</span>",
"<span class='notice'>You crudely slice [src] with your [I]</span>!")
slices_lost = rand(1,min(1,round(slices_num/2)))
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i=1 to (slices_num-slices_lost))
var/obj/slice = new slice_path (loc)
reagents.trans_to(slice,reagents_per_slice)
slice.pixel_x = rand(-7, 7)
slice.pixel_y = rand(-7, 7)
qdel(src)
return ..()
////////////////////////////////////////////////////////////////////////////////
/// FOOD END
////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////
////////////////////////////////////////////Snacks
//////////////////////////////////////////////////
//Items in the "Snacks" subcategory are food items that people actually eat. The key points are that they are created
// already filled with reagents and are destroyed when empty. Additionally, they make a "munching" noise when eaten.
//Notes by Darem: Food in the "snacks" subtype can hold a maximum of 50 units Generally speaking, you don't want to go over 40
// total for the item because you want to leave space for extra condiments. If you want effect besides healing, add a reagent for
// it. Try to stick to existing reagents when possible (so if you want a stronger healing effect, just use Tricordrazine). On use
// effect (such as the old officer eating a donut code) requires a unique reagent (unless you can figure out a better way).
//The nutriment reagent and bitesize variable replace the old heal_amt and amount variables. Each unit of nutriment is equal to
// 2 of the old heal_amt variable. Bitesize is the rate at which the reagents are consumed. So if you have 6 nutriment and a
// bitesize of 2, then it'll take 3 bites to eat. Unlike the old system, the contained reagents are evenly spread among all
// the bites. No more contained reagents = no more bites.
/obj/item/food/snacks/badrecipe
name = "burned mess"
desc = "Someone should be demoted from chef for this."
icon_state = "badrecipe"
filling_color = "#211F02"
list_reagents = list("????" = 30)
/obj/item/food/snacks/badrecipe/Initialize(mapload)
. = ..()
// it's burned! it should start off being classed as any cooktype that burns
cooktype["grilled"] = TRUE
cooktype["deep fried"] = TRUE
// MISC
/obj/item/food/snacks/cereal
name = "box of cereal"
desc = "A box of cereal."
icon = 'icons/obj/food/food.dmi'
icon_state = "cereal_box"
list_reagents = list("nutriment" = 3)
/obj/item/food/snacks/deepfryholder
name = "Deep Fried Foods Holder Obj"
desc = "If you can see this description the code for the deep fryer fucked up."
icon = 'icons/obj/food/food.dmi'
icon_state = "deepfried_holder_icon"
list_reagents = list("nutriment" = 3)
#undef MAX_WEIGHT_CLASS
code/modules/food_and_drinks/food_base.dm
+266 -2
View File
@@ -2,7 +2,13 @@
/// Food.
////////////////////////////////////////////////////////////////////////////////
#define MAX_WEIGHT_CLASS WEIGHT_CLASS_SMALL
/obj/item/food
name = "snack"
desc = "yummy"
icon = 'icons/obj/food/food.dmi'
icon_state = null
resistance_flags = FLAMMABLE
container_type = INJECTABLE
w_class = WEIGHT_CLASS_TINY
@@ -33,6 +39,17 @@
/// Affects the quantity of food that is requested by CC.
var/goal_difficulty = FOOD_GOAL_SKIP
var/bitecount = 0
var/trash = null
var/slice_path
var/slices_num
var/dried_type = null
var/dry = FALSE
var/cooktype[0]
var/cooked_type = null //for microwave cooking. path of the resulting item after microwaving
var/total_w_class = 0 //for the total weight an item of food can carry
var/list/tastes // for example list("crisps" = 2, "salt" = 1)
/obj/item/food/Initialize(mapload)
. = ..()
@@ -57,10 +74,21 @@
ant_location = null
if(isprocessing)
STOP_PROCESSING(SSobj, src)
if(contents)
for(var/atom/movable/something in contents)
something.forceMove(get_turf(src))
return ..()
/obj/item/food/proc/add_initial_reagents() // This literally is only a proc for junk food
if(list_reagents)
/obj/item/food/proc/add_initial_reagents()
if(tastes && length(tastes) && length(list_reagents))
for(var/rid in list_reagents)
var/amount = list_reagents[rid]
if(rid == "nutriment" || rid == "vitamin" || rid == "protein" || rid == "plantmatter")
reagents.add_reagent(rid, amount, tastes.Copy())
else
reagents.add_reagent(rid, amount)
else if(length(list_reagents))
reagents.add_reagent_list(list_reagents)
/obj/item/food/process()
@@ -95,9 +123,245 @@
desc += " It appears to be infested with ants. Yuck!"
reagents.add_reagent("ants", 1) // Don't eat things with ants in it you weirdo.
/obj/item/food/examine(mob/user)
. = ..()
if(in_range(user, src))
if(bitecount > 0)
if(bitecount==1)
. += "<span class='notice'>[src] was bitten by someone!</span>"
else if(bitecount<=3)
. += "<span class='notice'>[src] was bitten [bitecount] times!</span>"
else
. += "<span class='notice'>[src] was bitten multiple times!</span>"
/obj/item/food/ex_act()
if(reagents)
for(var/datum/reagent/R in reagents.reagent_list)
R.on_ex_act()
if(!QDELETED(src))
..()
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/food/proc/On_Consume(mob/M, mob/user)
if(!user)
return
if(!reagents.total_volume)
if(M == user)
to_chat(user, "<span class='notice'>You finish eating [src].</span>")
user.visible_message("<span class='notice'>[M] finishes eating [src].</span>")
user.unEquip(src) //so icons update :[
Post_Consume(M)
var/obj/item/trash_item = generate_trash(user)
user.put_in_hands(trash_item)
qdel(src)
/obj/item/food/proc/Post_Consume(mob/living/M)
return
/obj/item/food/attack_self(mob/user)
return
/obj/item/food/attack(mob/M, mob/user, def_zone)
if(user.a_intent == INTENT_HARM && force)
return ..()
if(reagents && !reagents.total_volume) // Shouldn't be needed but it checks to see if it has anything left in it.
to_chat(user, "<span class='warning'>None of [src] left, oh no!</span>")
M.unEquip(src) //so icons update :[
qdel(src)
return FALSE
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.eat(src, user))
bitecount++
On_Consume(C, user)
return TRUE
return FALSE
/obj/item/food/afterattack(obj/target, mob/user, proximity)
return
/obj/item/food/attackby(obj/item/W, mob/user, params)
if(is_pen(W))
rename_interactive(user, W, use_prefix = FALSE, prompt = "What would you like to name this dish?")
return
if(isstorage(W))
..() // -> item/attackby(, params)
else if(istype(W,/obj/item/kitchen/utensil))
var/obj/item/kitchen/utensil/U = W
if(length(U.contents) >= U.max_contents)
to_chat(user, "<span class='warning'>You cannot fit anything else on your [U].")
return
user.visible_message( \
"[user] scoops up some [src] with \the [U]!", \
"<span class='notice'>You scoop up some [src] with \the [U]!" \
)
bitecount++
U.overlays.Cut()
var/image/I = new(U.icon, "loadedfood")
I.color = filling_color
U.overlays += I
var/obj/item/food/collected = new type
collected.name = name
collected.loc = U
collected.reagents.remove_any(collected.reagents.total_volume)
collected.trash = null
if(reagents.total_volume > bitesize)
reagents.trans_to(collected, bitesize)
else
reagents.trans_to(collected, reagents.total_volume)
if(trash)
var/obj/item/TrashItem
if(ispath(trash,/obj/item))
TrashItem = new trash(src)
else if(isitem(trash))
TrashItem = trash
TrashItem.forceMove(loc)
qdel(src)
return TRUE
else
return ..()
/obj/item/food/proc/generate_trash(atom/location)
if(trash)
if(ispath(trash, /obj/item))
. = new trash(location)
trash = null
return
else if(isitem(trash))
var/obj/item/trash_item = trash
trash_item.forceMove(location)
. = trash
trash = null
return
/obj/item/food/attack_animal(mob/M)
if(isanimal(M))
M.changeNext_move(CLICK_CD_MELEE)
if(isdog(M))
var/mob/living/simple_animal/pet/dog/D = M
if(world.time < (D.last_eaten + 300))
to_chat(D, "<span class='notice'>You are too full to try eating [src] right now.</span>")
else if(bitecount >= 4)
D.visible_message("[D] [pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where [src] was")].","<span class='notice'>You swallow up the last part of [src].</span>")
playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
D.adjustHealth(-10)
D.last_eaten = world.time
D.taste(reagents)
qdel(src)
else
D.visible_message("[D] takes a bite of [src].","<span class='notice'>You take a bite of [src].</span>")
playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
bitecount++
D.last_eaten = world.time
D.taste(reagents)
else if(ismouse(M))
var/mob/living/simple_animal/mouse/N = M
to_chat(N, "<span class='notice'>You nibble away at [src].</span>")
if(prob(50))
N.visible_message("[N] nibbles away at [src].", "")
N.adjustHealth(-2)
N.taste(reagents)
else if(iscaterpillar(M))
var/mob/living/simple_animal/nian_caterpillar/W = M
W.taste(reagents)
W.consume(src)
/obj/item/food/sliceable
slices_num = 2
/obj/item/food/sliceable/examine(mob/user)
. = ..()
. += "<span class='notice'>Alt-click to put something small inside.</span>"
/obj/item/food/sliceable/AltClick(mob/user)
if(!Adjacent(user))
return
var/obj/item/I = user.get_active_hand()
if(!I)
return
if(I.w_class > WEIGHT_CLASS_SMALL)
to_chat(user, "<span class='warning'>You cannot fit [I] in [src]!</span>")
return
var/newweight = GetTotalContentsWeight() + I.GetTotalContentsWeight() + I.w_class
if(newweight > MAX_WEIGHT_CLASS)
// Nope, no bluespace slice food
to_chat(user, "<span class='warning'>You cannot fit [I] in [src]!</span>")
return
if(!iscarbon(user))
return
if(!user.drop_item())
to_chat(user, "<span class='warning'>You cannot slip [I] inside [src]!</span>")
return
to_chat(user, "<span class='warning'>You slip [I] inside [src].</span>")
total_w_class += I.w_class
add_fingerprint(user)
I.forceMove(src)
/obj/item/food/sliceable/attackby(obj/item/I, mob/user, params)
if((slices_num <= 0 || !slices_num) || !slice_path)
return FALSE
var/inaccurate = TRUE
if(I.sharp)
if(istype(I, /obj/item/kitchen/knife) || istype(I, /obj/item/scalpel))
inaccurate = FALSE
else
return TRUE
if(!isturf(loc) || !(locate(/obj/structure/table) in loc) && \
!(locate(/obj/machinery/optable) in loc) && !(locate(/obj/item/storage/bag/tray) in loc))
to_chat(user, "<span class='warning'>You cannot slice [src] here! You need a table or at least a tray to do it.</span>")
return TRUE
var/slices_lost = 0
if(!inaccurate)
user.visible_message("<span class='notice'>[user] slices [src]!</span>",
"<span class='notice'>You slice [src]!</span>")
else
user.visible_message("<span class='notice'>[user] crudely slices [src] with [I]!</span>",
"<span class='notice'>You crudely slice [src] with your [I]</span>!")
slices_lost = rand(1, min(1, round(slices_num / 2)))
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i in 1 to (slices_num - slices_lost))
var/obj/slice = new slice_path (loc)
reagents.trans_to(slice,reagents_per_slice)
slice.pixel_x = rand(-7, 7)
slice.pixel_y = rand(-7, 7)
qdel(src)
return ..()
/obj/item/food/badrecipe
name = "burned mess"
desc = "Someone should be demoted from chef for this."
icon_state = "badrecipe"
filling_color = "#211F02"
list_reagents = list("????" = 30)
/obj/item/food/badrecipe/Initialize(mapload)
. = ..()
// it's burned! it should start off being classed as any cooktype that burns
cooktype["grilled"] = TRUE
cooktype["deep fried"] = TRUE
// MISC
/obj/item/food/cereal
name = "box of cereal"
desc = "A box of cereal."
icon = 'icons/obj/food/food.dmi'
icon_state = "cereal_box"
list_reagents = list("nutriment" = 3)
/obj/item/food/deepfryholder
name = "Deep Fried Foods Holder Obj"
desc = "If you can see this description the code for the deep fryer fucked up."
icon = 'icons/obj/food/food.dmi'
icon_state = "deepfried_holder_icon"
list_reagents = list("nutriment" = 3)
#undef MAX_WEIGHT_CLASS
code/modules/food_and_drinks/kitchen_machinery/cereal_maker.dm
+1 -1
View File
@@ -19,6 +19,6 @@
setme.desc = "[name.desc] It has been [thiscooktype]"
/obj/machinery/cooker/cerealmaker/gettype()
var/obj/item/food/snacks/cereal/type = new(get_turf(src))
var/obj/item/food/cereal/type = new(get_turf(src))
return type
code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+9 -9
View File
@@ -34,13 +34,13 @@
return ..()
// checks if the snack has been cooked in a certain way
/obj/machinery/cooker/proc/checkCooked(obj/item/food/snacks/D)
/obj/machinery/cooker/proc/checkCooked(obj/item/food/D)
if(D.cooktype[thiscooktype])
return 1
return 0
// Sets the new snack's cooktype list to the same as the old one - no more cooking something in the same machine more than once!
/obj/machinery/cooker/proc/setCooked(obj/item/food/snacks/oldtypes, obj/item/food/snacks/newtypes)
/obj/machinery/cooker/proc/setCooked(obj/item/food/oldtypes, obj/item/food/newtypes)
var/ct
for(ct in oldtypes.cooktype)
newtypes.cooktype[ct] = oldtypes.cooktype[ct]
@@ -115,7 +115,7 @@
return FALSE
if(has_specials && checkSpecials(check))
return TRUE
if(istype(check, /obj/item/food/snacks) || emagged)
if(istype(check, /obj/item/food) || emagged)
if(istype(check, /obj/item/disk/nuclear)) //(1984 voice) you will not deep fry the NAD
to_chat(user, "<span class='notice'>The disk is more useful raw than [thiscooktype].</span>")
return FALSE
@@ -147,7 +147,7 @@
// if burns = FALSE then it'll just tell you that the item is already that foodtype and it would do nothing
// if you wanted a different side effect set burns to 1 and override burn_food()
/obj/machinery/cooker/proc/burn_food(mob/user, obj/item/reagent_containers/props)
var/obj/item/food/snacks/badrecipe/burnt = new(get_turf(src))
var/obj/item/food/badrecipe/burnt = new(get_turf(src))
setRegents(props, burnt)
soundloop.stop()
to_chat(user, "<span class='warning'>You smell burning coming from [src]!</span>")
@@ -177,7 +177,7 @@
// Override this with the correct snack type
/obj/machinery/cooker/proc/gettype()
var/obj/item/food/snacks/type = new(get_turf(src))
var/obj/item/food/type = new(get_turf(src))
return type
/obj/machinery/cooker/attackby(obj/item/I, mob/user, params)
@@ -197,7 +197,7 @@
if(!checkValid(I, user))
return
if(!burns)
if(istype(I, /obj/item/food/snacks))
if(istype(I, /obj/item/food))
if(checkCooked(I))
to_chat(user, "<span class='warning'>That is already [thiscooktype], it would do nothing!</span>")
return
@@ -226,17 +226,17 @@
cookSpecial(special) //Handle cooking the item as appropriate
turnoff(I) //Shut off the machine and qdel the original item
return
if(istype(I, /obj/item/food/snacks))
if(istype(I, /obj/item/food))
if(checkCooked(I))
burn_food(user, I)
turnoff(I)
return
var/obj/item/food/snacks/newfood = gettype()
var/obj/item/food/newfood = gettype()
setIcon(I, newfood)
changename(I, newfood)
if(istype(I, /obj/item/reagent_containers))
setRegents(I, newfood)
if(istype(I, /obj/item/food/snacks))
if(istype(I, /obj/item/food))
setCooked(I, newfood)
newfood.cooktype[thiscooktype] = TRUE
turnoff(I)
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+20 -20
View File
@@ -40,7 +40,7 @@
cooktime = (200 - (E * 20)) //Effectively each laser improves cooktime by 20 per rating beyond the first (200 base, 80 max upgrade)
/obj/machinery/cooker/deepfryer/gettype()
var/obj/item/food/snacks/deepfryholder/type = new(get_turf(src))
var/obj/item/food/deepfryholder/type = new(get_turf(src))
return type
/obj/machinery/cooker/deepfryer/attackby(obj/item/I, mob/user, params)
@@ -157,44 +157,44 @@
return istype(I, input)
/datum/deepfryer_special/shrimp
input = /obj/item/food/snacks/shrimp
output = /obj/item/food/snacks/fried_shrimp
input = /obj/item/food/shrimp
output = /obj/item/food/fried_shrimp
/datum/deepfryer_special/banana
input = /obj/item/food/snacks/grown/banana
output = /obj/item/food/snacks/friedbanana
input = /obj/item/food/grown/banana
output = /obj/item/food/friedbanana
/datum/deepfryer_special/fries
input = /obj/item/food/snacks/rawsticks
output = /obj/item/food/snacks/fries
input = /obj/item/food/rawsticks
output = /obj/item/food/fries
/datum/deepfryer_special/corn_chips
input = /obj/item/food/snacks/grown/corn
output = /obj/item/food/snacks/cornchips
input = /obj/item/food/grown/corn
output = /obj/item/food/cornchips
/datum/deepfryer_special/fried_tofu
input = /obj/item/food/snacks/tofu
output = /obj/item/food/snacks/fried_tofu
input = /obj/item/food/tofu
output = /obj/item/food/fried_tofu
/datum/deepfryer_special/chimichanga
input = /obj/item/food/snacks/burrito
output = /obj/item/food/snacks/chimichanga
input = /obj/item/food/burrito
output = /obj/item/food/chimichanga
/datum/deepfryer_special/potato_chips
input = /obj/item/food/snacks/grown/potato/wedges
output = /obj/item/food/snacks/chips
input = /obj/item/food/grown/potato/wedges
output = /obj/item/food/chips
/datum/deepfryer_special/carrotfries
input = /obj/item/food/snacks/grown/carrot/wedges
output = /obj/item/food/snacks/carrotfries
input = /obj/item/food/grown/carrot/wedges
output = /obj/item/food/carrotfries
/datum/deepfryer_special/onionrings
input = /obj/item/food/snacks/onion_slice
output = /obj/item/food/snacks/onionrings
input = /obj/item/food/onion_slice
output = /obj/item/food/onionrings
/datum/deepfryer_special/fried_vox
input = /obj/item/organ/external
output = /obj/item/food/snacks/fried_vox
output = /obj/item/food/fried_vox
/datum/deepfryer_special/fried_vox/validate(obj/item/I)
if(!..())
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+2 -2
View File
@@ -245,13 +245,13 @@
var/slab_name = occupant.name
var/slab_count = 6
var/slab_type = /obj/item/food/snacks/meat/human //gibber can only gib humans on paracode, no need to check meat type
var/slab_type = /obj/item/food/meat/human //gibber can only gib humans on paracode, no need to check meat type
var/slab_nutrition = occupant.nutrition / 15
slab_nutrition /= slab_count
for(var/i=1 to slab_count)
var/obj/item/food/snacks/meat/new_meat = new slab_type(src)
var/obj/item/food/meat/new_meat = new slab_type(src)
new_meat.name = "[slab_name] [new_meat.name]"
new_meat.reagents.add_reagent("nutriment", slab_nutrition)
code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
+4 -4
View File
@@ -42,7 +42,7 @@
to_chat(user, "<span class='notice'>You add [I] to [src]</span>")
updateUsrDialog()
return
if(istype(I, /obj/item/food/snacks/frozen/icecream))
if(istype(I, /obj/item/food/frozen/icecream))
if(!I.reagents.has_reagent("sprinkles"))
if(I.reagents.total_volume > 29)
I.reagents.remove_any(1)
@@ -141,7 +141,7 @@
else if(href_list["createchoco"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Chocolate Cone"
var/obj/item/food/snacks/frozen/icecream/icecreamcup/C = new(loc)
var/obj/item/food/frozen/icecream/icecreamcup/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
@@ -153,7 +153,7 @@
else if(href_list["createcone"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Cone"
var/obj/item/food/snacks/frozen/icecream/icecreamcone/C = new(loc)
var/obj/item/food/frozen/icecream/icecreamcone/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
@@ -165,7 +165,7 @@
else if(href_list["createwaffle"])
var/name = generate_name(reagents.get_master_reagent_name())
name += " Waffle Cone"
var/obj/item/food/snacks/frozen/icecream/wafflecone/C = new(loc)
var/obj/item/food/frozen/icecream/wafflecone/C = new(loc)
C.name = "[name]"
C.pixel_x = rand(-8, 8)
C.pixel_y = -16
code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+2 -2
View File
@@ -65,7 +65,7 @@
GLOB.cooking_reagents[recipe_type] |= reagent
else
qdel(recipe)
GLOB.cooking_ingredients[recipe_type] |= /obj/item/food/snacks/grown
GLOB.cooking_ingredients[recipe_type] |= /obj/item/food/grown
/*******************
* Item Adding
@@ -424,7 +424,7 @@
amount += reagents.total_volume
reagents.clear_reagents()
if(amount)
var/obj/item/food/snacks/badrecipe/mysteryfood = new(src)
var/obj/item/food/badrecipe/mysteryfood = new(src)
mysteryfood.reagents.add_reagent("carbon", amount / 2)
mysteryfood.reagents.add_reagent("????", amount / 15)
mysteryfood.forceMove(get_turf(src))
code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+7 -7
View File
@@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
var/required_grind = 5
var/cube_production = 1
var/cycle_through = 0
var/obj/item/food/snacks/monkeycube/cube_type = /obj/item/food/snacks/monkeycube
var/obj/item/food/monkeycube/cube_type = /obj/item/food/monkeycube
var/list/connected = list()
/obj/machinery/monkey_recycler/Initialize(mapload)
@@ -73,17 +73,17 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
cycle_through++
switch(cycle_through)
if(1)
cube_type = /obj/item/food/snacks/monkeycube/nian_wormecube
cube_type = /obj/item/food/monkeycube/nian_wormecube
if(2)
cube_type = /obj/item/food/snacks/monkeycube/farwacube
cube_type = /obj/item/food/monkeycube/farwacube
if(3)
cube_type = /obj/item/food/snacks/monkeycube/wolpincube
cube_type = /obj/item/food/monkeycube/wolpincube
if(4)
cube_type = /obj/item/food/snacks/monkeycube/stokcube
cube_type = /obj/item/food/monkeycube/stokcube
if(5)
cube_type = /obj/item/food/snacks/monkeycube/neaeracube
cube_type = /obj/item/food/monkeycube/neaeracube
if(6)
cube_type = /obj/item/food/snacks/monkeycube
cube_type = /obj/item/food/monkeycube
cycle_through = 0
to_chat(user, "<span class='notice'>You change the monkeycube type to [initial(cube_type.name)].</span>")
else
code/modules/food_and_drinks/kitchen_machinery/processor.dm
+16 -16
View File
@@ -89,36 +89,36 @@
/////OBJECT RECIPIES/////
/////////////////////////
/datum/food_processor_process/meat
input = /obj/item/food/snacks/meat
output = /obj/item/food/snacks/meatball
input = /obj/item/food/meat
output = /obj/item/food/meatball
/datum/food_processor_process/potato
input = /obj/item/food/snacks/grown/potato
output = /obj/item/food/snacks/rawsticks
input = /obj/item/food/grown/potato
output = /obj/item/food/rawsticks
/datum/food_processor_process/rawsticks
input = /obj/item/food/snacks/rawsticks
output = /obj/item/food/snacks/tatortot
input = /obj/item/food/rawsticks
output = /obj/item/food/tatortot
/datum/food_processor_process/soybeans
input = /obj/item/food/snacks/grown/soybeans
output = /obj/item/food/snacks/soydope
input = /obj/item/food/grown/soybeans
output = /obj/item/food/soydope
/datum/food_processor_process/spaghetti
input = /obj/item/food/snacks/doughslice
output = /obj/item/food/snacks/spaghetti
input = /obj/item/food/doughslice
output = /obj/item/food/spaghetti
/datum/food_processor_process/macaroni
input = /obj/item/food/snacks/spaghetti
output = /obj/item/food/snacks/macaroni
input = /obj/item/food/spaghetti
output = /obj/item/food/macaroni
/datum/food_processor_process/parsnip
input = /obj/item/food/snacks/grown/parsnip
output = /obj/item/food/snacks/roastparsnip
input = /obj/item/food/grown/parsnip
output = /obj/item/food/roastparsnip
/datum/food_processor_process/carrot
input = /obj/item/food/snacks/grown/carrot
output = /obj/item/food/snacks/grown/carrot/wedges
input = /obj/item/food/grown/carrot
output = /obj/item/food/grown/carrot/wedges
/datum/food_processor_process/towercap
input = /obj/item/grown/log
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+10 -10
View File
@@ -82,7 +82,7 @@
update_icon(UPDATE_OVERLAYS)
// Accepted items
accepted_items_typecache = typecacheof(list(
/obj/item/food/snacks/grown,
/obj/item/food/grown,
/obj/item/seeds,
/obj/item/grown,
))
@@ -439,10 +439,10 @@
// Syndicate Druglab Ruin
/obj/machinery/smartfridge/food/syndicate_druglab
starting_items = list(
/obj/item/food/snacks/boiledrice = 2,
/obj/item/food/snacks/macncheese = 1,
/obj/item/food/snacks/syndicake = 3,
/obj/item/food/snacks/beans = 4,
/obj/item/food/boiledrice = 2,
/obj/item/food/macncheese = 1,
/obj/item/food/syndicake = 3,
/obj/item/food/beans = 4,
/obj/item/reagent_containers/glass/beaker/waterbottle/large = 7,
/obj/item/reagent_containers/drinks/bottle/kahlua = 1,
/obj/item/reagent_containers/drinks/bottle/orangejuice = 2)
@@ -487,7 +487,7 @@
/obj/machinery/smartfridge/foodcart/Initialize(mapload)
. = ..()
accepted_items_typecache = typecacheof(list(
/obj/item/food/snacks,
/obj/item/food,
/obj/item/reagent_containers/drinks,
/obj/item/reagent_containers/condiment,
))
@@ -816,7 +816,7 @@
component_parts = null
// Accepted items
accepted_items_typecache = typecacheof(list(
/obj/item/food/snacks,
/obj/item/food,
/obj/item/stack/sheet/wetleather,
))
@@ -865,8 +865,8 @@
/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
. = ..()
// If it's a food, reject non driable ones
if(istype(O, /obj/item/food/snacks))
var/obj/item/food/snacks/S = O
if(istype(O, /obj/item/food))
var/obj/item/food/S = O
if(!S.dried_type)
return FALSE
@@ -887,7 +887,7 @@
* Called in [/obj/machinery/smartfridge/drying_rack/process] to dry the contents.
*/
/obj/machinery/smartfridge/drying_rack/proc/rack_dry()
for(var/obj/item/food/snacks/S in contents)
for(var/obj/item/food/S in contents)
if(S.dried_type == S.type)//if the dried type is the same as the object's type, don't bother creating a whole new item...
S.color = "#ad7257"
S.dry = TRUE
code/modules/food_and_drinks/recipes/recipes_candy.dm
+153 -153
View File
@@ -3,7 +3,7 @@
* /datum/recipe/candy/
* reagents = list()
* items = list()
* result = /obj/item/food/snacks/
* result = /obj/item/food/
* byproduct = /obj/item/ // only set this if the recipe has a byproduct, like returning it's mould
*
* NOTE: If using a mould, make sure to list it in *BOTH* the items and byproduct lists if it is to be returned.
@@ -18,74 +18,74 @@
/datum/recipe/candy/chocolate_bar
reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
result = /obj/item/food/snacks/chocolatebar
result = /obj/item/food/chocolatebar
/datum/recipe/candy/chocolate_bar2
reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
result = /obj/item/food/snacks/chocolatebar
result = /obj/item/food/chocolatebar
/datum/recipe/candy/fudge_peanut
reagents = list("sugar" = 5, "milk" = 5)
items = list(/obj/item/food/snacks/chocolatebar, /obj/item/food/snacks/grown/peanuts,
/obj/item/food/snacks/grown/peanuts, /obj/item/food/snacks/grown/peanuts)
result = /obj/item/food/snacks/candy/fudge/peanut
items = list(/obj/item/food/chocolatebar, /obj/item/food/grown/peanuts,
/obj/item/food/grown/peanuts, /obj/item/food/grown/peanuts)
result = /obj/item/food/candy/fudge/peanut
/datum/recipe/candy/fudge_cherry
reagents = list("sugar" = 5, "milk" = 5)
items = list(/obj/item/food/snacks/chocolatebar, /obj/item/food/snacks/grown/cherries,
/obj/item/food/snacks/grown/cherries, /obj/item/food/snacks/grown/cherries)
result = /obj/item/food/snacks/candy/fudge/cherry
items = list(/obj/item/food/chocolatebar, /obj/item/food/grown/cherries,
/obj/item/food/grown/cherries, /obj/item/food/grown/cherries)
result = /obj/item/food/candy/fudge/cherry
/datum/recipe/candy/fudge_cookies_n_cream
reagents = list("sugar" = 5, "milk" = 5, "cream" = 5)
items = list(
/obj/item/food/snacks/chocolatebar,
/obj/item/food/snacks/cookie,
/obj/item/food/chocolatebar,
/obj/item/food/cookie,
)
result = /obj/item/food/snacks/candy/fudge/cookies_n_cream
result = /obj/item/food/candy/fudge/cookies_n_cream
/datum/recipe/candy/fudge_turtle
reagents = list("sugar" = 5, "milk" = 5)
items = list(
/obj/item/food/snacks/chocolatebar,
/obj/item/food/snacks/candy/caramel,
/obj/item/food/snacks/grown/peanuts
/obj/item/food/chocolatebar,
/obj/item/food/candy/caramel,
/obj/item/food/grown/peanuts
)
result = /obj/item/food/snacks/candy/fudge/turtle
result = /obj/item/food/candy/fudge/turtle
/datum/recipe/candy/fudge
reagents = list("sugar" = 5, "milk" = 5)
items = list(/obj/item/food/snacks/chocolatebar)
result = /obj/item/food/snacks/candy/fudge
items = list(/obj/item/food/chocolatebar)
result = /obj/item/food/candy/fudge
/datum/recipe/candy/caramel
reagents = list("sugar" = 5, "cream" = 5)
items = list()
result = /obj/item/food/snacks/candy/caramel
result = /obj/item/food/candy/caramel
/datum/recipe/candy/toffee
reagents = list("sugar" = 5, "flour" = 10)
result = /obj/item/food/snacks/candy/toffee
result = /obj/item/food/candy/toffee
/datum/recipe/candy/taffy
reagents = list("salglu_solution" = 15)
items = list()
result = /obj/item/food/snacks/candy/taffy
result = /obj/item/food/candy/taffy
/datum/recipe/candy/nougat
reagents = list("sugar" = 5, "cornoil" = 5)
items = list(/obj/item/food/snacks/egg)
result = /obj/item/food/snacks/candy/nougat
items = list(/obj/item/food/egg)
result = /obj/item/food/candy/nougat
/datum/recipe/candy/nougat/make_food(obj/container)
var/obj/item/food/snacks/candy/nougat/being_cooked = ..()
var/obj/item/food/candy/nougat/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/candy/wafflecone
reagents = list("milk" = 1, "sugar" = 1)
result = /obj/item/food/snacks/wafflecone
result = /obj/item/food/wafflecone
// ***********************************************************
// Base Candy Recipes (unflavored / plain)
@@ -96,14 +96,14 @@
items = list(
/obj/item/c_tube,
)
result = /obj/item/food/snacks/candy/cotton
result = /obj/item/food/candy/cotton
/datum/recipe/candy/gummybear
reagents = list("sugar" = 5, "water" = 5, "cornoil" = 5)
items = list(
/obj/item/kitchen/mould/bear,
)
result = /obj/item/food/snacks/candy/gummybear
result = /obj/item/food/candy/gummybear
byproduct = /obj/item/kitchen/mould/bear
/datum/recipe/candy/gummyworm
@@ -111,7 +111,7 @@
items = list(
/obj/item/kitchen/mould/worm,
)
result = /obj/item/food/snacks/candy/gummyworm
result = /obj/item/food/candy/gummyworm
byproduct = /obj/item/kitchen/mould/worm
/datum/recipe/candy/jellybean
@@ -119,7 +119,7 @@
items = list(
/obj/item/kitchen/mould/bean,
)
result = /obj/item/food/snacks/candy/jellybean
result = /obj/item/food/candy/jellybean
byproduct = /obj/item/kitchen/mould/bean
/datum/recipe/candy/jawbreaker
@@ -127,44 +127,44 @@
items = list(
/obj/item/kitchen/mould/ball,
)
result = /obj/item/food/snacks/candy/jawbreaker
result = /obj/item/food/candy/jawbreaker
byproduct = /obj/item/kitchen/mould/ball
/datum/recipe/candy/candycane
reagents = list("sugar" = 5)
items = list(
/obj/item/kitchen/mould/cane,
/obj/item/food/snacks/mint,
/obj/item/food/mint,
)
result = /obj/item/food/snacks/candy/candycane
result = /obj/item/food/candy/candycane
byproduct = /obj/item/kitchen/mould/cane
/datum/recipe/candy/gum
reagents = list("sugar" = 5, "water" = 5, "cornoil" = 5)
items = list()
result = /obj/item/food/snacks/candy/gum
result = /obj/item/food/candy/gum
/datum/recipe/candy/candybar
reagents = list("sugar" = 5)
items = list(
/obj/item/food/snacks/chocolatebar,
/obj/item/food/chocolatebar,
)
result = /obj/item/food/snacks/candy/candybar
result = /obj/item/food/candy/candybar
/datum/recipe/candy/cash
items = list(
/obj/item/kitchen/mould/cash,
/obj/item/food/snacks/chocolatebar,
/obj/item/food/chocolatebar,
)
result = /obj/item/food/snacks/candy/cash
result = /obj/item/food/candy/cash
byproduct = /obj/item/kitchen/mould/cash
/datum/recipe/candy/coin
items = list(
/obj/item/kitchen/mould/coin,
/obj/item/food/snacks/chocolatebar,
/obj/item/food/chocolatebar,
)
result = /obj/item/food/snacks/candy/coin
result = /obj/item/food/candy/coin
byproduct = /obj/item/kitchen/mould/coin
/datum/recipe/candy/sucker
@@ -172,7 +172,7 @@
items = list(
/obj/item/kitchen/mould/loli,
)
result = /obj/item/food/snacks/candy/sucker
result = /obj/item/food/candy/sucker
byproduct = /obj/item/kitchen/mould/loli
// ***********************************************************
@@ -182,84 +182,84 @@
/datum/recipe/candy/cottoncandy_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/red
result = /obj/item/food/candy/cotton/red
/datum/recipe/candy/cottoncandy_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/blue
result = /obj/item/food/candy/cotton/blue
/datum/recipe/candy/cottoncandy_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/poison
result = /obj/item/food/candy/cotton/poison
/datum/recipe/candy/cottoncandy_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/green
result = /obj/item/food/candy/cotton/green
/datum/recipe/candy/cottoncandy_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/yellow
result = /obj/item/food/candy/cotton/yellow
/datum/recipe/candy/cottoncandy_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/orange
result = /obj/item/food/candy/cotton/orange
/datum/recipe/candy/cottoncandy_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/purple
result = /obj/item/food/candy/cotton/purple
/datum/recipe/candy/cottoncandy_pink
reagents = list("watermelonjuice" = 5)
items = list(
/obj/item/food/snacks/candy/cotton,
/obj/item/food/candy/cotton,
)
result = /obj/item/food/snacks/candy/cotton/pink
result = /obj/item/food/candy/cotton/pink
/datum/recipe/candy/cottoncandy_rainbow
reagents = list()
items = list(
/obj/item/food/snacks/candy/cotton/red,
/obj/item/food/snacks/candy/cotton/blue,
/obj/item/food/snacks/candy/cotton/green,
/obj/item/food/snacks/candy/cotton/yellow,
/obj/item/food/snacks/candy/cotton/orange,
/obj/item/food/snacks/candy/cotton/purple,
/obj/item/food/snacks/candy/cotton/pink,
/obj/item/food/candy/cotton/red,
/obj/item/food/candy/cotton/blue,
/obj/item/food/candy/cotton/green,
/obj/item/food/candy/cotton/yellow,
/obj/item/food/candy/cotton/orange,
/obj/item/food/candy/cotton/purple,
/obj/item/food/candy/cotton/pink,
)
result = /obj/item/food/snacks/candy/cotton/rainbow
result = /obj/item/food/candy/cotton/rainbow
/datum/recipe/candy/cottoncandy_rainbow2
reagents = list()
items = list(
/obj/item/food/snacks/candy/cotton/red,
/obj/item/food/snacks/candy/cotton/poison,
/obj/item/food/snacks/candy/cotton/green,
/obj/item/food/snacks/candy/cotton/yellow,
/obj/item/food/snacks/candy/cotton/orange,
/obj/item/food/snacks/candy/cotton/purple,
/obj/item/food/snacks/candy/cotton/pink,
/obj/item/food/candy/cotton/red,
/obj/item/food/candy/cotton/poison,
/obj/item/food/candy/cotton/green,
/obj/item/food/candy/cotton/yellow,
/obj/item/food/candy/cotton/orange,
/obj/item/food/candy/cotton/purple,
/obj/item/food/candy/cotton/pink,
)
result = /obj/item/food/snacks/candy/cotton/bad_rainbow
result = /obj/item/food/candy/cotton/bad_rainbow
// ***********************************************************
// Gummy Bear Recipes (flavored)
@@ -268,63 +268,63 @@
/datum/recipe/candy/gummybear_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/red
result = /obj/item/food/candy/gummybear/red
/datum/recipe/candy/gummybear_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/blue
result = /obj/item/food/candy/gummybear/blue
/datum/recipe/candy/gummybear_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/poison
result = /obj/item/food/candy/gummybear/poison
/datum/recipe/candy/gummybear_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/green
result = /obj/item/food/candy/gummybear/green
/datum/recipe/candy/gummybear_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/yellow
result = /obj/item/food/candy/gummybear/yellow
/datum/recipe/candy/gummybear_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/orange
result = /obj/item/food/candy/gummybear/orange
/datum/recipe/candy/gummybear_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/purple
result = /obj/item/food/candy/gummybear/purple
/datum/recipe/candy/gummybear_wtf
reagents = list("space_drugs" = 5)
items = list(
/obj/item/food/snacks/candy/gummybear,
/obj/item/food/candy/gummybear,
)
result = /obj/item/food/snacks/candy/gummybear/wtf
result = /obj/item/food/candy/gummybear/wtf
/datum/recipe/candy/gummybear_wtf2
reagents = list()
items = list(/obj/item/food/snacks/candy/gummybear, /obj/item/food/snacks/grown/ambrosia/vulgaris)
result = /obj/item/food/snacks/candy/gummybear/wtf
items = list(/obj/item/food/candy/gummybear, /obj/item/food/grown/ambrosia/vulgaris)
result = /obj/item/food/candy/gummybear/wtf
// ***********************************************************
// Gummy Worm Recipes (flavored)
@@ -333,62 +333,62 @@
/datum/recipe/candy/gummyworm_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/red
result = /obj/item/food/candy/gummyworm/red
/datum/recipe/candy/gummyworm_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/blue
result = /obj/item/food/candy/gummyworm/blue
/datum/recipe/candy/gummyworm_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/poison
result = /obj/item/food/candy/gummyworm/poison
/datum/recipe/candy/gummyworm_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/green
result = /obj/item/food/candy/gummyworm/green
/datum/recipe/candy/gummyworm_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/yellow
result = /obj/item/food/candy/gummyworm/yellow
/datum/recipe/candy/gummyworm_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/orange
result = /obj/item/food/candy/gummyworm/orange
/datum/recipe/candy/gummyworm_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/purple
result = /obj/item/food/candy/gummyworm/purple
/datum/recipe/candy/gummyworm_wtf
reagents = list("space_drugs" = 5)
items = list(
/obj/item/food/snacks/candy/gummyworm,
/obj/item/food/candy/gummyworm,
)
result = /obj/item/food/snacks/candy/gummyworm/wtf
result = /obj/item/food/candy/gummyworm/wtf
/datum/recipe/candy/gummyworm_wtf2
items = list(/obj/item/food/snacks/candy/gummyworm, /obj/item/food/snacks/grown/ambrosia/vulgaris)
result = /obj/item/food/snacks/candy/gummyworm/wtf
items = list(/obj/item/food/candy/gummyworm, /obj/item/food/grown/ambrosia/vulgaris)
result = /obj/item/food/candy/gummyworm/wtf
// ***********************************************************
// Jelly Bean Recipes (flavored)
@@ -397,99 +397,99 @@
/datum/recipe/candy/jellybean_red
reagents = list("cherryjelly" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/red
result = /obj/item/food/candy/jellybean/red
/datum/recipe/candy/jellybean_blue
reagents = list("berryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/blue
result = /obj/item/food/candy/jellybean/blue
/datum/recipe/candy/jellybean_poison
reagents = list("poisonberryjuice" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/poison
result = /obj/item/food/candy/jellybean/poison
/datum/recipe/candy/jellybean_green
reagents = list("limejuice" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/green
result = /obj/item/food/candy/jellybean/green
/datum/recipe/candy/jellybean_yellow
reagents = list("lemonjuice" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/yellow
result = /obj/item/food/candy/jellybean/yellow
/datum/recipe/candy/jellybean_orange
reagents = list("orangejuice" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/orange
result = /obj/item/food/candy/jellybean/orange
/datum/recipe/candy/jellybean_purple
reagents = list("grapejuice" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/purple
result = /obj/item/food/candy/jellybean/purple
/datum/recipe/candy/jellybean_chocolate
reagents = list()
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/snacks/chocolatebar,
/obj/item/food/candy/jellybean,
/obj/item/food/chocolatebar,
)
result = /obj/item/food/snacks/candy/jellybean/chocolate
result = /obj/item/food/candy/jellybean/chocolate
/datum/recipe/candy/jellybean_cola
reagents = list("cola" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/cola
result = /obj/item/food/candy/jellybean/cola
/datum/recipe/candy/jellybean_popcorn
reagents = list()
items = list(
/obj/item/food/snacks/popcorn,
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/popcorn,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/popcorn
result = /obj/item/food/candy/jellybean/popcorn
/datum/recipe/candy/jellybean_coffee
reagents = list("coffee" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/cola
result = /obj/item/food/candy/jellybean/cola
/datum/recipe/candy/jellybean_drgibb
reagents = list("dr_gibb" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/cola
result = /obj/item/food/candy/jellybean/cola
/datum/recipe/candy/jellybean_wtf
reagents = list("space_drugs" = 5)
items = list(
/obj/item/food/snacks/candy/jellybean,
/obj/item/food/candy/jellybean,
)
result = /obj/item/food/snacks/candy/jellybean/wtf
result = /obj/item/food/candy/jellybean/wtf
/datum/recipe/candy/jellybean_wtf2
items = list(/obj/item/food/snacks/candy/jellybean, /obj/item/food/snacks/grown/ambrosia/vulgaris)
result = /obj/item/food/snacks/candy/jellybean/wtf
items = list(/obj/item/food/candy/jellybean, /obj/item/food/grown/ambrosia/vulgaris)
result = /obj/item/food/candy/jellybean/wtf
// ***********************************************************
// Candybar Recipes (flavored)
@@ -498,39 +498,39 @@
/datum/recipe/candy/malper
reagents = list()
items = list(
/obj/item/food/snacks/candy/candybar,
/obj/item/food/snacks/candy/caramel,
/obj/item/food/candy/candybar,
/obj/item/food/candy/caramel,
)
result = /obj/item/food/snacks/candy/confectionery/caramel
result = /obj/item/food/candy/confectionery/caramel
/datum/recipe/candy/toolerone
reagents = list()
items = list(
/obj/item/food/snacks/candy/candybar,
/obj/item/food/snacks/candy/nougat,
/obj/item/food/candy/candybar,
/obj/item/food/candy/nougat,
)
result = /obj/item/food/snacks/candy/confectionery/nougat
result = /obj/item/food/candy/confectionery/nougat
/datum/recipe/candy/yumbaton
reagents = list()
items = list(
/obj/item/food/snacks/candy/candybar,
/obj/item/food/snacks/candy/toffee,
/obj/item/food/candy/candybar,
/obj/item/food/candy/toffee,
)
result = /obj/item/food/snacks/candy/confectionery/toffee
result = /obj/item/food/candy/confectionery/toffee
/datum/recipe/candy/crunch
reagents = list("rice" = 5)
items = list(
/obj/item/food/snacks/candy/candybar,
/obj/item/food/candy/candybar,
)
result = /obj/item/food/snacks/candy/confectionery/rice
result = /obj/item/food/candy/confectionery/rice
/datum/recipe/candy/toxinstest
reagents = list()
items = list(
/obj/item/food/snacks/candy/candybar,
/obj/item/food/snacks/candy/caramel,
/obj/item/food/snacks/candy/nougat,
/obj/item/food/candy/candybar,
/obj/item/food/candy/caramel,
/obj/item/food/candy/nougat,
)
result = /obj/item/food/snacks/candy/confectionery/caramel_nougat
result = /obj/item/food/candy/confectionery/caramel_nougat
code/modules/food_and_drinks/recipes/recipes_grill.dm
+110 -110
View File
@@ -3,312 +3,312 @@
/datum/recipe/grill/bacon
items = list(
/obj/item/food/snacks/raw_bacon,
/obj/item/food/raw_bacon,
)
result = /obj/item/food/snacks/bacon
result = /obj/item/food/bacon
/datum/recipe/grill/telebacon
items = list(
/obj/item/food/snacks/meat,
/obj/item/food/meat,
/obj/item/assembly/signaler
)
result = /obj/item/food/snacks/telebacon
result = /obj/item/food/telebacon
/datum/recipe/grill/syntitelebacon
items = list(
/obj/item/food/snacks/meat/syntiflesh,
/obj/item/food/meat/syntiflesh,
/obj/item/assembly/signaler
)
result = /obj/item/food/snacks/telebacon
result = /obj/item/food/telebacon
/datum/recipe/grill/friedegg
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/food/snacks/egg
/obj/item/food/egg
)
result = /obj/item/food/snacks/friedegg
result = /obj/item/food/friedegg
/datum/recipe/grill/birdsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/food/snacks/meat/chicken
/obj/item/food/meat/chicken
)
result = /obj/item/food/snacks/meatsteak/chicken
result = /obj/item/food/meatsteak/chicken
/datum/recipe/grill/meatsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/food/snacks/meat
/obj/item/food/meat
)
result = /obj/item/food/snacks/meatsteak
result = /obj/item/food/meatsteak
/datum/recipe/grill/salmonsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/food/snacks/salmonmeat
/obj/item/food/salmonmeat
)
result = /obj/item/food/snacks/salmonsteak
result = /obj/item/food/salmonsteak
/datum/recipe/grill/syntisteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/food/snacks/meat/syntiflesh
/obj/item/food/meat/syntiflesh
)
result = /obj/item/food/snacks/meatsteak
result = /obj/item/food/meatsteak
/datum/recipe/grill/waffles
reagents = list("sugar" = 10)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough
/obj/item/food/dough,
/obj/item/food/dough
)
result = /obj/item/food/snacks/waffles
result = /obj/item/food/waffles
/datum/recipe/grill/rofflewaffles
reagents = list("psilocybin" = 5, "sugar" = 10)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough
/obj/item/food/dough,
/obj/item/food/dough
)
result = /obj/item/food/snacks/rofflewaffles
result = /obj/item/food/rofflewaffles
/datum/recipe/grill/grilledcheese
items = list(
/obj/item/food/snacks/breadslice,
/obj/item/food/snacks/breadslice,
/obj/item/food/snacks/cheesewedge
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/cheesewedge
)
result = /obj/item/food/snacks/grilledcheese
result = /obj/item/food/grilledcheese
/datum/recipe/grill/sausage
items = list(
/obj/item/food/snacks/meatball,
/obj/item/food/snacks/cutlet
/obj/item/food/meatball,
/obj/item/food/cutlet
)
result = /obj/item/food/snacks/sausage
result = /obj/item/food/sausage
/datum/recipe/grill/fishfingers
reagents = list("flour" = 10)
items = list(
/obj/item/food/snacks/egg,
/obj/item/food/snacks/carpmeat
/obj/item/food/egg,
/obj/item/food/carpmeat
)
result = /obj/item/food/snacks/fishfingers
result = /obj/item/food/fishfingers
/datum/recipe/grill/fishfingers/make_food(obj/container)
var/obj/item/food/snacks/fishfingers/being_cooked = ..()
var/obj/item/food/fishfingers/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
being_cooked.reagents.del_reagent("carpotoxin")
return being_cooked
/datum/recipe/grill/cutlet
items = list(
/obj/item/food/snacks/rawcutlet
/obj/item/food/rawcutlet
)
result = /obj/item/food/snacks/cutlet
result = /obj/item/food/cutlet
/datum/recipe/grill/omelette
items = list(
/obj/item/food/snacks/egg,
/obj/item/food/snacks/egg,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge
/obj/item/food/egg,
/obj/item/food/egg,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge
)
result = /obj/item/food/snacks/omelette
result = /obj/item/food/omelette
/datum/recipe/grill/wingfangchu
reagents = list("soysauce" = 5)
items = list(
/obj/item/food/snacks/monstermeat/xenomeat
/obj/item/food/monstermeat/xenomeat
)
result = /obj/item/food/snacks/wingfangchu
result = /obj/item/food/wingfangchu
/datum/recipe/grill/human/kebab
items = list(
/obj/item/stack/rods,
/obj/item/food/snacks/meat/human,
/obj/item/food/snacks/meat/human
/obj/item/food/meat/human,
/obj/item/food/meat/human
)
result = /obj/item/food/snacks/human/kebab
result = /obj/item/food/human/kebab
/datum/recipe/grill/syntikebab
items = list(
/obj/item/stack/rods,
/obj/item/food/snacks/meat/syntiflesh,
/obj/item/food/snacks/meat/syntiflesh
/obj/item/food/meat/syntiflesh,
/obj/item/food/meat/syntiflesh
)
result = /obj/item/food/snacks/syntikebab
result = /obj/item/food/syntikebab
/datum/recipe/grill/meatkeb // Do not put this above the other meat kebab variants or it will override them.
items = list(
/obj/item/stack/rods,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat
/obj/item/food/meat,
/obj/item/food/meat
)
result = /obj/item/food/snacks/meatkebab
result = /obj/item/food/meatkebab
/datum/recipe/grill/tofukebab
items = list(
/obj/item/stack/rods,
/obj/item/food/snacks/tofu,
/obj/item/food/snacks/tofu
/obj/item/food/tofu,
/obj/item/food/tofu
)
result = /obj/item/food/snacks/tofukebab
result = /obj/item/food/tofukebab
/datum/recipe/grill/picoss_kebab
reagents = list("vinegar" = 5)
items = list(
/obj/item/food/snacks/carpmeat,
/obj/item/food/snacks/carpmeat,
/obj/item/food/snacks/grown/onion,
/obj/item/food/snacks/grown/chili,
/obj/item/food/carpmeat,
/obj/item/food/carpmeat,
/obj/item/food/grown/onion,
/obj/item/food/grown/chili,
/obj/item/stack/rods
)
result = /obj/item/food/snacks/picoss_kebab
result = /obj/item/food/picoss_kebab
/datum/recipe/grill/picoss_kebab/make_food(obj/container)
var/obj/item/food/snacks/picoss_kebab/being_cooked = ..()
var/obj/item/food/picoss_kebab/being_cooked = ..()
being_cooked.reagents.del_reagent("carpotoxin")
return being_cooked
/datum/recipe/grill/sushi_Tamago
reagents = list("sake" = 5)
items = list(
/obj/item/food/snacks/egg,
/obj/item/food/snacks/boiledrice,
/obj/item/food/egg,
/obj/item/food/boiledrice,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Tamago
result = /obj/item/food/sushi_Tamago
/datum/recipe/grill/sushi_Unagi
reagents = list("sake" = 5)
items = list(
/obj/item/fish/electric_eel,
/obj/item/food/snacks/boiledrice,
/obj/item/food/boiledrice,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Unagi
result = /obj/item/food/sushi_Unagi
/datum/recipe/grill/sushi_Ebi
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/snacks/boiled_shrimp,
/obj/item/food/boiledrice,
/obj/item/food/boiled_shrimp,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Ebi
result = /obj/item/food/sushi_Ebi
/datum/recipe/grill/sushi_Ikura
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/boiledrice,
/obj/item/fish_eggs/salmon,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Ikura
result = /obj/item/food/sushi_Ikura
/datum/recipe/grill/sushi_Inari
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/snacks/fried_tofu,
/obj/item/food/boiledrice,
/obj/item/food/fried_tofu,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Inari
result = /obj/item/food/sushi_Inari
/datum/recipe/grill/sushi_Sake
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/snacks/salmonmeat,
/obj/item/food/boiledrice,
/obj/item/food/salmonmeat,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Sake
result = /obj/item/food/sushi_Sake
/datum/recipe/grill/sushi_SmokedSalmon
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/snacks/salmonsteak,
/obj/item/food/boiledrice,
/obj/item/food/salmonsteak,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_SmokedSalmon
result = /obj/item/food/sushi_SmokedSalmon
/datum/recipe/grill/sushi_Masago
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/boiledrice,
/obj/item/fish_eggs/goldfish,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Masago
result = /obj/item/food/sushi_Masago
/datum/recipe/grill/sushi_Tobiko
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/boiledrice,
/obj/item/fish_eggs/shark,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Tobiko
result = /obj/item/food/sushi_Tobiko
/datum/recipe/grill/sushi_TobikoEgg
items = list(
/obj/item/food/snacks/sushi_Tobiko,
/obj/item/food/snacks/egg,
/obj/item/food/sushi_Tobiko,
/obj/item/food/egg,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_TobikoEgg
result = /obj/item/food/sushi_TobikoEgg
/datum/recipe/grill/sushi_Tai
items = list(
/obj/item/food/snacks/boiledrice,
/obj/item/food/snacks/catfishmeat,
/obj/item/food/boiledrice,
/obj/item/food/catfishmeat,
/obj/item/stack/seaweed
)
result = /obj/item/food/snacks/sushi_Tai
result = /obj/item/food/sushi_Tai
/datum/recipe/grill/goliath
items = list(/obj/item/food/snacks/monstermeat/goliath)
result = /obj/item/food/snacks/goliath_steak
items = list(/obj/item/food/monstermeat/goliath)
result = /obj/item/food/goliath_steak
/datum/recipe/grill/shrimp_skewer
items = list(
/obj/item/food/snacks/shrimp,
/obj/item/food/snacks/shrimp,
/obj/item/food/snacks/shrimp,
/obj/item/food/snacks/shrimp,
/obj/item/food/shrimp,
/obj/item/food/shrimp,
/obj/item/food/shrimp,
/obj/item/food/shrimp,
/obj/item/stack/rods
)
result = /obj/item/food/snacks/shrimp_skewer
result = /obj/item/food/shrimp_skewer
/datum/recipe/grill/fish_skewer
reagents = list("flour" = 10)
items = list(
/obj/item/food/snacks/salmonmeat,
/obj/item/food/snacks/salmonmeat,
/obj/item/food/salmonmeat,
/obj/item/food/salmonmeat,
/obj/item/stack/rods
)
result = /obj/item/food/snacks/fish_skewer
result = /obj/item/food/fish_skewer
/datum/recipe/grill/pancake
items = list(
/obj/item/food/snacks/cookiedough
/obj/item/food/cookiedough
)
result = /obj/item/food/snacks/pancake
result = /obj/item/food/pancake
/datum/recipe/grill/berry_pancake
items = list(
/obj/item/food/snacks/cookiedough,
/obj/item/food/snacks/grown/berries
/obj/item/food/cookiedough,
/obj/item/food/grown/berries
)
result = /obj/item/food/snacks/pancake/berry_pancake
result = /obj/item/food/pancake/berry_pancake
/datum/recipe/grill/choc_chip_pancake
items = list(
/obj/item/food/snacks/cookiedough,
/obj/item/food/snacks/choc_pile
/obj/item/food/cookiedough,
/obj/item/food/choc_pile
)
result = /obj/item/food/snacks/pancake/choc_chip_pancake
result = /obj/item/food/pancake/choc_chip_pancake
/datum/recipe/grill/bbqribs
reagents = list("bbqsauce" = 5)
items = list(
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat
/obj/item/food/meat,
/obj/item/food/meat
)
result = /obj/item/food/snacks/bbqribs
result = /obj/item/food/bbqribs
code/modules/food_and_drinks/recipes/recipes_microwave.dm
+568 -568
View File
File diff suppressed because it is too large Load Diff
code/modules/food_and_drinks/recipes/recipes_oven.dm
+296 -296
View File
@@ -4,209 +4,209 @@
/datum/recipe/oven/bun
items = list(
/obj/item/food/snacks/dough
/obj/item/food/dough
)
result = /obj/item/food/snacks/bun
result = /obj/item/food/bun
/datum/recipe/oven/meatbread
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
)
result = /obj/item/food/snacks/sliceable/meatbread
result = /obj/item/food/sliceable/meatbread
/datum/recipe/oven/syntibread
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/meat/syntiflesh,
/obj/item/food/snacks/meat/syntiflesh,
/obj/item/food/snacks/meat/syntiflesh,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/meat/syntiflesh,
/obj/item/food/meat/syntiflesh,
/obj/item/food/meat/syntiflesh,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
)
result = /obj/item/food/snacks/sliceable/meatbread
result = /obj/item/food/sliceable/meatbread
/datum/recipe/oven/xenomeatbread
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/monstermeat/xenomeat,
/obj/item/food/snacks/monstermeat/xenomeat,
/obj/item/food/snacks/monstermeat/xenomeat,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/monstermeat/xenomeat,
/obj/item/food/monstermeat/xenomeat,
/obj/item/food/monstermeat/xenomeat,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
)
result = /obj/item/food/snacks/sliceable/xenomeatbread
result = /obj/item/food/sliceable/xenomeatbread
/datum/recipe/oven/bananabread
reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/banana
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/banana
)
result = /obj/item/food/snacks/sliceable/bananabread
result = /obj/item/food/sliceable/bananabread
/datum/recipe/oven/banarnarbread
reagents = list("milk" = 5, "sugar" = 5, "blood" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/banana
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/banana
)
result = /obj/item/food/snacks/sliceable/banarnarbread
result = /obj/item/food/sliceable/banarnarbread
/datum/recipe/oven/muffin
reagents = list("milk" = 5, "sugar" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/dough,
)
result = /obj/item/food/snacks/muffin
result = /obj/item/food/muffin
/datum/recipe/oven/carrotcake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/carrot,
/obj/item/food/snacks/grown/carrot,
/obj/item/food/snacks/grown/carrot
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/carrot,
/obj/item/food/grown/carrot,
/obj/item/food/grown/carrot
)
result = /obj/item/food/snacks/sliceable/carrotcake
result = /obj/item/food/sliceable/carrotcake
/datum/recipe/oven/cheesecake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
)
result = /obj/item/food/snacks/sliceable/cheesecake
result = /obj/item/food/sliceable/cheesecake
/datum/recipe/oven/plaincake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
)
result = /obj/item/food/snacks/sliceable/plaincake
result = /obj/item/food/sliceable/plaincake
/datum/recipe/oven/clowncake
reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/frozen/sundae,
/obj/item/food/snacks/frozen/sundae,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/banana
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/frozen/sundae,
/obj/item/food/frozen/sundae,
/obj/item/food/grown/banana,
/obj/item/food/grown/banana,
/obj/item/food/grown/banana,
/obj/item/food/grown/banana,
/obj/item/food/grown/banana
)
result = /obj/item/food/snacks/sliceable/clowncake
result = /obj/item/food/sliceable/clowncake
/datum/recipe/oven/meatpie
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/meat,
/obj/item/food/sliceable/flatdough,
/obj/item/food/meat,
)
result = /obj/item/food/snacks/meatpie
result = /obj/item/food/meatpie
/datum/recipe/oven/tofupie
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/tofu,
/obj/item/food/sliceable/flatdough,
/obj/item/food/tofu,
)
result = /obj/item/food/snacks/tofupie
result = /obj/item/food/tofupie
/datum/recipe/oven/xemeatpie
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/monstermeat/xenomeat
/obj/item/food/sliceable/flatdough,
/obj/item/food/monstermeat/xenomeat
)
result = /obj/item/food/snacks/xemeatpie
result = /obj/item/food/xemeatpie
/datum/recipe/oven/pie
reagents = list("sugar" = 5)
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/banana
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/banana
)
result = /obj/item/food/snacks/pie
result = /obj/item/food/pie
/datum/recipe/oven/cherrypie
reagents = list("sugar" = 10)
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/cherries
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/cherries
)
result = /obj/item/food/snacks/cherrypie
result = /obj/item/food/cherrypie
/datum/recipe/oven/berryclafoutis
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/berries
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/berries
)
result = /obj/item/food/snacks/berryclafoutis
result = /obj/item/food/berryclafoutis
/datum/recipe/oven/tofubread
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/tofu,
/obj/item/food/snacks/tofu,
/obj/item/food/snacks/tofu,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/tofu,
/obj/item/food/tofu,
/obj/item/food/tofu,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
)
result = /obj/item/food/snacks/sliceable/tofubread
result = /obj/item/food/sliceable/tofubread
/datum/recipe/oven/loadedbakedpotato
items = list(
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/grown/potato
/obj/item/food/cheesewedge,
/obj/item/food/grown/potato
)
result = /obj/item/food/snacks/loadedbakedpotato
result = /obj/item/food/loadedbakedpotato
/datum/recipe/oven/yakiimo
items = list(
/obj/item/food/snacks/grown/potato/sweet
/obj/item/food/grown/potato/sweet
)
result = /obj/item/food/snacks/yakiimo
result = /obj/item/food/yakiimo
////cookies by Ume
/datum/recipe/oven/cookies
items = list(
/obj/item/food/snacks/rawcookies/chocochips,
/obj/item/food/rawcookies/chocochips,
)
result = /obj/item/storage/bag/tray/cookies_tray
/datum/recipe/oven/sugarcookies
items = list(
/obj/item/food/snacks/rawcookies,
/obj/item/food/rawcookies,
)
result = /obj/item/storage/bag/tray/cookies_tray/sugarcookie
@@ -216,15 +216,15 @@
/datum/recipe/oven/fortunecookie
reagents = list("sugar" = 5)
items = list(
/obj/item/food/snacks/doughslice,
/obj/item/food/doughslice,
/obj/item/paper,
)
result = /obj/item/food/snacks/fortunecookie
result = /obj/item/food/fortunecookie
/datum/recipe/oven/fortunecookie/make_food(obj/container)
var/obj/item/paper/P = locate() in container
P.loc = null //So we don't delete the paper while cooking the cookie
var/obj/item/food/snacks/fortunecookie/being_cooked = ..()
var/obj/item/food/fortunecookie/being_cooked = ..()
if(P.info) //If there's anything written on the paper, just move it into the fortune cookie
P.forceMove(being_cooked) //Prevents the oven deleting our paper
being_cooked.trash = P //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
@@ -235,368 +235,368 @@
// Pizzas
/datum/recipe/oven/pizzamargherita
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge
)
result = /obj/item/food/snacks/sliceable/pizza/margheritapizza
result = /obj/item/food/sliceable/pizza/margheritapizza
/datum/recipe/oven/meatpizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/grown/tomato
/obj/item/food/sliceable/flatdough,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/grown/tomato
)
result = /obj/item/food/snacks/sliceable/pizza/meatpizza
result = /obj/item/food/sliceable/pizza/meatpizza
/datum/recipe/oven/mushroompizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/grown/mushroom,
/obj/item/food/snacks/grown/mushroom,
/obj/item/food/snacks/grown/mushroom,
/obj/item/food/snacks/grown/mushroom,
/obj/item/food/snacks/grown/mushroom,
/obj/item/food/snacks/grown/tomato
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/grown/mushroom,
/obj/item/food/grown/mushroom,
/obj/item/food/grown/mushroom,
/obj/item/food/grown/mushroom,
/obj/item/food/grown/mushroom,
/obj/item/food/grown/tomato
)
result = /obj/item/food/snacks/sliceable/pizza/mushroompizza
result = /obj/item/food/sliceable/pizza/mushroompizza
/datum/recipe/oven/vegetablepizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/grown/eggplant,
/obj/item/food/snacks/grown/carrot,
/obj/item/food/snacks/grown/corn,
/obj/item/food/snacks/grown/tomato
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/grown/eggplant,
/obj/item/food/grown/carrot,
/obj/item/food/grown/corn,
/obj/item/food/grown/tomato
)
result = /obj/item/food/snacks/sliceable/pizza/vegetablepizza
result = /obj/item/food/sliceable/pizza/vegetablepizza
/datum/recipe/oven/hawaiianpizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/pineappleslice,
/obj/item/food/snacks/pineappleslice,
/obj/item/food/snacks/meat,
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/pineappleslice,
/obj/item/food/pineappleslice,
/obj/item/food/meat,
)
result = /obj/item/food/snacks/sliceable/pizza/hawaiianpizza
result = /obj/item/food/sliceable/pizza/hawaiianpizza
/datum/recipe/oven/macncheesepizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/macncheese,
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/macncheese,
)
result = /obj/item/food/snacks/sliceable/pizza/macpizza
result = /obj/item/food/sliceable/pizza/macpizza
/datum/recipe/oven/cheesepizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge
)
result = /obj/item/food/snacks/sliceable/pizza/cheesepizza
result = /obj/item/food/sliceable/pizza/cheesepizza
/datum/recipe/oven/pepperonipizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/sausage
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/sausage
)
result = /obj/item/food/snacks/sliceable/pizza/pepperonipizza
result = /obj/item/food/sliceable/pizza/pepperonipizza
/datum/recipe/oven/donkpocketpizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/donkpocket,
/obj/item/food/snacks/donkpocket
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/donkpocket,
/obj/item/food/donkpocket
)
result = /obj/item/food/snacks/sliceable/pizza/donkpocketpizza
result = /obj/item/food/sliceable/pizza/donkpocketpizza
/datum/recipe/oven/dankpizza
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/grown/cannabis,
/obj/item/food/snacks/grown/cannabis,
/obj/item/food/snacks/grown/cannabis,
/obj/item/food/snacks/grown/cannabis
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge,
/obj/item/food/grown/cannabis,
/obj/item/food/grown/cannabis,
/obj/item/food/grown/cannabis,
/obj/item/food/grown/cannabis
)
result = /obj/item/food/snacks/sliceable/pizza/dankpizza
result = /obj/item/food/sliceable/pizza/dankpizza
/datum/recipe/oven/firecrackerpizza
reagents = list("capsaicin" = 5)
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/grown/chili,
/obj/item/food/snacks/grown/chili
/obj/item/food/sliceable/flatdough,
/obj/item/food/cheesewedge,
/obj/item/food/grown/chili,
/obj/item/food/grown/chili
)
result = /obj/item/food/snacks/sliceable/pizza/firecrackerpizza
result = /obj/item/food/sliceable/pizza/firecrackerpizza
/datum/recipe/oven/pestopizza
reagents = list("wasabi" = 5)
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/cheesewedge
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/tomato,
/obj/item/food/grown/tomato,
/obj/item/food/cheesewedge
)
result = /obj/item/food/snacks/sliceable/pizza/pestopizza
result = /obj/item/food/sliceable/pizza/pestopizza
/datum/recipe/oven/garlicpizza
reagents = list("garlic" = 5)
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/garlic,
/obj/item/food/snacks/grown/garlic,
/obj/item/food/snacks/cheesewedge
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/garlic,
/obj/item/food/grown/garlic,
/obj/item/food/cheesewedge
)
result = /obj/item/food/snacks/sliceable/pizza/garlicpizza
result = /obj/item/food/sliceable/pizza/garlicpizza
/datum/recipe/oven/amanita_pie
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/mushroom/amanita
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/mushroom/amanita
)
result = /obj/item/food/snacks/amanita_pie
result = /obj/item/food/amanita_pie
/datum/recipe/oven/plump_pie
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/mushroom/plumphelmet
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/mushroom/plumphelmet
)
result = /obj/item/food/snacks/plump_pie
result = /obj/item/food/plump_pie
/datum/recipe/oven/plumphelmetbiscuit
reagents = list("water" = 5, "flour" = 5)
items = list(/obj/item/food/snacks/grown/mushroom/plumphelmet)
result = /obj/item/food/snacks/plumphelmetbiscuit
items = list(/obj/item/food/grown/mushroom/plumphelmet)
result = /obj/item/food/plumphelmetbiscuit
/datum/recipe/oven/creamcheesebread
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
)
result = /obj/item/food/snacks/sliceable/creamcheesebread
result = /obj/item/food/sliceable/creamcheesebread
/datum/recipe/oven/baguette
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/dough,
/obj/item/food/dough,
)
result = /obj/item/food/snacks/baguette
result = /obj/item/food/baguette
/datum/recipe/oven/croissant
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/egg
/obj/item/food/dough,
/obj/item/food/egg
)
reagents = list("sodiumchloride" = 1, "milk" = 5, "sugar" = 5)
result = /obj/item/food/snacks/croissant
result = /obj/item/food/croissant
/datum/recipe/oven/birthdaycake
reagents = list("milk" = 5, "sugar" = 15, "vanilla" = 10)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/candle,
/obj/item/candle,
/obj/item/candle,
)
result = /obj/item/food/snacks/sliceable/birthdaycake
result = /obj/item/food/sliceable/birthdaycake
/datum/recipe/oven/bread
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/egg
/obj/item/food/dough,
/obj/item/food/egg
)
result = /obj/item/food/snacks/sliceable/bread
result = /obj/item/food/sliceable/bread
/datum/recipe/oven/bread/make_food(obj/container)
var/obj/item/food/snacks/sliceable/bread/being_cooked = ..()
var/obj/item/food/sliceable/bread/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/applepie
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/apple
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/apple
)
result = /obj/item/food/snacks/applepie
result = /obj/item/food/applepie
/datum/recipe/oven/applecake
reagents = list("milk" = 5, "sugar" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/apple,
/obj/item/food/snacks/grown/apple
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/apple,
/obj/item/food/grown/apple
)
result = /obj/item/food/snacks/sliceable/applecake
result = /obj/item/food/sliceable/applecake
/datum/recipe/oven/orangecake
reagents = list("milk" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/citrus/orange,
/obj/item/food/snacks/grown/citrus/orange
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/citrus/orange,
/obj/item/food/grown/citrus/orange
)
result = /obj/item/food/snacks/sliceable/orangecake
result = /obj/item/food/sliceable/orangecake
/datum/recipe/oven/bananacake
reagents = list("milk" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/banana,
/obj/item/food/snacks/grown/banana
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/banana,
/obj/item/food/grown/banana
)
result = /obj/item/food/snacks/sliceable/bananacake
result = /obj/item/food/sliceable/bananacake
/datum/recipe/oven/limecake
reagents = list("milk" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/citrus/lime,
/obj/item/food/snacks/grown/citrus/lime
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/citrus/lime,
/obj/item/food/grown/citrus/lime
)
result = /obj/item/food/snacks/sliceable/limecake
result = /obj/item/food/sliceable/limecake
/datum/recipe/oven/lemoncake
reagents = list("milk" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/grown/citrus/lemon,
/obj/item/food/snacks/grown/citrus/lemon
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/grown/citrus/lemon,
/obj/item/food/grown/citrus/lemon
)
result = /obj/item/food/snacks/sliceable/lemoncake
result = /obj/item/food/sliceable/lemoncake
/datum/recipe/oven/chocolatecake
reagents = list("milk" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/chocolatebar,
/obj/item/food/snacks/chocolatebar,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/chocolatebar,
/obj/item/food/chocolatebar,
)
result = /obj/item/food/snacks/sliceable/chocolatecake
result = /obj/item/food/sliceable/chocolatecake
/datum/recipe/oven/braincake
reagents = list("milk" = 5)
items = list(
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/snacks/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/food/dough,
/obj/item/organ/internal/brain
)
result = /obj/item/food/snacks/sliceable/braincake
result = /obj/item/food/sliceable/braincake
/datum/recipe/oven/pumpkinpie
reagents = list("milk" = 5, "sugar" = 5)
items = list(
/obj/item/food/snacks/sliceable/flatdough,
/obj/item/food/snacks/grown/pumpkin
/obj/item/food/sliceable/flatdough,
/obj/item/food/grown/pumpkin
)
result = /obj/item/food/snacks/sliceable/pumpkinpie
result = /obj/item/food/sliceable/pumpkinpie
/datum/recipe/oven/appletart
reagents = list("sugar" = 5, "milk" = 5, "flour" = 10)
items = list(
/obj/item/food/snacks/egg,
/obj/item/food/snacks/grown/apple/gold
/obj/item/food/egg,
/obj/item/food/grown/apple/gold
)
result = /obj/item/food/snacks/appletart
result = /obj/item/food/appletart
/datum/recipe/oven/appletart/make_food(obj/container)
var/obj/item/food/snacks/appletart/being_cooked = ..()
var/obj/item/food/appletart/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/cracker
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/food/snacks/doughslice
/obj/item/food/doughslice
)
result = /obj/item/food/snacks/cracker
result = /obj/item/food/cracker
/datum/recipe/oven/sugarcookie/make_food(obj/container)
var/obj/item/food/snacks/sugarcookie/being_cooked = ..()
var/obj/item/food/sugarcookie/being_cooked = ..()
being_cooked.reagents.del_reagent("egg")
return being_cooked
/datum/recipe/oven/flatbread
items = list(
/obj/item/food/snacks/sliceable/flatdough
/obj/item/food/sliceable/flatdough
)
result = /obj/item/food/snacks/flatbread
result = /obj/item/food/flatbread
/datum/recipe/oven/toastedsandwich
items = list(
/obj/item/food/snacks/sandwich
/obj/item/food/sandwich
)
result = /obj/item/food/snacks/toastedsandwich
result = /obj/item/food/toastedsandwich
/// Magic
/datum/recipe/oven/turkey
items = list(
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/stuffing,
/obj/item/food/snacks/stuffing
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/stuffing,
/obj/item/food/stuffing
)
result = /obj/item/food/snacks/sliceable/turkey
result = /obj/item/food/sliceable/turkey
/datum/recipe/oven/tofurkey
items = list(
/obj/item/food/snacks/tofu,
/obj/item/food/snacks/tofu,
/obj/item/food/snacks/stuffing,
/obj/item/food/tofu,
/obj/item/food/tofu,
/obj/item/food/stuffing,
)
result = /obj/item/food/snacks/tofurkey
result = /obj/item/food/tofurkey
/datum/recipe/oven/lasagna
items = list(
/obj/item/food/snacks/meat,
/obj/item/food/snacks/meat,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/cheesewedge,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/grown/tomato,
/obj/item/food/snacks/dough
/obj/item/food/meat,
/obj/item/food/meat,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/cheesewedge,
/obj/item/food/grown/tomato,
/obj/item/food/grown/tomato,
/obj/item/food/dough
)
result = /obj/item/food/snacks/lasagna
result = /obj/item/food/lasagna
code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm
+66 -66
View File
@@ -1,11 +1,11 @@
/datum/crafting_recipe/sandwich
name = "Sandwich"
reqs = list(
/obj/item/food/snacks/meatsteak = 1,
/obj/item/food/snacks/breadslice = 2,
/obj/item/food/snacks/cheesewedge = 1,
/obj/item/food/meatsteak = 1,
/obj/item/food/breadslice = 2,
/obj/item/food/cheesewedge = 1,
)
result = list(/obj/item/food/snacks/sandwich)
result = list(/obj/item/food/sandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -13,9 +13,9 @@
name = "Slime Jelly Sandwich"
reqs = list(
/datum/reagent/slimejelly = 5,
/obj/item/food/snacks/breadslice = 2,
/obj/item/food/breadslice = 2,
)
result = list(/obj/item/food/snacks/jellysandwich/slime)
result = list(/obj/item/food/jellysandwich/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -23,9 +23,9 @@
name = "Cherry Jelly Sandwich"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/food/snacks/breadslice = 2,
/obj/item/food/breadslice = 2,
)
result = list(/obj/item/food/snacks/jellysandwich/cherry)
result = list(/obj/item/food/jellysandwich/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -33,9 +33,9 @@
name = "Slime Jelly Burger"
reqs = list(
/datum/reagent/slimejelly = 5,
/obj/item/food/snacks/bun = 1,
/obj/item/food/bun = 1,
)
result = list(/obj/item/food/snacks/burger/jelly/slime)
result = list(/obj/item/food/burger/jelly/slime)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -43,9 +43,9 @@
name = "Cherry Jelly Burger"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/food/snacks/bun = 1,
/obj/item/food/bun = 1,
)
result = list(/obj/item/food/snacks/burger/jelly/cherry)
result = list(/obj/item/food/burger/jelly/cherry)
category = CAT_FOOD
subcategory = CAT_SANDWICH
@@ -53,226 +53,226 @@
name = "Home run baseball burger"
reqs = list(
/obj/item/melee/baseball_bat = 1,
/obj/item/food/snacks/bun = 1,
/obj/item/food/bun = 1,
)
result = list(/obj/item/food/snacks/burger/baseball)
result = list(/obj/item/food/burger/baseball)
category = CAT_FOOD
subcategory = CAT_SANDWICH
/datum/crafting_recipe/notasandwich
name = "not-a-sandwich"
reqs = list(
/obj/item/food/snacks/breadslice = 2,
/obj/item/food/breadslice = 2,
/obj/item/clothing/mask/fakemoustache = 1,
)
result = list(/obj/item/food/snacks/notasandwich)
result = list(/obj/item/food/notasandwich)
category = CAT_FOOD
subcategory = CAT_SANDWICH
/datum/crafting_recipe/sushi_Ebi
name = "Ebi Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/boiled_shrimp = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/boiled_shrimp = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_Ebi)
result = list(/obj/item/food/sushi_Ebi)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Ebi_maki
name = "Ebi Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/boiled_shrimp = 4,
/obj/item/food/boiledrice = 1,
/obj/item/food/boiled_shrimp = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/Ebi_maki)
result = list(/obj/item/food/sliceable/Ebi_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Ikura
name = "Ikura Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/boiledrice = 1,
/obj/item/fish_eggs/salmon = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_Ikura)
result = list(/obj/item/food/sushi_Ikura)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Ikura_maki
name = "Ikura Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/boiledrice = 1,
/obj/item/fish_eggs/salmon = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/Ikura_maki)
result = list(/obj/item/food/sliceable/Ikura_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Inari
name = "Inari Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/fried_tofu = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/fried_tofu = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_Inari)
result = list(/obj/item/food/sushi_Inari)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Inari_maki
name = "Inari Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/fried_tofu = 4,
/obj/item/food/boiledrice = 1,
/obj/item/food/fried_tofu = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/Inari_maki)
result = list(/obj/item/food/sliceable/Inari_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Sake
name = "Sake Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/salmonmeat = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/salmonmeat = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_Sake)
result = list(/obj/item/food/sushi_Sake)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Sake_maki
name = "Sake Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/salmonmeat = 4,
/obj/item/food/boiledrice = 1,
/obj/item/food/salmonmeat = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/Sake_maki)
result = list(/obj/item/food/sliceable/Sake_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_SmokedSalmon
name = "Smoked Salmon Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/salmonsteak = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/salmonsteak = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_SmokedSalmon)
result = list(/obj/item/food/sushi_SmokedSalmon)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/SmokedSalmon_maki
name = "Smoked Salmon Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/salmonsteak = 4,
/obj/item/food/boiledrice = 1,
/obj/item/food/salmonsteak = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/SmokedSalmon_maki)
result = list(/obj/item/food/sliceable/SmokedSalmon_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Masago
name = "Masago Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/boiledrice = 1,
/obj/item/fish_eggs/goldfish = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_Masago)
result = list(/obj/item/food/sushi_Masago)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Masago_maki
name = "Masago Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/boiledrice = 1,
/obj/item/fish_eggs/goldfish = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/Masago_maki)
result = list(/obj/item/food/sliceable/Masago_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Tobiko
name = "Tobiko Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/boiledrice = 1,
/obj/item/fish_eggs/shark = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_Tobiko)
result = list(/obj/item/food/sushi_Tobiko)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Tobiko_maki
name = "Tobiko Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/boiledrice = 1,
/obj/item/fish_eggs/shark = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/Tobiko_maki)
result = list(/obj/item/food/sliceable/Tobiko_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_TobikoEgg
name = "Tobiko and Egg Sushi"
reqs = list(
/obj/item/food/snacks/sushi_Tobiko = 1,
/obj/item/food/snacks/egg = 1,
/obj/item/food/sushi_Tobiko = 1,
/obj/item/food/egg = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_TobikoEgg)
result = list(/obj/item/food/sushi_TobikoEgg)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/TobikoEgg_maki
name = "Tobiko and Egg Maki Roll"
reqs = list(
/obj/item/food/snacks/sushi_Tobiko = 4,
/obj/item/food/snacks/egg = 4,
/obj/item/food/sushi_Tobiko = 4,
/obj/item/food/egg = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/TobikoEgg_maki)
result = list(/obj/item/food/sliceable/TobikoEgg_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/sushi_Tai
name = "Tai Sushi"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/catfishmeat = 1,
/obj/item/food/boiledrice = 1,
/obj/item/food/catfishmeat = 1,
/obj/item/stack/seaweed = 1,
)
result = list(/obj/item/food/snacks/sushi_Tai)
result = list(/obj/item/food/sushi_Tai)
category = CAT_FOOD
subcategory = CAT_SUSHI
/datum/crafting_recipe/Tai_maki
name = "Tai Maki Roll"
reqs = list(
/obj/item/food/snacks/boiledrice = 1,
/obj/item/food/snacks/catfishmeat = 4,
/obj/item/food/boiledrice = 1,
/obj/item/food/catfishmeat = 4,
/obj/item/stack/seaweed = 1,
)
pathtools = list(/obj/item/kitchen/sushimat)
result = list(/obj/item/food/snacks/sliceable/Tai_maki)
result = list(/obj/item/food/sliceable/Tai_maki)
category = CAT_FOOD
subcategory = CAT_SUSHI
@@ -286,8 +286,8 @@
reqs = list(
/obj/item/organ/internal/brain = 1,
/obj/item/organ/internal/heart = 1,
/obj/item/food/snacks/sliceable/birthdaycake = 1,
/obj/item/food/snacks/meat = 3,
/obj/item/food/sliceable/birthdaycake = 1,
/obj/item/food/meat = 3,
/datum/reagent/blood = 30,
/datum/reagent/consumable/sprinkles = 5,
/datum/reagent/teslium = 1,
code/modules/hydroponics/beekeeping/beebox.dm
+2 -2
View File
@@ -95,7 +95,7 @@
if(queen_bee)
if(bee_resources >= BEE_RESOURCE_HONEYCOMB_COST && length(honeycombs) < get_max_honeycomb())
bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
var/obj/item/food/snacks/honeycomb/HC = new(src)
var/obj/item/food/honeycomb/HC = new(src)
if(queen_bee.beegent)
HC.set_reagent(queen_bee.beegent.id)
honeycombs += HC
@@ -240,7 +240,7 @@
var/amtH = HF.honeycomb_capacity
var/fallen = 0
while(length(honeycombs) && amtH) //let's pretend you always grab the frame with the most honeycomb on it
var/obj/item/food/snacks/honeycomb/HC = pick_n_take(honeycombs)
var/obj/item/food/honeycomb/HC = pick_n_take(honeycombs)
if(HC)
HC.forceMove(get_turf(src))
amtH--
code/modules/hydroponics/beekeeping/honeycomb.dm
+4 -4
View File
@@ -1,5 +1,5 @@
/obj/item/food/snacks/honeycomb
/obj/item/food/honeycomb
name = "honeycomb"
desc = "A hexagonal mesh of honeycomb."
icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -8,13 +8,13 @@
list_reagents = list("honey" = 5)
var/honey_color = ""
/obj/item/food/snacks/honeycomb/Initialize(mapload)
/obj/item/food/honeycomb/Initialize(mapload)
. = ..()
pixel_x = rand(8,-8)
pixel_y = rand(8,-8)
update_icon(UPDATE_OVERLAYS)
/obj/item/food/snacks/honeycomb/update_overlays()
/obj/item/food/honeycomb/update_overlays()
. = ..()
var/image/honey
if(honey_color)
@@ -25,7 +25,7 @@
. += honey
/obj/item/food/snacks/honeycomb/proc/set_reagent(reagent)
/obj/item/food/honeycomb/proc/set_reagent(reagent)
var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
if(istype(R))
name = "honeycomb ([R.name])"
code/modules/hydroponics/biogenerator.dm
+3 -3
View File
@@ -32,10 +32,10 @@
var/static/list/acceptable_items = typecacheof(list(
/obj/item/seeds,
/obj/item/unsorted_seeds,
/obj/item/food/snacks/grown,
/obj/item/food/grown,
/obj/item/grown,
/obj/item/food/snacks/grown/ash_flora,
/obj/item/food/snacks/honeycomb))
/obj/item/food/grown/ash_flora,
/obj/item/food/honeycomb))
/obj/machinery/biogenerator/Initialize(mapload)
. = ..()
code/modules/hydroponics/compost_bin.dm
+3 -3
View File
@@ -54,7 +54,7 @@
return default_deconstruction_crowbar(user, I, ignore_panel = TRUE)
// Accepts inserted plants and converts them to biomass and potassium
/obj/machinery/compost_bin/proc/make_biomass(obj/item/food/snacks/grown/O)
/obj/machinery/compost_bin/proc/make_biomass(obj/item/food/grown/O)
// calculate biomass from plant nutriment and plant matter
var/plant_biomass = O.reagents.get_reagent_amount("nutriment") + O.reagents.get_reagent_amount("plantmatter")
var/plant_potassium = O.reagents.get_reagent_amount("potassium")
@@ -76,7 +76,7 @@
return
var/obj/item/storage/bag/plants/PB = O
for(var/obj/item/food/snacks/grown/G in PB.contents)
for(var/obj/item/food/grown/G in PB.contents)
// if the plant contains either potassium, plantmatter and nutriment and the compost bin has space for any of those.
if((G.reagents.get_reagent_amount("potassium") && potassium <= potassium_capacity) || ((G.reagents.get_reagent_amount("plantmatter") || G.reagents.get_reagent_amount("nutriment")) && biomass <= biomass_capacity))
PB.remove_from_storage(G, src)
@@ -99,7 +99,7 @@
update_icon_state()
return TRUE
if(istype(O, /obj/item/food/snacks/grown))
if(istype(O, /obj/item/food/grown))
if(biomass >= biomass_capacity && potassium >= potassium_capacity)
to_chat(user, "<span class='warning'>[src] can't hold any more biomass, and its contents are saturated with potassium!</span>")
return
code/modules/hydroponics/fermenting_barrel.dm
+2 -2
View File
@@ -20,7 +20,7 @@
. = ..()
. += "<span class='notice'>It is currently [open ? "open, letting you pour liquids in." : "closed, letting you draw liquids from the tap."]</span>"
/obj/structure/fermenting_barrel/proc/makeWine(obj/item/food/snacks/grown/G)
/obj/structure/fermenting_barrel/proc/makeWine(obj/item/food/grown/G)
if(G.reagents)
G.reagents.trans_to(src, G.reagents.total_volume)
var/amount = G.seed.potency / 4
@@ -40,7 +40,7 @@
playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
/obj/structure/fermenting_barrel/attackby(obj/item/I, mob/user, params)
var/obj/item/food/snacks/grown/G = I
var/obj/item/food/grown/G = I
if(istype(G))
if(!G.can_distill)
to_chat(user, "<span class='warning'>You can't distill this into anything...</span>")
code/modules/hydroponics/grown.dm
+20 -20
View File
@@ -4,7 +4,7 @@
// ***********************************************************
// Base type. Subtypes are found in /grown dir.
/obj/item/food/snacks/grown
/obj/item/food/grown
icon = 'icons/obj/hydroponics/harvest.dmi'
/// The seed of this plant. Starts as a type path, gets converted to an item on New()
var/obj/item/seeds/seed = null
@@ -21,7 +21,7 @@
resistance_flags = FLAMMABLE
origin_tech = "biotech=1"
/obj/item/food/snacks/grown/Initialize(mapload, obj/new_seed = null)
/obj/item/food/grown/Initialize(mapload, obj/new_seed = null)
. = ..()
if(!tastes)
tastes = list("[name]" = 1)
@@ -51,25 +51,25 @@
if(seed.variant)
name += " \[[seed.variant]]"
/obj/item/food/snacks/grown/Destroy()
/obj/item/food/grown/Destroy()
QDEL_NULL(seed)
return ..()
/obj/item/food/snacks/grown/proc/add_juice()
/obj/item/food/grown/proc/add_juice()
if(reagents)
if(bitesize_mod)
bitesize = 1 + round(reagents.total_volume / bitesize_mod)
return 1
return 0
/obj/item/food/snacks/grown/examine(user)
/obj/item/food/grown/examine(user)
. = ..()
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
if(T.examine_line)
. += T.examine_line
/obj/item/food/snacks/grown/attackby(obj/item/O, mob/user, params)
/obj/item/food/grown/attackby(obj/item/O, mob/user, params)
..()
if(slices_num && slice_path)
var/inaccurate = TRUE
@@ -106,12 +106,12 @@
// Various gene procs
/obj/item/food/snacks/grown/attack_self(mob/user)
/obj/item/food/grown/attack_self(mob/user)
if(seed && seed.get_gene(/datum/plant_gene/trait/squash))
squash(user)
..()
/obj/item/food/snacks/grown/throw_impact(atom/hit_atom)
/obj/item/food/grown/throw_impact(atom/hit_atom)
if(!..()) //was it caught by a mob?
if(seed)
log_action(locateUID(thrownby), hit_atom, "Thrown [src] at")
@@ -120,7 +120,7 @@
if(seed.get_gene(/datum/plant_gene/trait/squash))
squash(hit_atom)
/obj/item/food/snacks/grown/proc/squash(atom/target)
/obj/item/food/grown/proc/squash(atom/target)
var/turf/T = get_turf(target)
if(ispath(splat_type, /obj/effect/decal/cleanable/plant_smudge))
if(filling_color)
@@ -145,28 +145,28 @@
qdel(src)
/obj/item/food/snacks/grown/On_Consume(mob/M, mob/user)
/obj/item/food/grown/On_Consume(mob/M, mob/user)
if(iscarbon(M))
if(seed)
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_consume(src, M)
..()
/obj/item/food/snacks/grown/after_slip(mob/living/carbon/human/H)
/obj/item/food/grown/after_slip(mob/living/carbon/human/H)
if(!seed)
return
for(var/datum/plant_gene/trait/T in seed.genes)
T.on_slip(src, H)
// Glow gene procs
/obj/item/food/snacks/grown/generate_trash(atom/location)
/obj/item/food/grown/generate_trash(atom/location)
if(trash && ispath(trash, /obj/item/grown))
. = new trash(location, seed)
trash = null
return
return ..()
/obj/item/food/snacks/grown/decompile_act(obj/item/matter_decompiler/C, mob/user)
/obj/item/food/grown/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(isdrone(user))
C.stored_comms["wood"] += 4
qdel(src)
@@ -174,7 +174,7 @@
return ..()
// For item-containing growns such as eggy or gatfruit
/obj/item/food/snacks/grown/shell/attack_self(mob/user)
/obj/item/food/grown/shell/attack_self(mob/user)
if(!do_after(user, 1.5 SECONDS, target = user))
return
user.unEquip(src)
@@ -185,14 +185,14 @@
qdel(src)
// Diona Nymphs can eat these as well as weeds to gain nutrition.
/obj/item/food/snacks/grown/attack_animal(mob/living/simple_animal/M)
/obj/item/food/grown/attack_animal(mob/living/simple_animal/M)
if(isnymph(M))
var/mob/living/simple_animal/diona/D = M
D.consume(src)
else
return ..()
/obj/item/food/snacks/grown/proc/log_action(mob/user, atom/target, what_done)
/obj/item/food/grown/proc/log_action(mob/user, atom/target, what_done)
var/reagent_str = reagents.log_list()
var/genes_str = "No genes"
if(seed && length(seed.genes))
@@ -205,12 +205,12 @@
add_attack_logs(user, target, "[what_done] ([reagent_str] | [genes_str])")
/obj/item/food/snacks/grown/extinguish_light(force)
/obj/item/food/grown/extinguish_light(force)
if(seed.get_gene(/datum/plant_gene/trait/glow/shadow))
return
set_light(0)
/obj/item/food/snacks/grown/proc/send_plant_details(mob/user)
/obj/item/food/grown/proc/send_plant_details(mob/user)
var/msg = "<span class='info'>This is \a </span><span class='name'>[src].</span>\n"
if(seed)
msg += seed.get_analyzer_text()
@@ -225,13 +225,13 @@
msg += reag_txt
to_chat(user, msg)
/obj/item/food/snacks/grown/attack_ghost(mob/dead/observer/user)
/obj/item/food/grown/attack_ghost(mob/dead/observer/user)
if(!istype(user)) // Make sure user is actually an observer. Revenents also use attack_ghost, but do not have the toggle plant analyzer var.
return
if(user.plant_analyzer)
send_plant_details(user)
/obj/item/food/snacks/grown/fire_act()
/obj/item/food/grown/fire_act()
if(!..()) //Checks for if its unburnable
return
if(!reagents)
code/modules/hydroponics/grown/ambrosia.dm
+9 -9
View File
@@ -1,5 +1,5 @@
// Ambrosia - base type
/obj/item/food/snacks/grown/ambrosia
/obj/item/food/grown/ambrosia
seed = /obj/item/seeds/ambrosia
name = "ambrosia branch"
desc = "This is a plant."
@@ -20,7 +20,7 @@
icon_state = "seed-ambrosiavulgaris"
species = "ambrosiavulgaris"
plantname = "Ambrosia Vulgaris"
product = /obj/item/food/snacks/grown/ambrosia/vulgaris
product = /obj/item/food/grown/ambrosia/vulgaris
lifespan = 60
endurance = 25
yield = 6
@@ -30,7 +30,7 @@
mutatelist = list(/obj/item/seeds/ambrosia/deus)
reagents_add = list("space_drugs" = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05, "toxin" = 0.1)
/obj/item/food/snacks/grown/ambrosia/vulgaris
/obj/item/food/grown/ambrosia/vulgaris
seed = /obj/item/seeds/ambrosia
name = "ambrosia vulgaris branch"
desc = "This is a plant containing various healing chemicals."
@@ -44,12 +44,12 @@
icon_state = "seed-ambrosiadeus"
species = "ambrosiadeus"
plantname = "Ambrosia Deus"
product = /obj/item/food/snacks/grown/ambrosia/deus
product = /obj/item/food/grown/ambrosia/deus
mutatelist = list(/obj/item/seeds/ambrosia/gaia)
reagents_add = list("weak_omnizine" = 0.15, "synaptizine" = 0.15, "space_drugs" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05)
rarity = 40
/obj/item/food/snacks/grown/ambrosia/deus
/obj/item/food/grown/ambrosia/deus
seed = /obj/item/seeds/ambrosia/deus
name = "ambrosia deus branch"
desc = "Eating this makes you feel immortal!"
@@ -70,7 +70,7 @@
icon_state = "seed-ambrosia_gaia"
species = "ambrosia_gaia"
plantname = "Ambrosia Gaia"
product = /obj/item/food/snacks/grown/ambrosia/gaia
product = /obj/item/food/grown/ambrosia/gaia
mutatelist = list()
reagents_add = list("earthsblood" = 0.05, "nutriment" = 0.06, "vitamin" = 0.05)
rarity = 30 //These are some pretty good plants right here
@@ -78,7 +78,7 @@
weed_rate = 4
weed_chance = 100
/obj/item/food/snacks/grown/ambrosia/gaia
/obj/item/food/grown/ambrosia/gaia
name = "ambrosia gaia branch"
desc = "Eating this <i>makes</i> you immortal."
icon_state = "ambrosia_gaia"
@@ -92,12 +92,12 @@
// Ambrosia Cruciatus
/obj/item/seeds/ambrosia/cruciatus
product = /obj/item/food/snacks/grown/ambrosia/cruciatus
product = /obj/item/food/grown/ambrosia/cruciatus
potency = 10
mutatelist = list()
reagents_add = list("thc" = 0.15, "kelotane" = 0.15, "bicaridine" = 0.1, "bath_salts" = 0.20, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/ambrosia/cruciatus
/obj/item/food/grown/ambrosia/cruciatus
seed = /obj/item/seeds/ambrosia/cruciatus
wine_power = 0.7
tastes = list("ambrosia cruciatus" = 1)
code/modules/hydroponics/grown/apple.dm
+6 -6
View File
@@ -5,7 +5,7 @@
icon_state = "seed-apple"
species = "apple"
plantname = "Apple Tree"
product = /obj/item/food/snacks/grown/apple
product = /obj/item/food/grown/apple
lifespan = 55
endurance = 35
yield = 5
@@ -16,7 +16,7 @@
mutatelist = list(/obj/item/seeds/apple/gold)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/apple
/obj/item/food/grown/apple
seed = /obj/item/seeds/apple
name = "apple"
desc = "It's a little piece of Eden."
@@ -28,12 +28,12 @@
// Posioned Apple
/obj/item/seeds/apple/poisoned
product = /obj/item/food/snacks/grown/apple/poisoned
product = /obj/item/food/grown/apple/poisoned
mutatelist = list()
reagents_add = list("cyanide" = 0.5, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 50 // Source of cyanide, and hard (almost impossible) to obtain normally.
/obj/item/food/snacks/grown/apple/poisoned
/obj/item/food/grown/apple/poisoned
seed = /obj/item/seeds/apple/poisoned
// Gold Apple
@@ -43,14 +43,14 @@
icon_state = "seed-goldapple"
species = "goldapple"
plantname = "Golden Apple Tree"
product = /obj/item/food/snacks/grown/apple/gold
product = /obj/item/food/grown/apple/gold
maturation = 10
production = 10
mutatelist = list()
reagents_add = list("gold" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 40 // Alchemy!
/obj/item/food/snacks/grown/apple/gold
/obj/item/food/grown/apple/gold
seed = /obj/item/seeds/apple/gold
name = "golden apple"
desc = "Emblazoned upon the apple is the word 'Kallisti'."
code/modules/hydroponics/grown/banana.dm
+8 -8
View File
@@ -5,7 +5,7 @@
icon_state = "seed-banana"
species = "banana"
plantname = "Banana Tree"
product = /obj/item/food/snacks/grown/banana
product = /obj/item/food/grown/banana
lifespan = 50
endurance = 30
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.02)
/obj/item/food/snacks/grown/banana
/obj/item/food/grown/banana
seed = /obj/item/seeds/banana
name = "banana"
desc = "It's an excellent prop for a clown."
@@ -26,11 +26,11 @@
distill_reagent = "bananahonk"
tastes = list("banana" = 1)
/obj/item/food/snacks/grown/banana/Initialize(mapload)
/obj/item/food/grown/banana/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_CAN_POINT_WITH, ROUNDSTART_TRAIT)
/obj/item/food/snacks/grown/banana/suicide_act(mob/user)
/obj/item/food/grown/banana/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/items/bikehorn.ogg', 50, TRUE, -1)
sleep(25)
@@ -81,13 +81,13 @@
icon_state = "seed-mimana"
species = "mimana"
plantname = "Mimana Tree"
product = /obj/item/food/snacks/grown/banana/mime
product = /obj/item/food/grown/banana/mime
growthstages = 4
mutatelist = list()
reagents_add = list("nothing" = 0.1, "capulettium_plus" = 0.1, "nutriment" = 0.02)
rarity = 15
/obj/item/food/snacks/grown/banana/mime
/obj/item/food/grown/banana/mime
seed = /obj/item/seeds/banana/mime
name = "mimana"
desc = "It's an excellent prop for a mime."
@@ -110,13 +110,13 @@
species = "bluespacebanana"
icon_grow = "banana-grow"
plantname = "Bluespace Banana Tree"
product = /obj/item/food/snacks/grown/banana/bluespace
product = /obj/item/food/grown/banana/bluespace
mutatelist = list()
genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("singulo" = 0.2, "banana" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.02)
rarity = 30
/obj/item/food/snacks/grown/banana/bluespace
/obj/item/food/grown/banana/bluespace
seed = /obj/item/seeds/banana/bluespace
name = "bluespace banana"
icon_state = "bluenana"
code/modules/hydroponics/grown/beans.dm
+4 -4
View File
@@ -5,7 +5,7 @@
icon_state = "seed-soybean"
species = "soybean"
plantname = "Soybean Plants"
product = /obj/item/food/snacks/grown/soybeans
product = /obj/item/food/grown/soybeans
maturation = 4
production = 4
potency = 15
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/soya/koi)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05, "soybeanoil" = 0.03)
/obj/item/food/snacks/grown/soybeans
/obj/item/food/grown/soybeans
seed = /obj/item/seeds/soya
name = "soybeans"
desc = "It's pretty bland, but oh the possibilities..."
@@ -35,13 +35,13 @@
icon_state = "seed-koibean"
species = "koibean"
plantname = "Koibean Plants"
product = /obj/item/food/snacks/grown/koibeans
product = /obj/item/food/grown/koibeans
potency = 10
mutatelist = list()
reagents_add = list("carpotoxin" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05)
rarity = 20
/obj/item/food/snacks/grown/koibeans
/obj/item/food/grown/koibeans
seed = /obj/item/seeds/soya/koi
name = "koibean"
desc = "Something about these seems fishy."
code/modules/hydroponics/grown/berries.dm
+17 -17
View File
@@ -5,7 +5,7 @@
icon_state = "seed-berry"
species = "berry"
plantname = "Berry Bush"
product = /obj/item/food/snacks/grown/berries
product = /obj/item/food/grown/berries
lifespan = 20
maturation = 5
production = 5
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/berry/glow, /obj/item/seeds/berry/poison)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/berries
/obj/item/food/grown/berries
seed = /obj/item/seeds/berry
name = "bunch of berries"
desc = "Nutritious!"
@@ -35,12 +35,12 @@
icon_state = "seed-poisonberry"
species = "poisonberry"
plantname = "Poison-Berry Bush"
product = /obj/item/food/snacks/grown/berries/poison
product = /obj/item/food/grown/berries/poison
mutatelist = list(/obj/item/seeds/berry/death)
reagents_add = list("cyanide" = 0.15, "tirizene" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 10 // Mildly poisonous berries are common in reality
/obj/item/food/snacks/grown/berries/poison
/obj/item/food/grown/berries/poison
seed = /obj/item/seeds/berry/poison
name = "bunch of poison-berries"
desc = "Taste so good, you could die!"
@@ -57,14 +57,14 @@
icon_state = "seed-deathberry"
species = "deathberry"
plantname = "Death Berry Bush"
product = /obj/item/food/snacks/grown/berries/death
product = /obj/item/food/grown/berries/death
lifespan = 30
potency = 50
mutatelist = list()
reagents_add = list("coniine" = 0.08, "tirizene" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 30
/obj/item/food/snacks/grown/berries/death
/obj/item/food/grown/berries/death
seed = /obj/item/seeds/berry/death
name = "bunch of death-berries"
desc = "Taste so good, you could die!"
@@ -81,7 +81,7 @@
icon_state = "seed-glowberry"
species = "glowberry"
plantname = "Glow-Berry Bush"
product = /obj/item/food/snacks/grown/berries/glow
product = /obj/item/food/grown/berries/glow
lifespan = 30
endurance = 25
mutatelist = list()
@@ -89,7 +89,7 @@
reagents_add = list("uranium" = 0.25, "iodine" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
/obj/item/food/snacks/grown/berries/glow
/obj/item/food/grown/berries/glow
seed = /obj/item/seeds/berry/glow
name = "bunch of glow-berries"
desc = "Nutritious!"
@@ -109,7 +109,7 @@
icon_state = "seed-cherry"
species = "cherry"
plantname = "Cherry Tree"
product = /obj/item/food/snacks/grown/cherries
product = /obj/item/food/grown/cherries
lifespan = 35
endurance = 35
maturation = 5
@@ -122,7 +122,7 @@
mutatelist = list(/obj/item/seeds/cherry/blue)
reagents_add = list("plantmatter" = 0.07, "sugar" = 0.07)
/obj/item/food/snacks/grown/cherries
/obj/item/food/grown/cherries
seed = /obj/item/seeds/cherry
name = "cherries"
desc = "Great for toppings!"
@@ -140,12 +140,12 @@
icon_state = "seed-bluecherry"
species = "bluecherry"
plantname = "Blue Cherry Tree"
product = /obj/item/food/snacks/grown/bluecherries
product = /obj/item/food/grown/bluecherries
mutatelist = list()
reagents_add = list("plantmatter" = 0.07, "sugar" = 0.07)
rarity = 10
/obj/item/food/snacks/grown/bluecherries
/obj/item/food/grown/bluecherries
seed = /obj/item/seeds/cherry/blue
name = "blue cherries"
desc = "They're cherries that are blue."
@@ -162,7 +162,7 @@
icon_state = "seed-grapes"
species = "grape"
plantname = "Grape Vine"
product = /obj/item/food/snacks/grown/grapes
product = /obj/item/food/grown/grapes
lifespan = 50
endurance = 25
maturation = 3
@@ -176,12 +176,12 @@
mutatelist = list(/obj/item/seeds/grape/green)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1, "sugar" = 0.1)
/obj/item/food/snacks/grown/grapes
/obj/item/food/grown/grapes
seed = /obj/item/seeds/grape
name = "bunch of grapes"
desc = "Nutritious!"
icon_state = "grapes"
dried_type = /obj/item/food/snacks/no_raisin/healthy
dried_type = /obj/item/food/no_raisin/healthy
filling_color = "#FF1493"
bitesize_mod = 2
tastes = list("grapes" = 1)
@@ -194,12 +194,12 @@
icon_state = "seed-greengrapes"
species = "greengrape"
plantname = "Green-Grape Vine"
product = /obj/item/food/snacks/grown/grapes/green
product = /obj/item/food/grown/grapes/green
reagents_add = list("kelotane" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1, "sugar" = 0.1)
// No rarity: technically it's a beneficial mutant, but it's not exactly "new"...
mutatelist = list()
/obj/item/food/snacks/grown/grapes/green
/obj/item/food/grown/grapes/green
seed = /obj/item/seeds/grape/green
name = "bunch of green grapes"
icon_state = "greengrapes"
code/modules/hydroponics/grown/cannabis.dm
+10 -10
View File
@@ -5,7 +5,7 @@
icon_state = "seed-cannabis"
species = "cannabis"
plantname = "Cannabis Plant"
product = /obj/item/food/snacks/grown/cannabis
product = /obj/item/food/grown/cannabis
maturation = 8
potency = 20
growthstages = 1
@@ -24,7 +24,7 @@
icon_state = "seed-megacannabis"
species = "megacannabis"
plantname = "Rainbow Weed"
product = /obj/item/food/snacks/grown/cannabis/rainbow
product = /obj/item/food/grown/cannabis/rainbow
mutatelist = list(/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("lsd" = 0.15, "thc" = 0.15, "cbd" = 0.15, "happiness" = 0.15)
@@ -36,7 +36,7 @@
icon_state = "seed-blackcannabis"
species = "blackcannabis"
plantname = "Deathweed"
product = /obj/item/food/snacks/grown/cannabis/death
product = /obj/item/food/grown/cannabis/death
mutatelist = list()
reagents_add = list("cyanide" = 0.35, "thc" = 0.15, "cbd" = 0.15)
rarity = 40
@@ -47,7 +47,7 @@
icon_state = "seed-whitecannabis"
species = "whitecannabis"
plantname = "Lifeweed"
product = /obj/item/food/snacks/grown/cannabis/white
product = /obj/item/food/grown/cannabis/white
mutatelist = list(/obj/item/seeds/cannabis/death,
/obj/item/seeds/cannabis/ultimate)
reagents_add = list("omnizine" = 0.35, "thc" = 0.15, "cbd" = 0.15)
@@ -60,7 +60,7 @@
icon_state = "seed-ocannabis"
species = "ocannabis"
plantname = "Omega Weed"
product = /obj/item/food/snacks/grown/cannabis/ultimate
product = /obj/item/food/grown/cannabis/ultimate
mutatelist = list()
reagents_add = list("lsd" = 0.05,
"suicider" = 0.05,
@@ -85,7 +85,7 @@
// ---------------------------------------------------------------
/obj/item/food/snacks/grown/cannabis
/obj/item/food/grown/cannabis
seed = /obj/item/seeds/cannabis
icon = 'icons/goonstation/objects/hydroponics.dmi'
name = "cannabis leaf"
@@ -97,28 +97,28 @@
wine_power = 0.2
/obj/item/food/snacks/grown/cannabis/rainbow
/obj/item/food/grown/cannabis/rainbow
seed = /obj/item/seeds/cannabis/rainbow
name = "rainbow cannabis leaf"
desc = "Is it supposed to be glowing like that...?"
icon_state = "megacannabis"
wine_power = 0.6
/obj/item/food/snacks/grown/cannabis/death
/obj/item/food/grown/cannabis/death
seed = /obj/item/seeds/cannabis/death
name = "death cannabis leaf"
desc = "Looks a bit dark. Oh well."
icon_state = "blackcannabis"
wine_power = 0.4
/obj/item/food/snacks/grown/cannabis/white
/obj/item/food/grown/cannabis/white
seed = /obj/item/seeds/cannabis/white
name = "white cannabis leaf"
desc = "It feels smooth and nice to the touch."
icon_state = "whitecannabis"
wine_power = 0.1
/obj/item/food/snacks/grown/cannabis/ultimate
/obj/item/food/grown/cannabis/ultimate
seed = /obj/item/seeds/cannabis/ultimate
name = "omega cannibas leaf"
desc = "You feel dizzy looking at it. What the fuck?"
code/modules/hydroponics/grown/cereals.dm
+10 -10
View File
@@ -5,7 +5,7 @@
icon_state = "seed-wheat"
species = "wheat"
plantname = "Wheat Stalks"
product = /obj/item/food/snacks/grown/wheat
product = /obj/item/food/grown/wheat
production = 1
yield = 4
potency = 30
@@ -13,7 +13,7 @@
mutatelist = list(/obj/item/seeds/wheat/oat, /obj/item/seeds/wheat/meat)
reagents_add = list("plantmatter" = 0.04)
/obj/item/food/snacks/grown/wheat
/obj/item/food/grown/wheat
seed = /obj/item/seeds/wheat
name = "wheat"
desc = "Sigh... wheat... a-grain?"
@@ -31,10 +31,10 @@
icon_state = "seed-oat"
species = "oat"
plantname = "Oat Stalks"
product = /obj/item/food/snacks/grown/oat
product = /obj/item/food/grown/oat
mutatelist = list()
/obj/item/food/snacks/grown/oat
/obj/item/food/grown/oat
seed = /obj/item/seeds/wheat/oat
name = "oat"
desc = "Eat oats, do squats."
@@ -52,11 +52,11 @@
icon_state = "seed-rice"
species = "rice"
plantname = "Rice Stalks"
product = /obj/item/food/snacks/grown/rice
product = /obj/item/food/grown/rice
mutatelist = list()
growthstages = 3
/obj/item/food/snacks/grown/rice
/obj/item/food/grown/rice
seed = /obj/item/seeds/wheat/rice
name = "rice"
desc = "Rice to meet you."
@@ -74,11 +74,11 @@
icon_state = "seed-meatwheat"
species = "meatwheat"
plantname = "Meatwheat"
product = /obj/item/food/snacks/grown/meatwheat
product = /obj/item/food/grown/meatwheat
mutatelist = list()
reagents_add = list("protein" = 0.04)
/obj/item/food/snacks/grown/meatwheat
/obj/item/food/grown/meatwheat
name = "meatwheat"
desc = "Some blood-drenched wheat stalks. You can crush them into what passes for meat if you squint hard enough."
icon_state = "meatwheat"
@@ -89,10 +89,10 @@
tastes = list("meatwheat" = 1)
can_distill = FALSE
/obj/item/food/snacks/grown/meatwheat/attack_self(mob/living/user)
/obj/item/food/grown/meatwheat/attack_self(mob/living/user)
user.visible_message("<span class='notice'>[user] crushes [src] into meat.</span>", "<span class='notice'>You crush [src] into something that resembles meat.</span>")
playsound(user, 'sound/effects/blobattack.ogg', 50, 1)
var/obj/item/food/snacks/meat/meatwheat/M = new(get_turf(user))
var/obj/item/food/meat/meatwheat/M = new(get_turf(user))
user.drop_item()
qdel(src)
user.put_in_hands(M)
code/modules/hydroponics/grown/chili.dm
+6 -6
View File
@@ -5,7 +5,7 @@
icon_state = "seed-chili"
species = "chili"
plantname = "Chili Plants"
product = /obj/item/food/snacks/grown/chili
product = /obj/item/food/grown/chili
lifespan = 20
maturation = 5
production = 5
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/chili/ice, /obj/item/seeds/chili/ghost)
reagents_add = list("capsaicin" = 0.25, "vitamin" = 0.04, "plantmatter" = 0.04)
/obj/item/food/snacks/grown/chili
/obj/item/food/grown/chili
seed = /obj/item/seeds/chili
name = "chili"
desc = "It's spicy! Wait... IT'S BURNING ME!!"
@@ -35,7 +35,7 @@
icon_state = "seed-icepepper"
species = "chiliice"
plantname = "Chilly Pepper Plants"
product = /obj/item/food/snacks/grown/icepepper
product = /obj/item/food/grown/icepepper
lifespan = 25
maturation = 4
production = 4
@@ -43,7 +43,7 @@
mutatelist = list()
reagents_add = list("frostoil" = 0.25, "vitamin" = 0.02, "plantmatter" = 0.02)
/obj/item/food/snacks/grown/icepepper
/obj/item/food/grown/icepepper
seed = /obj/item/seeds/chili/ice
name = "chilly pepper"
desc = "It's a mutant strain of chili"
@@ -61,7 +61,7 @@
icon_state = "seed-chilighost"
species = "chilighost"
plantname = "Ghost Chili Plants"
product = /obj/item/food/snacks/grown/ghost_chili
product = /obj/item/food/grown/ghost_chili
endurance = 10
maturation = 10
production = 10
@@ -70,7 +70,7 @@
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.3, "capsaicin" = 0.55, "plantmatter" = 0.04)
/obj/item/food/snacks/grown/ghost_chili
/obj/item/food/grown/ghost_chili
seed = /obj/item/seeds/chili/ghost
name = "ghost chili"
desc = "It seems to be vibrating gently."
code/modules/hydroponics/grown/citrus.dm
+14 -14
View File
@@ -1,5 +1,5 @@
// Citrus - base type
/obj/item/food/snacks/grown/citrus
/obj/item/food/grown/citrus
seed = /obj/item/seeds/lime
name = "citrus"
desc = "It's so sour, your face will twist."
@@ -14,7 +14,7 @@
icon_state = "seed-lime"
species = "lime"
plantname = "Lime Tree"
product = /obj/item/food/snacks/grown/citrus/lime
product = /obj/item/food/grown/citrus/lime
lifespan = 55
endurance = 50
yield = 4
@@ -24,7 +24,7 @@
mutatelist = list(/obj/item/seeds/orange)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/citrus/lime
/obj/item/food/grown/citrus/lime
seed = /obj/item/seeds/lime
name = "lime"
desc = "It's so sour, your face will twist."
@@ -39,7 +39,7 @@
icon_state = "seed-orange"
species = "orange"
plantname = "Orange Tree"
product = /obj/item/food/snacks/grown/citrus/orange
product = /obj/item/food/grown/citrus/orange
lifespan = 60
endurance = 50
yield = 5
@@ -51,7 +51,7 @@
mutatelist = list(/obj/item/seeds/lime)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/citrus/orange
/obj/item/food/grown/citrus/orange
seed = /obj/item/seeds/orange
name = "orange"
desc = "It's an tangy fruit."
@@ -67,7 +67,7 @@
icon_state = "seed-lemon"
species = "lemon"
plantname = "Lemon Tree"
product = /obj/item/food/snacks/grown/citrus/lemon
product = /obj/item/food/grown/citrus/lemon
lifespan = 55
endurance = 45
yield = 4
@@ -78,7 +78,7 @@
mutatelist = list(/obj/item/seeds/firelemon)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/citrus/lemon
/obj/item/food/grown/citrus/lemon
seed = /obj/item/seeds/lemon
name = "lemon"
desc = "When life gives you lemons, make lemonade."
@@ -94,7 +94,7 @@
icon_state = "seed-firelemon"
species = "firelemon"
plantname = "Combustible Lemon Tree"
product = /obj/item/food/snacks/grown/firelemon
product = /obj/item/food/grown/firelemon
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "lime-grow"
icon_dead = "lime-dead"
@@ -104,7 +104,7 @@
yield = 4
reagents_add = list("plantmatter" = 0.05)
/obj/item/food/snacks/grown/firelemon
/obj/item/food/grown/firelemon
seed = /obj/item/seeds/firelemon
name = "combustible lemon"
desc = "Made for burning houses down."
@@ -114,7 +114,7 @@
tastes = list("burning lemon" = 1)
wine_flavor = "fire"
/obj/item/food/snacks/grown/firelemon/attack_self(mob/living/user)
/obj/item/food/grown/firelemon/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("<span class='warning'>[user] primes [src]!</span>", "<span class='userdanger'>You prime [src]!</span>")
investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB)
@@ -127,19 +127,19 @@
playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60))
/obj/item/food/snacks/grown/firelemon/burn()
/obj/item/food/grown/firelemon/burn()
prime()
..()
/obj/item/food/snacks/grown/firelemon/proc/update_mob()
/obj/item/food/grown/firelemon/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
M.unEquip(src)
/obj/item/food/snacks/grown/firelemon/ex_act(severity)
/obj/item/food/grown/firelemon/ex_act(severity)
qdel(src) //Ensuring that it's deleted by its own explosion
/obj/item/food/snacks/grown/firelemon/proc/prime()
/obj/item/food/grown/firelemon/proc/prime()
switch(seed.potency) //Combustible lemons are alot like IEDs, lots of flame, very little bang.
if(0 to 30)
update_mob()
code/modules/hydroponics/grown/cocoa_vanilla.dm
+4 -4
View File
@@ -5,7 +5,7 @@
icon_state = "seed-cocoapod"
species = "cocoapod"
plantname = "Cocao Tree"
product = /obj/item/food/snacks/grown/cocoapod
product = /obj/item/food/grown/cocoapod
lifespan = 20
maturation = 5
production = 5
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/cocoapod/vanillapod)
reagents_add = list("cocoa" = 0.25, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/cocoapod
/obj/item/food/grown/cocoapod
seed = /obj/item/seeds/cocoapod
name = "cocoa pod"
desc = "Fattening... Mmmmm... chucklate."
@@ -34,12 +34,12 @@
icon_state = "seed-vanillapod"
species = "vanillapod"
plantname = "Vanilla Tree"
product = /obj/item/food/snacks/grown/vanillapod
product = /obj/item/food/grown/vanillapod
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list()
reagents_add = list("vanilla" = 0.25, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/vanillapod
/obj/item/food/grown/vanillapod
seed = /obj/item/seeds/cocoapod/vanillapod
name = "vanilla pod"
desc = "Fattening... Mmmmm... vanilla."
code/modules/hydroponics/grown/corn.dm
+3 -3
View File
@@ -5,7 +5,7 @@
icon_state = "seed-corn"
species = "corn"
plantname = "Corn Stalks"
product = /obj/item/food/snacks/grown/corn
product = /obj/item/food/grown/corn
maturation = 8
potency = 20
growthstages = 3
@@ -15,12 +15,12 @@
mutatelist = list(/obj/item/seeds/corn/snapcorn)
reagents_add = list("cornoil" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/corn
/obj/item/food/grown/corn
seed = /obj/item/seeds/corn
name = "ear of corn"
desc = "Needs some butter!"
icon_state = "corn"
cooked_type = /obj/item/food/snacks/popcorn
cooked_type = /obj/item/food/popcorn
filling_color = "#FFFF00"
trash = /obj/item/grown/corncob
bitesize_mod = 2
code/modules/hydroponics/grown/eggplant.dm
+5 -5
View File
@@ -5,7 +5,7 @@
icon_state = "seed-eggplant"
species = "eggplant"
plantname = "Eggplants"
product = /obj/item/food/snacks/grown/eggplant
product = /obj/item/food/grown/eggplant
yield = 2
potency = 20
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
@@ -15,7 +15,7 @@
mutatelist = list(/obj/item/seeds/eggplant/eggy)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/eggplant
/obj/item/food/grown/eggplant
seed = /obj/item/seeds/eggplant
name = "eggplant"
desc = "Maybe there's a chicken inside?"
@@ -32,18 +32,18 @@
icon_state = "seed-eggy"
species = "eggy"
plantname = "Egg-Plants"
product = /obj/item/food/snacks/grown/shell/eggy
product = /obj/item/food/grown/shell/eggy
lifespan = 75
production = 12
mutatelist = list()
reagents_add = list("nutriment" = 0.1)
/obj/item/food/snacks/grown/shell/eggy
/obj/item/food/grown/shell/eggy
seed = /obj/item/seeds/eggplant/eggy
name = "Egg-plant"
desc = "There MUST be a chicken inside."
icon_state = "eggyplant"
trash = /obj/item/food/snacks/egg
trash = /obj/item/food/egg
filling_color = "#F8F8FF"
bitesize_mod = 2
tastes = list("egg-plant" = 1)
code/modules/hydroponics/grown/flowers.dm
+10 -10
View File
@@ -5,7 +5,7 @@
icon_state = "seed-poppy"
species = "poppy"
plantname = "Poppy Plants"
product = /obj/item/food/snacks/grown/poppy
product = /obj/item/food/grown/poppy
endurance = 10
maturation = 8
yield = 6
@@ -17,7 +17,7 @@
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
reagents_add = list("bicaridine" = 0.2, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/poppy
/obj/item/food/grown/poppy
seed = /obj/item/seeds/poppy
name = "poppy"
desc = "Long-used as a symbol of rest, peace, and death."
@@ -37,10 +37,10 @@
plantname = "Lily Plants"
icon_grow = "lily-grow"
icon_dead = "lily-dead"
product = /obj/item/food/snacks/grown/lily
product = /obj/item/food/grown/lily
mutatelist = list()
/obj/item/food/snacks/grown/lily
/obj/item/food/grown/lily
seed = /obj/item/seeds/poppy/lily
name = "lily"
desc = "A beautiful white flower."
@@ -60,10 +60,10 @@
plantname = "Geranium Plants"
icon_grow = "geranium-grow"
icon_dead = "geranium-dead"
product = /obj/item/food/snacks/grown/geranium
product = /obj/item/food/grown/geranium
mutatelist = list()
/obj/item/food/snacks/grown/geranium
/obj/item/food/grown/geranium
seed = /obj/item/seeds/poppy/geranium
name = "geranium"
desc = "A beautiful purple flower."
@@ -81,7 +81,7 @@
icon_state = "seed-harebell"
species = "harebell"
plantname = "Harebells"
product = /obj/item/food/snacks/grown/harebell
product = /obj/item/food/grown/harebell
lifespan = 100
endurance = 20
maturation = 7
@@ -93,7 +93,7 @@
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
reagents_add = list("plantmatter" = 0.04)
/obj/item/food/snacks/grown/harebell
/obj/item/food/grown/harebell
seed = /obj/item/seeds/harebell
name = "harebell"
desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten'd not thy breath.\""
@@ -150,12 +150,12 @@
plantname = "Moonflowers"
icon_grow = "moonflower-grow"
icon_dead = "sunflower-dead"
product = /obj/item/food/snacks/grown/moonflower
product = /obj/item/food/grown/moonflower
mutatelist = list()
reagents_add = list("moonshine" = 0.2, "vitamin" = 0.02, "plantmatter" = 0.02)
rarity = 15
/obj/item/food/snacks/grown/moonflower
/obj/item/food/grown/moonflower
seed = /obj/item/seeds/sunflower/moonflower
name = "moonflower"
desc = "Store in a location at least 50 yards away from werewolves."
code/modules/hydroponics/grown/garlic.dm
+2 -2
View File
@@ -4,14 +4,14 @@
icon_state = "seed-garlic"
species = "garlic"
plantname = "Garlic Sprouts"
product = /obj/item/food/snacks/grown/garlic
product = /obj/item/food/grown/garlic
yield = 6
potency = 25
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("garlic" = 0.15, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/garlic
/obj/item/food/grown/garlic
seed = /obj/item/seeds/garlic
name = "garlic"
desc = "Delicious, but with a potentially overwhelming odor."
code/modules/hydroponics/grown/grass_carpet.dm
+6 -6
View File
@@ -5,7 +5,7 @@
icon_state = "seed-grass"
species = "grass"
plantname = "Grass"
product = /obj/item/food/snacks/grown/grass
product = /obj/item/food/grown/grass
lifespan = 40
endurance = 40
maturation = 2
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/grass/carpet)
reagents_add = list("plantmatter" = 0.02, "hydrogen" = 0.05)
/obj/item/food/snacks/grown/grass
/obj/item/food/grown/grass
seed = /obj/item/seeds/grass
name = "grass"
desc = "Green and lush."
@@ -30,10 +30,10 @@
tastes = list("grass" = 1)
wine_power = 0.15
/obj/item/food/snacks/grown/grass/attack_self(mob/user)
/obj/item/food/grown/grass/attack_self(mob/user)
to_chat(user, "<span class='notice'>You prepare the astroturf.</span>")
var/grassAmt = 1 + round(seed.potency * tile_coefficient) // The grass we're holding
for(var/obj/item/food/snacks/grown/grass/G in user.loc) // The grass on the floor
for(var/obj/item/food/grown/grass/G in user.loc) // The grass on the floor
if(G.type != type)
continue
grassAmt += 1 + round(G.seed.potency * tile_coefficient)
@@ -48,11 +48,11 @@
icon_state = "seed-carpet"
species = "carpet"
plantname = "Carpet"
product = /obj/item/food/snacks/grown/grass/carpet
product = /obj/item/food/grown/grass/carpet
mutatelist = list()
rarity = 10
/obj/item/food/snacks/grown/grass/carpet
/obj/item/food/grown/grass/carpet
seed = /obj/item/seeds/grass/carpet
name = "carpet"
desc = "The textile industry's dark secret."
code/modules/hydroponics/grown/herbals.dm
+8 -8
View File
@@ -4,14 +4,14 @@
icon_state = "seed-lettuce"
species = "cabbage"
plantname = "Comfrey"
product = /obj/item/food/snacks/grown/comfrey
product = /obj/item/food/grown/comfrey
yield = 2
maturation = 3
growthstages = 1
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
reagents_add = list("styptic_powder" = 0.1)
/obj/item/food/snacks/grown/comfrey
/obj/item/food/grown/comfrey
seed = /obj/item/seeds/comfrey
name = "comfrey leaf"
desc = "Mash to turn into a poultice."
@@ -20,7 +20,7 @@
tastes = list("comfrey" = 1)
bitesize_mod = 2
/obj/item/food/snacks/grown/comfrey/attack_self(mob/user)
/obj/item/food/grown/comfrey/attack_self(mob/user)
var/obj/item/stack/medical/bruise_pack/comfrey/C = new(get_turf(user))
C.heal_brute = seed.potency
to_chat(user, "<span class='notice'>You mash [src] into a poultice.</span>")
@@ -33,12 +33,12 @@
icon_state = "seed-ambrosiavulgaris"
species = "ambrosiavulgaris"
plantname = "Aloe Vera Plant"
product = /obj/item/food/snacks/grown/aloe
product = /obj/item/food/grown/aloe
yield = 2
icon_dead = "ambrosia-dead"
reagents_add = list("silver_sulfadiazine" = 0.1)
/obj/item/food/snacks/grown/aloe
/obj/item/food/grown/aloe
seed = /obj/item/seeds/aloe
name = "aloe leaf"
desc = "Mash to turn into a poultice."
@@ -47,7 +47,7 @@
tastes = list("aloe" = 1)
bitesize_mod = 2
/obj/item/food/snacks/grown/aloe/attack_self(mob/user)
/obj/item/food/grown/aloe/attack_self(mob/user)
var/obj/item/stack/medical/ointment/aloe/A = new(get_turf(user))
A.heal_burn = seed.potency
to_chat(user, "<span class='notice'>You mash [src] into a poultice.</span>")
@@ -61,7 +61,7 @@
icon_state = "seed-mint"
species = "mint"
plantname = "Mint Plant"
product = /obj/item/food/snacks/grown/mint
product = /obj/item/food/grown/mint
lifespan = 20
maturation = 4
production = 5
@@ -70,7 +70,7 @@
icon_dead = "mint-dead"
reagents_add = list("mint" = 0.03, "plantmatter" = 0.03)
/obj/item/food/snacks/grown/mint
/obj/item/food/grown/mint
seed = /obj/item/seeds/mint
name = "mint leaves"
desc = "Process for mint. Distill for menthol. No need to experi-mint." //haha
code/modules/hydroponics/grown/kudzu.dm
+2 -2
View File
@@ -6,7 +6,7 @@
icon_state = "seed-kudzu"
species = "kudzu"
plantname = "Kudzu"
product = /obj/item/food/snacks/grown/kudzupod
product = /obj/item/food/grown/kudzupod
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy)
lifespan = 20
endurance = 10
@@ -88,7 +88,7 @@
adjust_potency(rand(15, -5))
/obj/item/food/snacks/grown/kudzupod
/obj/item/food/grown/kudzupod
seed = /obj/item/seeds/kudzu
name = "kudzu pod"
desc = "<I>Pueraria Virallis</I>: An invasive species with vines that rapidly creep and wrap around whatever they contact."
code/modules/hydroponics/grown/melon.dm
+5 -5
View File
@@ -5,7 +5,7 @@
icon_state = "seed-watermelon"
species = "watermelon"
plantname = "Watermelon Vines"
product = /obj/item/food/snacks/grown/watermelon
product = /obj/item/food/grown/watermelon
lifespan = 50
endurance = 40
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
@@ -21,12 +21,12 @@
qdel(src)
return OBLITERATION
/obj/item/food/snacks/grown/watermelon
/obj/item/food/grown/watermelon
seed = /obj/item/seeds/watermelon
name = "watermelon"
desc = "It's full of watery goodness."
icon_state = "watermelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
slice_path = /obj/item/food/snacks/watermelonslice
slice_path = /obj/item/food/watermelonslice
slices_num = 5
dried_type = null
w_class = WEIGHT_CLASS_NORMAL
@@ -42,12 +42,12 @@
icon_state = "seed-holymelon"
species = "holymelon"
plantname = "Holy Melon Vines"
product = /obj/item/food/snacks/grown/holymelon
product = /obj/item/food/grown/holymelon
mutatelist = list()
reagents_add = list("holywater" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1)
rarity = 20
/obj/item/food/snacks/grown/holymelon
/obj/item/food/grown/holymelon
seed = /obj/item/seeds/watermelon/holy
name = "holymelon"
desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon."
code/modules/hydroponics/grown/misc_seeds.dm
+14 -14
View File
@@ -32,7 +32,7 @@
icon_state = "seed-lettuce"
species = "cabbage"
plantname = "Lettuces"
product = /obj/item/food/snacks/grown/lettuce
product = /obj/item/food/grown/lettuce
lifespan = 50
endurance = 25
maturation = 3
@@ -43,7 +43,7 @@
genes = list(/datum/plant_gene/trait/repeated_harvest)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/lettuce
/obj/item/food/grown/lettuce
seed = /obj/item/seeds/lettuce
name = "lettuce"
desc = "Often confused with cabbages."
@@ -60,7 +60,7 @@
icon_state = "seed-lettuce"
species = "cabbage"
plantname = "Cabbages"
product = /obj/item/food/snacks/grown/cabbage
product = /obj/item/food/grown/cabbage
lifespan = 50
endurance = 25
maturation = 3
@@ -72,7 +72,7 @@
mutatelist = list(/obj/item/seeds/replicapod)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/cabbage
/obj/item/food/grown/cabbage
seed = /obj/item/seeds/cabbage
name = "cabbage"
desc = "Ewwwwwwwwww. Cabbage."
@@ -90,7 +90,7 @@
icon_state = "seed-sugarcane"
species = "sugarcane"
plantname = "Sugarcane"
product = /obj/item/food/snacks/grown/sugarcane
product = /obj/item/food/grown/sugarcane
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 60
endurance = 50
@@ -99,7 +99,7 @@
growthstages = 3
reagents_add = list("sugar" = 0.25)
/obj/item/food/snacks/grown/sugarcane
/obj/item/food/grown/sugarcane
seed = /obj/item/seeds/sugarcane
name = "sugarcane"
desc = "Sickly sweet."
@@ -143,7 +143,7 @@
icon_state = "seed-gatfruit"
species = "gatfruit"
plantname = "Gatfruit Tree"
product = /obj/item/food/snacks/grown/shell/gatfruit
product = /obj/item/food/grown/shell/gatfruit
genes = list(/datum/plant_gene/trait/repeated_harvest)
lifespan = 20
endurance = 20
@@ -156,7 +156,7 @@
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
reagents_add = list("sulfur" = 0.1, "carbon" = 0.1, "nitrogen" = 0.07, "potassium" = 0.05)
/obj/item/food/snacks/grown/shell/gatfruit
/obj/item/food/grown/shell/gatfruit
seed = /obj/item/seeds/gatfruit
name = "gatfruit"
desc = "It smells like burning."
@@ -174,12 +174,12 @@
icon_state = "seed-cherry_bomb"
species = "cherry_bomb"
plantname = "Cherry Bomb Tree"
product = /obj/item/food/snacks/grown/cherry_bomb
product = /obj/item/food/grown/cherry_bomb
mutatelist = list()
reagents_add = list("plantmatter" = 0.1, "sugar" = 0.1, "blackpowder" = 0.7)
rarity = 60 //See above
/obj/item/food/snacks/grown/cherry_bomb
/obj/item/food/grown/cherry_bomb
name = "cherry bombs"
desc = "You think you can hear the hissing of a tiny fuse."
icon_state = "cherry_bomb"
@@ -191,7 +191,7 @@
max_integrity = 40
wine_power = 0.8
/obj/item/food/snacks/grown/cherry_bomb/attack_self(mob/living/user)
/obj/item/food/grown/cherry_bomb/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("<span class='warning'>[user] plucks the stem from [src]!</span>", "<span class='userdanger'>You pluck the stem from [src], which begins to hiss loudly!</span>")
message_admins("[user] ([user.key ? user.key : "no key"]) primed a cherry bomb for detonation at [A] ([user.x], [user.y], [user.z]) <A href='byond://?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>(JMP)</a>")
@@ -201,16 +201,16 @@
C.throw_mode_on()
prime()
/obj/item/food/snacks/grown/cherry_bomb/deconstruct(disassembled = TRUE)
/obj/item/food/grown/cherry_bomb/deconstruct(disassembled = TRUE)
if(!disassembled)
prime()
if(!QDELETED(src))
qdel(src)
/obj/item/food/snacks/grown/cherry_bomb/ex_act(severity)
/obj/item/food/grown/cherry_bomb/ex_act(severity)
qdel(src) //Ensuring that it's deleted by its own explosion. Also prevents mass chain reaction with piles of cherry bombs
/obj/item/food/snacks/grown/cherry_bomb/proc/prime()
/obj/item/food/grown/cherry_bomb/proc/prime()
icon_state = "cherry_bomb_lit"
playsound(src, 'sound/goonstation/misc/fuse.ogg', seed.potency, 0)
reagents.set_reagent_temp(1000) //Sets off the black powder
code/modules/hydroponics/grown/mushrooms.dm
+25 -25
View File
@@ -1,4 +1,4 @@
/obj/item/food/snacks/grown/mushroom
/obj/item/food/grown/mushroom
name = "mushroom"
bitesize_mod = 2
wine_power = 0.4
@@ -11,7 +11,7 @@
icon_state = "mycelium-reishi"
species = "reishi"
plantname = "Reishi"
product = /obj/item/food/snacks/grown/mushroom/reishi
product = /obj/item/food/grown/mushroom/reishi
lifespan = 35
endurance = 35
maturation = 10
@@ -23,7 +23,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("morphine" = 0.35, "charcoal" = 0.35, "nutriment" = 0)
/obj/item/food/snacks/grown/mushroom/reishi
/obj/item/food/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
name = "reishi"
desc = "<I>Ganoderma lucidum</I>: A special fungus known for its medicinal and stress relieving properties."
@@ -39,7 +39,7 @@
icon_state = "mycelium-amanita"
species = "amanita"
plantname = "Fly Amanitas"
product = /obj/item/food/snacks/grown/mushroom/amanita
product = /obj/item/food/grown/mushroom/amanita
lifespan = 50
endurance = 35
maturation = 10
@@ -51,7 +51,7 @@
mutatelist = list(/obj/item/seeds/angel)
reagents_add = list("psilocybin" = 0.04, "amanitin" = 0.35, "nutriment" = 0, "growthserum" = 0.1)
/obj/item/food/snacks/grown/mushroom/amanita
/obj/item/food/grown/mushroom/amanita
seed = /obj/item/seeds/amanita
name = "fly amanita"
desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
@@ -67,7 +67,7 @@
icon_state = "mycelium-angel"
species = "angel"
plantname = "Destroying Angels"
product = /obj/item/food/snacks/grown/mushroom/angel
product = /obj/item/food/grown/mushroom/angel
lifespan = 50
endurance = 35
maturation = 12
@@ -81,7 +81,7 @@
rarity = 30
origin_tech = "biotech=5"
/obj/item/food/snacks/grown/mushroom/angel
/obj/item/food/grown/mushroom/angel
seed = /obj/item/seeds/angel
name = "destroying angel"
desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amanitin."
@@ -98,7 +98,7 @@
icon_state = "mycelium-liberty"
species = "liberty"
plantname = "Liberty-Caps"
product = /obj/item/food/snacks/grown/mushroom/libertycap
product = /obj/item/food/grown/mushroom/libertycap
maturation = 7
production = 1
yield = 5
@@ -108,7 +108,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("psilocybin" = 0.25, "nutriment" = 0.02)
/obj/item/food/snacks/grown/mushroom/libertycap
/obj/item/food/grown/mushroom/libertycap
seed = /obj/item/seeds/liberty
name = "liberty-cap"
desc = "<I>Psilocybe Semilanceata</I>: Liberate yourself!"
@@ -126,7 +126,7 @@
icon_state = "mycelium-plump"
species = "plump"
plantname = "Plump-Helmet Mushrooms"
product = /obj/item/food/snacks/grown/mushroom/plumphelmet
product = /obj/item/food/grown/mushroom/plumphelmet
maturation = 8
production = 1
yield = 4
@@ -137,7 +137,7 @@
mutatelist = list(/obj/item/seeds/plump/walkingmushroom)
reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
/obj/item/food/snacks/grown/mushroom/plumphelmet
/obj/item/food/grown/mushroom/plumphelmet
seed = /obj/item/seeds/plump
name = "plump-helmet"
desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
@@ -154,7 +154,7 @@
icon_state = "mycelium-walkingmushroom"
species = "walkingmushroom"
plantname = "Walking Mushrooms"
product = /obj/item/food/snacks/grown/mushroom/walkingmushroom
product = /obj/item/food/grown/mushroom/walkingmushroom
lifespan = 30
endurance = 30
maturation = 5
@@ -164,7 +164,7 @@
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.15)
rarity = 30
/obj/item/food/snacks/grown/mushroom/walkingmushroom
/obj/item/food/grown/mushroom/walkingmushroom
seed = /obj/item/seeds/plump/walkingmushroom
name = "walking mushroom"
desc = "<I>Plumus Locomotus</I>: The beginning of the great walk."
@@ -174,7 +174,7 @@
tastes = list("walking mushroom" = 1, "motion" = 1)
can_distill = FALSE
/obj/item/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user)
/obj/item/food/grown/mushroom/walkingmushroom/attack_self(mob/user)
if(isspaceturf(user.loc))
return
var/mob/living/simple_animal/hostile/mushroom/M = new /mob/living/simple_animal/hostile/mushroom(user.loc)
@@ -194,7 +194,7 @@
icon_state = "mycelium-chanter"
species = "chanter"
plantname = "Chanterelle Mushrooms"
product = /obj/item/food/snacks/grown/mushroom/chanterelle
product = /obj/item/food/grown/mushroom/chanterelle
lifespan = 35
endurance = 20
maturation = 7
@@ -206,7 +206,7 @@
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.1)
/obj/item/food/snacks/grown/mushroom/chanterelle
/obj/item/food/grown/mushroom/chanterelle
seed = /obj/item/seeds/chanter
name = "chanterelle cluster"
desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty!"
@@ -222,7 +222,7 @@
icon_state = "mycelium-glowshroom"
species = "glowshroom"
plantname = "Glowshrooms"
product = /obj/item/food/snacks/grown/mushroom/glowshroom
product = /obj/item/food/grown/mushroom/glowshroom
lifespan = 100 //ten times that is the delay
endurance = 30
maturation = 6
@@ -236,7 +236,7 @@
mutatelist = list(/obj/item/seeds/glowshroom/glowcap, /obj/item/seeds/glowshroom/shadowshroom)
reagents_add = list("radium" = 0.1, "phosphorus" = 0.1, "nutriment" = 0.04)
/obj/item/food/snacks/grown/mushroom/glowshroom
/obj/item/food/grown/mushroom/glowshroom
seed = /obj/item/seeds/glowshroom
name = "glowshroom cluster"
desc = "<I>Mycena Bregprox</I>: This species of mushroom glows in the dark."
@@ -248,7 +248,7 @@
tastes = list("warmth" = 1, "light" = 1, "glowshroom" = 1)
wine_power = 0.5
/obj/item/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
/obj/item/food/grown/mushroom/glowshroom/attack_self(mob/user)
if(isspaceturf(user.loc))
return FALSE
if(!isturf(user.loc))
@@ -279,14 +279,14 @@
species = "glowcap"
icon_harvest = "glowcap-harvest"
plantname = "Glowcaps"
product = /obj/item/food/snacks/grown/mushroom/glowshroom/glowcap
product = /obj/item/food/grown/mushroom/glowshroom/glowcap
maturation = 15
genes = list(/datum/plant_gene/trait/glow/red, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("teslium" = 0.1, "nutriment" = 0.04)
rarity = 30
/obj/item/food/snacks/grown/mushroom/glowshroom/glowcap
/obj/item/food/grown/mushroom/glowshroom/glowcap
seed = /obj/item/seeds/glowshroom/glowcap
name = "glowcap cluster"
desc = "<I>Mycena Ruthenia</I>: This species of mushroom glows in the dark, but isn't actually bioluminescent. They're warm to the touch..."
@@ -306,7 +306,7 @@
icon_state = "mycelium-tower"
species = "mold"
plantname = "Fungus"
product = /obj/item/food/snacks/grown/mushroom/fungus
product = /obj/item/food/grown/mushroom/fungus
yield = 4
icon_grow = "mold-grow"
icon_dead = "mold-dead"
@@ -315,7 +315,7 @@
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
reagents_add = list("fungus" = 0.35)
/obj/item/food/snacks/grown/mushroom/fungus
/obj/item/food/grown/mushroom/fungus
seed = /obj/item/seeds/fungus
name = "fungus"
desc = "A fungus ideal for making antibacterials."
@@ -332,14 +332,14 @@
icon_grow = "shadowshroom-grow"
icon_dead = "shadowshroom-dead"
plantname = "Shadowshrooms"
product = /obj/item/food/snacks/grown/mushroom/glowshroom/shadowshroom
product = /obj/item/food/grown/mushroom/glowshroom/shadowshroom
maturation = 15
genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
mutatelist = list()
reagents_add = list("radium" = 0.2, "nutriment" = 0.04)
rarity = 30
/obj/item/food/snacks/grown/mushroom/glowshroom/shadowshroom
/obj/item/food/grown/mushroom/glowshroom/shadowshroom
seed = /obj/item/seeds/glowshroom/shadowshroom
name = "shadowshroom cluster"
desc = "<I>Mycena Umbra</I>: This species of mushroom emits shadow instead of light."
code/modules/hydroponics/grown/nymph.dm
+3 -3
View File
@@ -4,7 +4,7 @@
icon_state = "seed-replicapod"
species = "replicapod"
plantname = "Nymph Pod"
product = /obj/item/food/snacks/grown/nymph_pod
product = /obj/item/food/grown/nymph_pod
lifespan = 50
endurance = 8
maturation = 10
@@ -12,14 +12,14 @@
yield = 1
reagents_add = list("plantmatter" = 0.1)
/obj/item/food/snacks/grown/nymph_pod
/obj/item/food/grown/nymph_pod
seed = /obj/item/seeds/nymph
name = "nymph pod"
desc = "A peculiar wriggling pod with a grown nymph inside. Crack it open to let the nymph out."
icon_state = "mushy"
bitesize_mod = 2
/obj/item/food/snacks/grown/nymph_pod/attack_self(mob/user)
/obj/item/food/grown/nymph_pod/attack_self(mob/user)
new /mob/living/simple_animal/diona(get_turf(user))
to_chat(user, "<span class='notice'>You crack open [src] letting the nymph out.</span>")
user.drop_item()
code/modules/hydroponics/grown/olive.dm
+2 -2
View File
@@ -5,7 +5,7 @@
icon_state = "seed-olive"
species = "olive"
plantname = "Olive Tree"
product = /obj/item/food/snacks/grown/olive
product = /obj/item/food/grown/olive
lifespan = 150
endurance = 35
yield = 5
@@ -15,7 +15,7 @@
mutatelist = list()
reagents_add = list("vitamin" = 0.02, "plantmatter" = 0.2, "sodiumchloride" = 0.2)
/obj/item/food/snacks/grown/olive
/obj/item/food/grown/olive
seed = /obj/item/seeds/olive
name = "olive"
desc = "A small cylindrical salty fruit closely related to mangoes. Can be ground into a paste and mixed with water to make quality oil."
code/modules/hydroponics/grown/onion.dm
+9 -9
View File
@@ -4,7 +4,7 @@
icon_state = "seed-onion"
species = "onion"
plantname = "Onion Sprouts"
product = /obj/item/food/snacks/grown/onion
product = /obj/item/food/grown/onion
lifespan = 20
maturation = 3
production = 4
@@ -16,14 +16,14 @@
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
mutatelist = list(/obj/item/seeds/onion/red)
/obj/item/food/snacks/grown/onion
/obj/item/food/grown/onion
seed = /obj/item/seeds/onion
name = "onion"
desc = "Nothing to cry over."
icon_state = "onion"
filling_color = "#C0C9A0"
bitesize_mod = 2
slice_path = /obj/item/food/snacks/onion_slice
slice_path = /obj/item/food/onion_slice
tastes = list("onion" = 1, "pungentness" = 1)
slices_num = 2
wine_power = 0.3
@@ -36,22 +36,22 @@
species = "onion_red"
plantname = "Red Onion Sprouts"
weed_chance = 1
product = /obj/item/food/snacks/grown/onion/red
product = /obj/item/food/grown/onion/red
mutatelist = list()
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1, "onionjuice" = 0.05)
/obj/item/food/snacks/grown/onion/red
/obj/item/food/grown/onion/red
seed = /obj/item/seeds/onion/red
name = "red onion"
desc = "Purple despite the name."
icon_state = "onion_red"
filling_color = "#C29ACF"
slice_path = /obj/item/food/snacks/onion_slice/red
slice_path = /obj/item/food/onion_slice/red
tastes = list("red onion" = 1, "pungentness" = 3)
wine_power = 0.6
wine_flavor = "powerful pungentness"
/obj/item/food/snacks/onion_slice
/obj/item/food/onion_slice
name = "onion slices"
desc = "Rings, not for wearing."
icon_state = "onionslice"
@@ -59,9 +59,9 @@
filling_color = "#C0C9A0"
tastes = list("onion" = 1, "pungentness" = 1)
gender = PLURAL
cooked_type = /obj/item/food/snacks/onionrings
cooked_type = /obj/item/food/onionrings
/obj/item/food/snacks/onion_slice/red
/obj/item/food/onion_slice/red
name = "red onion slices"
desc = "They shine like exceptionally low quality amethyst."
icon_state = "onionslice_red"
code/modules/hydroponics/grown/peanut.dm
+2 -2
View File
@@ -5,7 +5,7 @@
icon_state = "seed-potato"
species = "potato"
plantname = "Peanut Vines"
product = /obj/item/food/snacks/grown/peanuts
product = /obj/item/food/grown/peanuts
lifespan = 30
maturation = 10
production = 1
@@ -17,7 +17,7 @@
genes = list(/datum/plant_gene/trait/repeated_harvest)
reagents_add = list("plantmatter" = 0.1)
/obj/item/food/snacks/grown/peanuts
/obj/item/food/grown/peanuts
seed = /obj/item/seeds/peanuts
name = "patch of peanuts"
desc = "Best avoided if you have spess allergies."
code/modules/hydroponics/grown/pineapple.dm
+3 -3
View File
@@ -5,7 +5,7 @@
icon_state = "seed-pineapple"
species = "pineapple"
plantname = "Pineapple Plant"
product = /obj/item/food/snacks/grown/pineapple
product = /obj/item/food/grown/pineapple
lifespan = 40
endurance = 30
growthstages = 3
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/apple)
reagents_add = list("vitamin" = 0.02, "plantmatter" = 0.2, "water" = 0.04)
/obj/item/food/snacks/grown/pineapple
/obj/item/food/grown/pineapple
seed = /obj/item/seeds/pineapple
name = "pineapple"
desc = "A soft sweet interior surrounded by a spiky skin."
@@ -25,7 +25,7 @@
attack_verb = list("stung", "pined")
throw_speed = 1
throw_range = 5
slice_path = /obj/item/food/snacks/pineappleslice
slice_path = /obj/item/food/pineappleslice
slices_num = 3
filling_color = "#F6CB0B"
w_class = WEIGHT_CLASS_NORMAL
code/modules/hydroponics/grown/potato.dm
+7 -7
View File
@@ -5,7 +5,7 @@
icon_state = "seed-potato"
species = "potato"
plantname = "Potato Plants"
product = /obj/item/food/snacks/grown/potato
product = /obj/item/food/grown/potato
lifespan = 30
maturation = 10
production = 1
@@ -18,7 +18,7 @@
mutatelist = list(/obj/item/seeds/potato/sweet)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/potato
/obj/item/food/grown/potato
seed = /obj/item/seeds/potato
name = "potato"
desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
@@ -29,7 +29,7 @@
distill_reagent = "vodka"
/obj/item/food/snacks/grown/potato/wedges
/obj/item/food/grown/potato/wedges
name = "potato wedges"
desc = "Slices of neatly cut potato."
icon_state = "potato_wedges"
@@ -39,10 +39,10 @@
distill_reagent = "sbiten"
/obj/item/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
/obj/item/food/grown/potato/attackby(obj/item/W, mob/user, params)
if(W.sharp)
to_chat(user, "<span class='notice'>You cut the potato into wedges with [W].</span>")
var/obj/item/food/snacks/grown/potato/wedges/Wedges = new /obj/item/food/snacks/grown/potato/wedges
var/obj/item/food/grown/potato/wedges/Wedges = new /obj/item/food/grown/potato/wedges
if(!remove_item_from_storage(user))
user.unEquip(src)
user.put_in_hands(Wedges)
@@ -58,11 +58,11 @@
icon_state = "seed-sweetpotato"
species = "sweetpotato"
plantname = "Sweet Potato Plants"
product = /obj/item/food/snacks/grown/potato/sweet
product = /obj/item/food/grown/potato/sweet
mutatelist = list()
reagents_add = list("vitamin" = 0.1, "sugar" = 0.1, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/potato/sweet
/obj/item/food/grown/potato/sweet
seed = /obj/item/seeds/potato/sweet
name = "sweet potato"
desc = "It's sweet."
code/modules/hydroponics/grown/pumpkin.dm
+5 -5
View File
@@ -5,7 +5,7 @@
icon_state = "seed-pumpkin"
species = "pumpkin"
plantname = "Pumpkin Vines"
product = /obj/item/food/snacks/grown/pumpkin
product = /obj/item/food/grown/pumpkin
lifespan = 50
endurance = 40
growthstages = 3
@@ -17,7 +17,7 @@
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.2)
/obj/item/food/snacks/grown/pumpkin
/obj/item/food/grown/pumpkin
seed = /obj/item/seeds/pumpkin
name = "pumpkin"
desc = "It's large and scary."
@@ -28,7 +28,7 @@
wine_power = 0.2
var/carved_type = /obj/item/clothing/head/hardhat/pumpkinhead
/obj/item/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
/obj/item/food/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
if(W.sharp)
user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
new carved_type(user.loc)
@@ -44,13 +44,13 @@
icon_state = "seed-blumpkin"
species = "blumpkin"
plantname = "Blumpkin Vines"
product = /obj/item/food/snacks/grown/pumpkin/blumpkin
product = /obj/item/food/grown/pumpkin/blumpkin
mutatelist = list()
reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "plasma" = 0.1, "plantmatter" = 0.2)
rarity = 20
/obj/item/food/snacks/grown/pumpkin/blumpkin
/obj/item/food/grown/pumpkin/blumpkin
seed = /obj/item/seeds/pumpkin/blumpkin
name = "blumpkin"
desc = "The pumpkin's toxic sibling."
code/modules/hydroponics/grown/random_seeds.dm
+3 -3
View File
@@ -6,7 +6,7 @@
icon_state = "seed-x"
species = "?????"
plantname = "strange plant"
product = /obj/item/food/snacks/grown/random
product = /obj/item/food/grown/random
icon_grow = "xpod-grow"
icon_dead = "xpod-dead"
icon_harvest = "xpod-harvest"
@@ -30,14 +30,14 @@
add_random_plant_type(100)
desc = "Label: \n" + get_analyzer_text()
/obj/item/food/snacks/grown/random
/obj/item/food/grown/random
seed = /obj/item/seeds/random
name = "strange plant"
desc = "What could this even be?"
icon_state = "crunchy"
bitesize_mod = 2
/obj/item/food/snacks/grown/random/Initialize()
/obj/item/food/grown/random/Initialize()
. = ..()
wine_power = rand(0.1,1.5)
if(prob(1))
code/modules/hydroponics/grown/root.dm
+10 -10
View File
@@ -5,7 +5,7 @@
icon_state = "seed-carrot"
species = "carrot"
plantname = "Carrots"
product = /obj/item/food/snacks/grown/carrot
product = /obj/item/food/grown/carrot
maturation = 10
production = 1
yield = 5
@@ -14,7 +14,7 @@
mutatelist = list(/obj/item/seeds/carrot/parsnip)
reagents_add = list("oculine" = 0.25, "vitamin" = 0.04, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/carrot
/obj/item/food/grown/carrot
seed = /obj/item/seeds/carrot
name = "carrot"
desc = "It's good for the eyes!"
@@ -24,14 +24,14 @@
tastes = list("carrot" = 1)
wine_power = 0.3
/obj/item/food/snacks/grown/carrot/wedges
/obj/item/food/grown/carrot/wedges
name = "carrot wedges"
desc = "Slices of neatly cut carrot."
icon_state = "carrot_wedges"
filling_color = "#FFA500"
bitesize_mod = 2
/obj/item/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
/obj/item/food/grown/carrot/attackby(obj/item/I, mob/user, params)
if(I.sharp)
to_chat(user, "<span class='notice'>You sharpen the carrot into a shiv with [I].</span>")
var/obj/item/kitchen/knife/shiv/carrot/Shiv = new ()
@@ -50,12 +50,12 @@
icon_state = "seed-parsnip"
species = "parsnip"
plantname = "Parsnip"
product = /obj/item/food/snacks/grown/parsnip
product = /obj/item/food/grown/parsnip
icon_dead = "carrot-dead"
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/parsnip
/obj/item/food/grown/parsnip
seed = /obj/item/seeds/carrot/parsnip
name = "parsnip"
desc = "Closely related to carrots."
@@ -72,7 +72,7 @@
icon_state = "seed-whitebeet"
species = "whitebeet"
plantname = "White Beet Plants"
product = /obj/item/food/snacks/grown/whitebeet
product = /obj/item/food/grown/whitebeet
lifespan = 60
endurance = 50
yield = 6
@@ -81,7 +81,7 @@
mutatelist = list(/obj/item/seeds/redbeet)
reagents_add = list("vitamin" = 0.04, "sugar" = 0.2, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/whitebeet
/obj/item/food/grown/whitebeet
seed = /obj/item/seeds/whitebeet
name = "white beet"
desc = "You can't beat white beet."
@@ -98,7 +98,7 @@
icon_state = "seed-redbeet"
species = "redbeet"
plantname = "Red Beet Plants"
product = /obj/item/food/snacks/grown/redbeet
product = /obj/item/food/grown/redbeet
lifespan = 60
endurance = 50
yield = 6
@@ -107,7 +107,7 @@
genes = list(/datum/plant_gene/trait/maxchem)
reagents_add = list("vitamin" = 0.05, "plantmatter" = 0.05)
/obj/item/food/snacks/grown/redbeet
/obj/item/food/grown/redbeet
seed = /obj/item/seeds/redbeet
name = "red beet"
desc = "You can't beat red beet."
code/modules/hydroponics/grown/tea_coffee.dm
+8 -8
View File
@@ -5,7 +5,7 @@
icon_state = "seed-teaaspera"
species = "teaaspera"
plantname = "Tea Aspera Plant"
product = /obj/item/food/snacks/grown/tea
product = /obj/item/food/grown/tea
lifespan = 20
maturation = 5
production = 5
@@ -16,7 +16,7 @@
mutatelist = list(/obj/item/seeds/tea/astra)
reagents_add = list("vitamin" = 0.04, "teapowder" = 0.1)
/obj/item/food/snacks/grown/tea
/obj/item/food/grown/tea
seed = /obj/item/seeds/tea
name = "Tea Aspera tips"
desc = "These aromatic tips of the tea plant can be dried to make tea."
@@ -32,12 +32,12 @@
desc = "These seeds grow into Tea Astra, a more potent variant of tea"
species = "teaastra"
plantname = "Tea Astra Plant"
product = /obj/item/food/snacks/grown/tea/astra
product = /obj/item/food/grown/tea/astra
mutatelist = list()
reagents_add = list("synaptizine" = 0.1, "vitamin" = 0.04, "teapowder" = 0.1)
rarity = 20
/obj/item/food/snacks/grown/tea/astra
/obj/item/food/grown/tea/astra
seed = /obj/item/seeds/tea/astra
name = "Tea Astra tips"
desc = "Knock away your fatigue!"
@@ -53,7 +53,7 @@
icon_state = "seed-coffeea"
species = "coffeea"
plantname = "Coffee Arabica Bush"
product = /obj/item/food/snacks/grown/coffee
product = /obj/item/food/grown/coffee
lifespan = 30
endurance = 20
maturation = 5
@@ -65,7 +65,7 @@
mutatelist = list(/obj/item/seeds/coffee/robusta)
reagents_add = list("vitamin" = 0.04, "coffeepowder" = 0.1)
/obj/item/food/snacks/grown/coffee
/obj/item/food/grown/coffee
seed = /obj/item/seeds/coffee
name = "coffee arabica beans"
desc = "Dry them out to make coffee."
@@ -82,12 +82,12 @@
icon_state = "seed-coffeer"
species = "coffeer"
plantname = "Coffee Robusta Bush"
product = /obj/item/food/snacks/grown/coffee/robusta
product = /obj/item/food/grown/coffee/robusta
mutatelist = list()
reagents_add = list("ephedrine" = 0.1, "vitamin" = 0.04, "coffeepowder" = 0.1)
rarity = 20
/obj/item/food/snacks/grown/coffee/robusta
/obj/item/food/grown/coffee/robusta
seed = /obj/item/seeds/coffee/robusta
name = "coffee robusta beans"
desc = "Increases robustness by 37 percent!"
code/modules/hydroponics/grown/tobacco.dm
+4 -4
View File
@@ -5,7 +5,7 @@
icon_state = "seed-tobacco"
species = "tobacco"
plantname = "Tobacco Plant"
product = /obj/item/food/snacks/grown/tobacco
product = /obj/item/food/grown/tobacco
lifespan = 20
maturation = 5
production = 5
@@ -15,7 +15,7 @@
mutatelist = list(/obj/item/seeds/tobacco/space)
reagents_add = list("nicotine" = 0.03, "plantmatter" = 0.03)
/obj/item/food/snacks/grown/tobacco
/obj/item/food/grown/tobacco
seed = /obj/item/seeds/tobacco
name = "tobacco leaves"
desc = "Dry them out to make some smokes."
@@ -31,12 +31,12 @@
icon_state = "seed-stobacco"
species = "stobacco"
plantname = "Space Tobacco Plant"
product = /obj/item/food/snacks/grown/tobacco/space
product = /obj/item/food/grown/tobacco/space
mutatelist = list()
reagents_add = list("salbutamol" = 0.05, "nicotine" = 0.08, "plantmatter" = 0.03)
rarity = 20
/obj/item/food/snacks/grown/tobacco/space
/obj/item/food/grown/tobacco/space
seed = /obj/item/seeds/tobacco/space
name = "space tobacco leaves"
desc = "Dry them out to make some space-smokes."
code/modules/hydroponics/grown/tomato.dm
+13 -13
View File
@@ -5,7 +5,7 @@
icon_state = "seed-tomato"
species = "tomato"
plantname = "Tomato Plants"
product = /obj/item/food/snacks/grown/tomato
product = /obj/item/food/grown/tomato
maturation = 8
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "tomato-grow"
@@ -14,12 +14,12 @@
mutatelist = list(/obj/item/seeds/tomato/blue, /obj/item/seeds/tomato/blood)
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.1)
/obj/item/food/snacks/grown/tomato
/obj/item/food/grown/tomato
seed = /obj/item/seeds/tomato
name = "tomato"
desc = "I say to-mah-to, you say tom-mae-to."
icon_state = "tomato"
slice_path = /obj/item/food/snacks/tomatoslice
slice_path = /obj/item/food/tomatoslice
slices_num = 4
splat_type = /obj/effect/decal/cleanable/tomato_smudge
filling_color = "#FF6347"
@@ -34,12 +34,12 @@
icon_state = "seed-bloodtomato"
species = "bloodtomato"
plantname = "Blood-Tomato Plants"
product = /obj/item/food/snacks/grown/tomato/blood
product = /obj/item/food/grown/tomato/blood
mutatelist = list(/obj/item/seeds/tomato/killer)
reagents_add = list("blood" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
/obj/item/food/snacks/grown/tomato/blood
/obj/item/food/grown/tomato/blood
seed = /obj/item/seeds/tomato/blood
name = "blood-tomato"
desc = "So bloody...so...very...bloody....AHHHH!!!!"
@@ -58,7 +58,7 @@
icon_state = "seed-bluetomato"
species = "bluetomato"
plantname = "Blue-Tomato Plants"
product = /obj/item/food/snacks/grown/tomato/blue
product = /obj/item/food/grown/tomato/blue
yield = 2
icon_grow = "bluetomato-grow"
mutatelist = list(/obj/item/seeds/tomato/blue/bluespace)
@@ -66,7 +66,7 @@
reagents_add = list("lube" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 20
/obj/item/food/snacks/grown/tomato/blue
/obj/item/food/grown/tomato/blue
seed = /obj/item/seeds/tomato/blue
name = "blue-tomato"
desc = "I say blue-mah-to, you say blue-mae-to."
@@ -83,14 +83,14 @@
icon_state = "seed-bluespacetomato"
species = "bluespacetomato"
plantname = "Bluespace Tomato Plants"
product = /obj/item/food/snacks/grown/tomato/blue/bluespace
product = /obj/item/food/grown/tomato/blue/bluespace
yield = 2
mutatelist = list()
genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("lube" = 0.2, "singulo" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
rarity = 50
/obj/item/food/snacks/grown/tomato/blue/bluespace
/obj/item/food/grown/tomato/blue/bluespace
seed = /obj/item/seeds/tomato/blue/bluespace
name = "bluespace tomato"
desc = "So lubricated, you might slip through space-time."
@@ -108,7 +108,7 @@
icon_state = "seed-killertomato"
species = "killertomato"
plantname = "Killer-Tomato Plants"
product = /obj/item/food/snacks/grown/tomato/killer
product = /obj/item/food/grown/tomato/killer
yield = 2
genes = list(/datum/plant_gene/trait/squash)
growthstages = 2
@@ -119,7 +119,7 @@
reagents_add = list("vitamin" = 0.04, "protein" = 0.1)
rarity = 30
/obj/item/food/snacks/grown/tomato/killer
/obj/item/food/grown/tomato/killer
seed = /obj/item/seeds/tomato/killer
name = "killer-tomato"
desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
@@ -129,13 +129,13 @@
origin_tech = "biotech=4;combat=5"
distill_reagent = "demonsblood"
/obj/item/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
/obj/item/food/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
if(awakening)
to_chat(user, "<span class='warning'>The tomato is twitching and shaking, preventing you from eating it.</span>")
return
..()
/obj/item/food/snacks/grown/tomato/killer/attack_self(mob/user)
/obj/item/food/grown/tomato/killer/attack_self(mob/user)
if(awakening || isspaceturf(user.loc))
return
to_chat(user, "<span class='notice'>You begin to awaken the Killer Tomato...</span>")
code/modules/hydroponics/grown/towercap.dm
+6 -6
View File
@@ -43,11 +43,11 @@
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
var/plank_type = /obj/item/stack/sheet/wood
var/plank_name = "wooden planks"
var/static/list/accepted = typecacheof(list(/obj/item/food/snacks/grown/tobacco,
/obj/item/food/snacks/grown/tea,
/obj/item/food/snacks/grown/ambrosia/vulgaris,
/obj/item/food/snacks/grown/ambrosia/deus,
/obj/item/food/snacks/grown/wheat))
var/static/list/accepted = typecacheof(list(/obj/item/food/grown/tobacco,
/obj/item/food/grown/tea,
/obj/item/food/grown/ambrosia/vulgaris,
/obj/item/food/grown/ambrosia/deus,
/obj/item/food/grown/wheat))
/obj/item/grown/log/attackby(obj/item/W, mob/user, params)
if(W.sharp)
@@ -68,7 +68,7 @@
qdel(src)
if(CheckAccepted(W))
var/obj/item/food/snacks/grown/leaf = W
var/obj/item/food/grown/leaf = W
if(leaf.dry)
user.show_message("<span class='notice'>You wrap \the [W] around the log, turning it into a torch!</span>")
var/obj/item/flashlight/flare/torch/T = new /obj/item/flashlight/flare/torch(user.loc)
code/modules/hydroponics/hydroponics_tray.dm
+1 -1
View File
@@ -857,7 +857,7 @@
else if(istype(O, /obj/item/storage/bag/plants))
attack_hand(user)
var/obj/item/storage/bag/plants/S = O
for(var/obj/item/food/snacks/grown/G in locate(user.x,user.y,user.z))
for(var/obj/item/food/grown/G in locate(user.x,user.y,user.z))
if(!S.can_be_inserted(G))
return
S.handle_item_insertion(G, user, TRUE)
code/modules/hydroponics/plant_genes.dm
+18 -18
View File
@@ -209,7 +209,7 @@
return FALSE
return TRUE
/datum/plant_gene/trait/proc/on_new(obj/item/food/snacks/grown/G)
/datum/plant_gene/trait/proc/on_new(obj/item/food/grown/G)
if(!origin_tech) // This ugly code segment adds RnD tech levels to resulting plants.
return
@@ -224,19 +224,19 @@
else
G.origin_tech = list2params(origin_tech)
/datum/plant_gene/trait/proc/on_consume(obj/item/food/snacks/grown/G, mob/living/carbon/target)
/datum/plant_gene/trait/proc/on_consume(obj/item/food/grown/G, mob/living/carbon/target)
return
/datum/plant_gene/trait/proc/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/target)
/datum/plant_gene/trait/proc/on_slip(obj/item/food/grown/G, mob/living/carbon/target)
return
/datum/plant_gene/trait/proc/on_squash(obj/item/food/snacks/grown/G, atom/target)
/datum/plant_gene/trait/proc/on_squash(obj/item/food/grown/G, atom/target)
return
/datum/plant_gene/trait/proc/on_attackby(obj/item/food/snacks/grown/G, obj/item/I, mob/user)
/datum/plant_gene/trait/proc/on_attackby(obj/item/food/grown/G, obj/item/I, mob/user)
return
/datum/plant_gene/trait/proc/on_throw_impact(obj/item/food/snacks/grown/G, atom/target)
/datum/plant_gene/trait/proc/on_throw_impact(obj/item/food/grown/G, atom/target)
return
/datum/plant_gene/trait/squash
@@ -256,7 +256,7 @@
examine_line = "<span class='info'>It has a very slippery skin.</span>"
dangerous = TRUE
/datum/plant_gene/trait/slip/on_new(obj/item/food/snacks/grown/G)
/datum/plant_gene/trait/slip/on_new(obj/item/food/grown/G)
. = ..()
if(istype(G) && ispath(G.trash, /obj/item/grown))
return
@@ -280,19 +280,19 @@
origin_tech = list("powerstorage" = 5)
dangerous = TRUE
/datum/plant_gene/trait/cell_charge/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/C)
/datum/plant_gene/trait/cell_charge/on_slip(obj/item/food/grown/G, mob/living/carbon/C)
var/power = G.seed.potency*rate
if(prob(power))
C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
/datum/plant_gene/trait/cell_charge/on_squash(obj/item/food/snacks/grown/G, atom/target)
/datum/plant_gene/trait/cell_charge/on_squash(obj/item/food/grown/G, atom/target)
if(isliving(target))
var/mob/living/carbon/C = target
var/power = G.seed.potency*rate
if(prob(power))
C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
/datum/plant_gene/trait/cell_charge/on_consume(obj/item/food/snacks/grown/G, mob/living/carbon/target)
/datum/plant_gene/trait/cell_charge/on_consume(obj/item/food/grown/G, mob/living/carbon/target)
if(!G.reagents.total_volume)
var/batteries_recharged = 0
for(var/obj/item/stock_parts/cell/C in target.GetAllContents())
@@ -325,7 +325,7 @@
/datum/plant_gene/trait/glow/proc/glow_power(obj/item/seeds/S)
return max(S.potency*(rate + 0.01), 0.1)
/datum/plant_gene/trait/glow/on_new(obj/item/food/snacks/grown/G)
/datum/plant_gene/trait/glow/on_new(obj/item/food/grown/G)
..()
G.set_light(glow_range(G.seed), glow_power(G.seed), glow_color)
@@ -356,7 +356,7 @@
origin_tech = list("bluespace" = 5)
dangerous = TRUE
/datum/plant_gene/trait/teleport/on_squash(obj/item/food/snacks/grown/G, atom/target)
/datum/plant_gene/trait/teleport/on_squash(obj/item/food/grown/G, atom/target)
if(isliving(target))
var/mob/living/L = target
var/teleport_radius = max(round(G.seed.potency / 10), 1)
@@ -365,7 +365,7 @@
do_teleport(L, T, teleport_radius)
L.apply_status_effect(STATUS_EFFECT_TELEPORTSICK)
/datum/plant_gene/trait/teleport/on_slip(obj/item/food/snacks/grown/G, mob/living/carbon/C)
/datum/plant_gene/trait/teleport/on_slip(obj/item/food/grown/G, mob/living/carbon/C)
var/teleport_radius = max(round(G.seed.potency / 10), 1)
var/turf/T = get_turf(C)
if(do_teleport(C, T, teleport_radius))
@@ -386,7 +386,7 @@
name = "Densified Chemicals"
rate = 2
/datum/plant_gene/trait/maxchem/on_new(obj/item/food/snacks/grown/G)
/datum/plant_gene/trait/maxchem/on_new(obj/item/food/grown/G)
..()
G.reagents.maximum_volume *= rate
@@ -403,7 +403,7 @@
/datum/plant_gene/trait/battery
name = "Capacitive Cell Production"
/datum/plant_gene/trait/battery/on_attackby(obj/item/food/snacks/grown/G, obj/item/I, mob/user)
/datum/plant_gene/trait/battery/on_attackby(obj/item/food/grown/G, obj/item/I, mob/user)
if(istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
if(C.use(5))
@@ -432,7 +432,7 @@
name = "Hypodermic Prickles"
dangerous = TRUE
/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/food/snacks/grown/G, atom/target)
/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/food/grown/G, atom/target)
if(isliving(target) && G.reagents && G.reagents.total_volume)
var/mob/living/L = target
// It would be nice to inject the body part the original thrower aimed at,
@@ -449,7 +449,7 @@
name = "Gaseous Decomposition"
dangerous = TRUE
/datum/plant_gene/trait/smoke/on_squash(obj/item/food/snacks/grown/G, atom/target)
/datum/plant_gene/trait/smoke/on_squash(obj/item/food/grown/G, atom/target)
var/datum/effect_system/smoke_spread/chem/plant/S = new()
var/splat_location = get_turf(target)
var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
@@ -464,7 +464,7 @@
if(!(S.resistance_flags & FIRE_PROOF))
S.resistance_flags |= FIRE_PROOF
/datum/plant_gene/trait/fire_resistance/on_new(obj/item/food/snacks/grown/G)
/datum/plant_gene/trait/fire_resistance/on_new(obj/item/food/grown/G)
if(!(G.resistance_flags & FIRE_PROOF))
G.resistance_flags |= FIRE_PROOF
code/modules/hydroponics/seed_extractor.dm
+3 -3
View File
@@ -10,8 +10,8 @@
output_loc = extractor.loc
var/original_seed = null
if(istype(source_item, /obj/item/food/snacks/grown))
var/obj/item/food/snacks/grown/F = source_item
if(istype(source_item, /obj/item/food/grown))
var/obj/item/food/grown/F = source_item
original_seed = F.unsorted_seed || F.seed
else if(istype(source_item, /obj/item/grown))
var/obj/item/grown/F = source_item
@@ -103,7 +103,7 @@
SStgui.update_uis(src)
else
var/seedable = 0
for(var/obj/item/food/snacks/grown/ignored in P)
for(var/obj/item/food/grown/ignored in P)
seedable++
for(var/obj/item/grown/ignored in P)
seedable++
code/modules/hydroponics/seeds.dm
+2 -2
View File
@@ -242,8 +242,8 @@
data = list("blood_type" = "O-")
if(rid == "nutriment" || rid == "vitamin" || rid == "protein" || rid == "plantmatter")
// Apple tastes of apple.
if(istype(T, /obj/item/food/snacks/grown))
var/obj/item/food/snacks/grown/grown_edible = T
if(istype(T, /obj/item/food/grown))
var/obj/item/food/grown/grown_edible = T
data = grown_edible.tastes.Copy()
T.reagents.add_reagent(rid, amount, data)
code/modules/martial_arts/judo.dm
+1 -1
View File
@@ -27,7 +27,7 @@
/obj/item/reagent_containers/spray/pepper,
/obj/item/restraints/handcuffs,
/obj/item/flash,
/obj/item/food/snacks/donut,
/obj/item/food/donut,
/obj/item/flashlight/seclite,
/obj/item/holosign_creator/security,
/obj/item/holosign_creator/detective,
code/modules/mining/abandonedcrates.dm
+1 -1
View File
@@ -24,7 +24,7 @@
switch(loot)
if(1 to 5) //5% chance
new /obj/item/reagent_containers/drinks/bottle/rum(src)
new /obj/item/food/snacks/grown/ambrosia/deus(src)
new /obj/item/food/grown/ambrosia/deus(src)
new /obj/item/reagent_containers/drinks/bottle/whiskey(src)
new /obj/item/lighter(src)
if(6 to 10)
code/modules/mining/equipment/survival_pod.dm
+1 -1
View File
@@ -240,7 +240,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod,
return
for(var/i in 1 to 5)
var/obj/item/food/snacks/warmdonkpocket_weak/W = new(src)
var/obj/item/food/warmdonkpocket_weak/W = new(src)
load(W)
if(prob(50))
var/obj/item/storage/bag/dice/D = new(src)
code/modules/mining/lavaland/ash_flora.dm
+18 -18
View File
@@ -9,7 +9,7 @@
var/harvested_name = "shortened mushrooms"
var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large."
var/needs_sharp_harvest = TRUE
var/harvest = /obj/item/food/snacks/grown/ash_flora/shavings
var/harvest = /obj/item/food/grown/ash_flora/shavings
var/harvest_amount_low = 1
var/harvest_amount_high = 3
var/harvest_time = 60
@@ -85,7 +85,7 @@
desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures."
harvested_name = "leafless mushrooms"
harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?"
harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_leaf
harvest = /obj/item/food/grown/ash_flora/mushroom_leaf
needs_sharp_harvest = FALSE
harvest_amount_high = 4
harvest_time = 20
@@ -101,7 +101,7 @@
desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems."
harvested_name = "small mushrooms"
harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms."
harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_cap
harvest = /obj/item/food/grown/ash_flora/mushroom_cap
harvest_amount_high = 4
harvest_time = 50
harvest_message_low = "You slice the cap off of a mushroom."
@@ -118,7 +118,7 @@
light_power = 2.1
harvested_name = "tiny mushrooms"
harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back."
harvest = /obj/item/food/snacks/grown/ash_flora/mushroom_stem
harvest = /obj/item/food/grown/ash_flora/mushroom_stem
harvest_amount_high = 4
harvest_time = 40
harvest_message_low = "You pick and slice the cap off of a mushroom, leaving the stem."
@@ -133,7 +133,7 @@
desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash."
harvested_name = "cacti"
harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash."
harvest = /obj/item/food/snacks/grown/ash_flora/cactus_fruit
harvest = /obj/item/food/grown/ash_flora/cactus_fruit
needs_sharp_harvest = FALSE
harvest_amount_high = 2
harvest_time = 10
@@ -184,7 +184,7 @@
. = ..()
icon_state = "basalt[rand(1, 4)]"
/obj/item/food/snacks/grown/ash_flora
/obj/item/food/grown/ash_flora
name = "mushroom shavings"
desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
icon = 'icons/obj/lavaland/ash_flora.dmi'
@@ -195,36 +195,36 @@
seed = /obj/item/seeds/lavaland/polypore
wine_power = 0.2
/obj/item/food/snacks/grown/ash_flora/Initialize(mapload)
/obj/item/food/grown/ash_flora/Initialize(mapload)
. = ..()
pixel_x = rand(-4, 4)
pixel_y = rand(-4, 4)
/// for actual crafting
/obj/item/food/snacks/grown/ash_flora/shavings
/obj/item/food/grown/ash_flora/shavings
/obj/item/food/snacks/grown/ash_flora/mushroom_leaf
/obj/item/food/grown/ash_flora/mushroom_leaf
name = "mushroom leaf"
desc = "A leaf, from a mushroom."
icon_state = "mushroom_leaf"
seed = /obj/item/seeds/lavaland/porcini
wine_power = 0.4
/obj/item/food/snacks/grown/ash_flora/mushroom_cap
/obj/item/food/grown/ash_flora/mushroom_cap
name = "mushroom cap"
desc = "The cap of a large mushroom."
icon_state = "mushroom_cap"
seed = /obj/item/seeds/lavaland/inocybe
wine_power = 0.7
/obj/item/food/snacks/grown/ash_flora/mushroom_stem
/obj/item/food/grown/ash_flora/mushroom_stem
name = "mushroom stem"
desc = "A long mushroom stem. It's slightly glowing."
icon_state = "mushroom_stem"
seed = /obj/item/seeds/lavaland/ember
wine_power = 0.6
/obj/item/food/snacks/grown/ash_flora/cactus_fruit
/obj/item/food/grown/ash_flora/cactus_fruit
name = "cactus fruit"
desc = "A cactus fruit covered in a thick, reddish skin. And some ash."
icon_state = "cactus_fruit"
@@ -253,7 +253,7 @@
icon_state = "seed-cactus"
species = "cactus"
plantname = "Fruiting Cactus"
product = /obj/item/food/snacks/grown/ash_flora/cactus_fruit
product = /obj/item/food/grown/ash_flora/cactus_fruit
genes = list(/datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
growthstages = 2
@@ -265,7 +265,7 @@
icon_state = "mycelium-polypore"
species = "polypore"
plantname = "Polypore Mushrooms"
product = /obj/item/food/snacks/grown/ash_flora/shavings
product = /obj/item/food/grown/ash_flora/shavings
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("sugar" = 0.06, "ethanol" = 0.04, "stabilizing_agent" = 0.06, "minttoxin" = 0.02)
@@ -276,7 +276,7 @@
icon_state = "mycelium-porcini"
species = "porcini"
plantname = "Porcini Mushrooms"
product = /obj/item/food/snacks/grown/ash_flora/mushroom_leaf
product = /obj/item/food/grown/ash_flora/mushroom_leaf
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("nutriment" = 0.06, "vitfro" = 0.04, "nicotine" = 0.04)
@@ -288,7 +288,7 @@
icon_state = "mycelium-inocybe"
species = "inocybe"
plantname = "Inocybe Mushrooms"
product = /obj/item/food/snacks/grown/ash_flora/mushroom_cap
product = /obj/item/food/grown/ash_flora/mushroom_cap
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("lsd" = 0.04, "entpoly" = 0.08, "psilocybin" = 0.04)
@@ -299,7 +299,7 @@
icon_state = "mycelium-ember"
species = "ember"
plantname = "Embershroom Mushrooms"
product = /obj/item/food/snacks/grown/ash_flora/mushroom_stem
product = /obj/item/food/grown/ash_flora/mushroom_stem
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
reagents_add = list("tinlux" = 0.04, "vitamin" = 0.02, "space_drugs" = 0.02)
@@ -310,7 +310,7 @@
/datum/crafting_recipe/mushroom_bowl
name = "Mushroom Bowl"
result = list(/obj/item/reagent_containers/drinks/mushroom_bowl)
reqs = list(/obj/item/food/snacks/grown/ash_flora/shavings = 5)
reqs = list(/obj/item/food/grown/ash_flora/shavings = 5)
time = 30
category = CAT_PRIMAL
code/modules/mining/machine_vending.dm
+4 -4
View File
@@ -320,7 +320,7 @@
EQUIPMENT("Extra ID", /obj/item/card/id/golem, 250),
EQUIPMENT("Science Backpack", /obj/item/storage/backpack/science, 250),
EQUIPMENT("Full Toolbelt", /obj/item/storage/belt/utility/full/multitool, 250),
EQUIPMENT("Monkey Cube", /obj/item/food/snacks/monkeycube, 250),
EQUIPMENT("Monkey Cube", /obj/item/food/monkeycube, 250),
EQUIPMENT("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500),
EQUIPMENT("Grey Slime Extract", /obj/item/slime_extract/grey, 1000),
EQUIPMENT("KA Trigger Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1000),
@@ -356,9 +356,9 @@
EQUIPMENT("Medical Marijuana", /obj/item/storage/fancy/cigarettes/cigpack_med, 250),
EQUIPMENT("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
EQUIPMENT("Box of matches", /obj/item/storage/fancy/matches, 50),
EQUIPMENT("Cheeseburger", /obj/item/food/snacks/burger/cheese, 150),
EQUIPMENT("Big Burger", /obj/item/food/snacks/burger/bigbite, 250),
EQUIPMENT("Recycled Prisoner", /obj/item/food/snacks/soylentgreen, 500),
EQUIPMENT("Cheeseburger", /obj/item/food/burger/cheese, 150),
EQUIPMENT("Big Burger", /obj/item/food/burger/bigbite, 250),
EQUIPMENT("Recycled Prisoner", /obj/item/food/soylentgreen, 500),
EQUIPMENT("Crayons", /obj/item/storage/fancy/crayons, 350),
EQUIPMENT("Plushie", /obj/random/plushie, 750),
EQUIPMENT("Dnd set", /obj/item/storage/box/characters, 500),
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+1 -1
View File
@@ -3,7 +3,7 @@
name = "alien"
icon_state = "alien_s"
butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
butcher_results = list(/obj/item/food/monstermeat/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
var/caste = ""
var/alt_icon = 'icons/mob/alienleap.dmi' //used to switch between the two alien icon files.
var/custom_pixel_x_offset = 0 //for admin fuckery.
code/modules/mob/living/carbon/alien/larva/larva.dm
+1 -1
View File
@@ -7,7 +7,7 @@
maxHealth = 25
health = 25
butcher_results = list(/obj/item/food/snacks/monstermeat/xenomeat = 1)
butcher_results = list(/obj/item/food/monstermeat/xenomeat = 1)
density = FALSE
var/temperature_resistance = T0C+75
code/modules/mob/living/carbon/carbon_procs.dm
+1 -1
View File
@@ -1089,7 +1089,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return FALSE
var/fullness = nutrition + 10
if(istype(to_eat, /obj/item/food/snacks))
if(istype(to_eat, /obj/item/food))
for(var/datum/reagent/consumable/C in reagents.reagent_list) // We add the nutrition value of what we're currently digesting
fullness += C.nutriment_factor * C.volume / (C.metabolization_rate * metabolism_efficiency)
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -462,7 +462,7 @@ emp_act
return FALSE
if(HAS_TRAIT(I, TRAIT_BUTCHERS_HUMANS) && stat == DEAD && user.a_intent == INTENT_HARM)
var/obj/item/food/snacks/meat/human/newmeat = new /obj/item/food/snacks/meat/human(get_turf(loc))
var/obj/item/food/meat/human/newmeat = new /obj/item/food/meat/human(get_turf(loc))
newmeat.name = real_name + newmeat.name
newmeat.subjectname = real_name
newmeat.subjectjob = job
code/modules/mob/living/carbon/human/species/monkey.dm
+1 -1
View File
@@ -64,7 +64,7 @@
..()
H.real_name = get_random_name()
H.name = H.real_name
H.butcher_results = list(/obj/item/food/snacks/meat/monkey = 5)
H.butcher_results = list(/obj/item/food/meat/monkey = 5)
/datum/species/monkey/handle_dna(mob/living/carbon/human/H, remove)
..()

Some files were not shown because too many files have changed in this diff Show More