Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds cooked and raw shrimp meat and shrimp nigiri roll. #14839

Merged
merged 2 commits into from Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/datums/cookingrecipes.dm
Expand Up @@ -1180,6 +1180,11 @@ datum/cookingrecipe/flockbrainburger
cookbonus = 10
output = /obj/item/reagent_containers/food/snacks/fish_fingers

/datum/cookingrecipe/shrimp
item1 = /obj/item/reagent_containers/food/snacks/ingredient/meat/fish/shrimp
cookbonus = 4
output = /obj/item/reagent_containers/food/snacks/shrimp

/datum/cookingrecipe/bacon
item1 = /obj/item/reagent_containers/food/snacks/ingredient/meat/bacon/raw
cookbonus = 8
Expand Down
1 change: 1 addition & 0 deletions code/modules/fishing/fish.dm
Expand Up @@ -313,6 +313,7 @@ Alien/mutant/other fish:
desc = "Shrimple as that."
icon_state = "shrimp"
inhand_color = "#db82db"
fillet_type = /obj/item/reagent_containers/food/snacks/ingredient/meat/fish/shrimp
category = FISH_CATEGORY_OCEAN
value = FISH_RARITY_UNCOMMON

Expand Down
6 changes: 6 additions & 0 deletions code/modules/food_and_drink/ingredients.dm
Expand Up @@ -113,6 +113,12 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/ingredient)
food_color = "#FFECB7"
real_name = "small fish"

/obj/item/reagent_containers/food/snacks/ingredient/meat/fish/shrimp
name = "raw shrimp meat"
desc = "Meat of a freshly caught shrimp."
icon_state = "shrimp_meat"
food_color = "#f0ac98"

/obj/item/reagent_containers/food/snacks/ingredient/meat/synthmeat
name = "synthmeat"
desc = "Synthetic meat grown in hydroponics."
Expand Down
26 changes: 26 additions & 0 deletions code/modules/food_and_drink/snacks.dm
Expand Up @@ -2075,6 +2075,15 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/soup)
food_effects = list("food_burn", "food_sweaty", "food_tox")
meal_time_flags = MEAL_TIME_LUNCH

/obj/item/reagent_containers/food/snacks/shrimp
name = "cooked shrimp meat"
desc = "A perfectly boiled shrimp meat ready to serve. Fancy!"
icon_state = "shrimp_meat_cooked"
bites_left = 1
heal_amt = 2
food_color = "#e14531"
food_effects = list("food_warm", "food_brute")

/obj/item/reagent_containers/food/snacks/bakedpotato
name = "baked potato"
desc = "Would go good with some cheese or steak."
Expand Down Expand Up @@ -2508,6 +2517,23 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/soup)
else
nigiri.set_loc(spawnloc)
qdel(src)
else if(istype(W, /obj/item/reagent_containers/food/snacks/shrimp))
var/spawnloc = get_turf(src)
var/handspawn
if(istype(src.loc,/mob))
user.u_equip(src)
handspawn = TRUE
src.set_loc(user)
var/obj/item/reagent_containers/food/snacks/nigiri_roll/nigiri = new /obj/item/reagent_containers/food/snacks/nigiri_roll
nigiri.icon_state = "nigiri_shrimp"
nigiri.desc = "A ball of sticky rice with a cooked shrimp on top."
user.u_equip(W)
qdel(W)
if(handspawn)
user.put_in_hand_or_drop(nigiri)
else
nigiri.set_loc(spawnloc)
qdel(src)

/obj/item/reagent_containers/food/snacks/rice_ball/onigiri
name = "onigiri"
Expand Down
1 change: 1 addition & 0 deletions code/obj/submachine/cooking.dm
Expand Up @@ -667,6 +667,7 @@ table#cooktime a#start {
src.recipes += new /datum/cookingrecipe/steak_s(src)
src.recipes += new /datum/cookingrecipe/steak_ling(src)
src.recipes += new /datum/cookingrecipe/fish_fingers(src)
src.recipes += new /datum/cookingrecipe/shrimp(src)
src.recipes += new /datum/cookingrecipe/hardboiled(src)
src.recipes += new /datum/cookingrecipe/bakedpotato(src)
src.recipes += new /datum/cookingrecipe/rice_ball(src)
Expand Down
Binary file modified icons/obj/foodNdrink/food.dmi
Binary file not shown.
Binary file modified icons/obj/foodNdrink/food_ingredient.dmi
Binary file not shown.
Binary file modified icons/obj/foodNdrink/food_sushi.dmi
Binary file not shown.