Merge pull request #5292 from Ketrai/fishbranch

Adds lobsters and cuttlefish
This commit is contained in:
Spades
2019-06-03 21:06:22 -04:00
committed by GitHub
12 changed files with 153 additions and 2 deletions
+1 -1
View File
@@ -26,4 +26,4 @@
desc = "Vendi, vidi, visa; I came, I saw, I realised this hat was too expensive."
icon_state = "ge_helmcent"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
+7
View File
@@ -0,0 +1,7 @@
/obj/item/clothing/head/fish
name = "fish skull"
desc = "You... you're not actually going to wear that, right?"
icon_state = "fishskull"
icon = 'icons/obj/clothing/hats_vr.dmi'
icon_override = 'icons/mob/head_vr.dmi'
flags_inv = HIDEEARS|BLOCKHAIR
+107
View File
@@ -277,6 +277,113 @@
reagents.add_reagent("shockchem", 6)
bitesize = 7
/obj/item/weapon/reagent_containers/food/snacks/lobster
name = "raw lobster"
desc = "a shifty lobster. You can try eating it, but its shell is extremely tough."
icon = 'icons/obj/food_vr.dmi'
icon_state = "lobster_raw"
nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/lobster/Initialize()
..()
bitesize = 0.1
/obj/item/weapon/reagent_containers/food/snacks/lobstercooked
name = "cooked lobster"
desc = "a luxurious plate of cooked lobster, its taste accentuated by lemon juice. Reinvigorating!"
icon = 'icons/obj/food_vr.dmi'
icon_state = "lobster_cooked"
trash = /obj/item/trash/plate
nutriment_amt = 20
nutriment_desc = list("lemon" = 2, "lobster" = 5, "salad" = 2)
/obj/item/weapon/reagent_containers/food/snacks/lobstercooked/Initialize()
..()
bitesize = 5
reagents.add_reagent("protein", 20)
reagents.add_reagent("tricordrazine", 5)
reagents.add_reagent("iron", 5)
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish
name = "raw cuttlefish"
desc = "it's an adorable squid! you can't possible be thinking about eating this right?"
icon = 'icons/obj/food_vr.dmi'
icon_state = "cuttlefish_raw"
nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish/Initialize()
..()
bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked
name = "cooked cuttlefish"
desc = "it's a roasted cuttlefish. rubbery, squishy, an acquired taste."
icon = 'icons/obj/food_vr.dmi'
icon_state = "cuttlefish_cooked"
nutriment_amt = 20
nutriment_desc = list("cuttlefish" = 5, "rubber" = 5, "grease" = 1)
/obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked/Initialize()
..()
bitesize = 5
reagents.add_reagent("protein", 10)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish
name = "extra large monkfish"
desc = "it's a huge monkfish. better clean it first, you can't possibly eat it like this."
icon = 'icons/obj/food48x48_vr.dmi'
icon_state = "monkfish_raw"
nutriment_amt = 30
w_class = ITEMSIZE_HUGE //Is that a monkfish in your pocket, or are you just happy to see me?
slice_path = /obj/item/weapon/reagent_containers/food/snacks/monkfishfillet
slices_num = 6
trash = /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfishremains
/obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish/Initialize()
..()
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet
name = "monkfish fillet"
desc = "it's a fillet sliced from a monkfish."
icon = 'icons/obj/food_vr.dmi'
icon_state = "monkfish_fillet"
nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet/Initialize()
..()
bitesize = 3
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/monkfishcooked
name = "seasoned monkfish"
desc = "a delicious slice of monkfish prepared with sweet chili and spring onion."
icon = 'icons/obj/food_vr.dmi'
icon_state = "monkfish_cooked"
nutriment_amt = 10
nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2)
trash = /obj/item/trash/fancyplate
/obj/item/weapon/reagent_containers/food/snacks/monkfishcooked/Initialize()
..()
bitesize = 4
reagents.add_reagent("protein", 5)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfishremains
name = "monkfish remains"
icon = 'icons/obj/food_vr.dmi'
icon_state = "monkfish_remains"
desc = "the work of a madman."
w_class = ITEMSIZE_LARGE
nutriment_amt = 10
slice_path = /obj/item/clothing/head/fish
slices_num = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize()
..()
bitesize = 0.01 //impossible to eat
reagents.add_reagent("carbon", 5)
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube
name = "sobaka cube"
monkey_type = "Sobaka"
+20
View File
@@ -153,6 +153,26 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/makaroni
/datum/recipe/lobster
fruit = list("lemon" = 1, "cabbage" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/lobster
)
result = /obj/item/weapon/reagent_containers/food/snacks/lobstercooked
/datum/recipe/cuttlefish
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cuttlefish
)
result = /obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked
/datum/recipe/monkfish
fruit = list("chili" = 1, "onion" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked
/datum/recipe/margheritapizzacargo
reagents = list()
items = list(