diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm index 9ccbdf2d9e..c4003097a7 100644 --- a/code/datums/supplypacks/hydroponics_vr.dm +++ b/code/datums/supplypacks/hydroponics_vr.dm @@ -38,3 +38,14 @@ cost = 60 //considering a corgi crate is 50, and you get two fennecs containertype = /obj/structure/largecrate/animal/fennec containername = "Fennec crate" + +/datum/supply_pack/hydro/fish + name = "Fish supply crate" + contains = list( + /obj/item/weapon/reagent_containers/food/snacks/lobster = 6, + /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 8, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 1 + ) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Fish crate" \ No newline at end of file diff --git a/code/game/objects/items/trash_vr.dm b/code/game/objects/items/trash_vr.dm index a738179c7f..43cadda3f7 100644 --- a/code/game/objects/items/trash_vr.dm +++ b/code/game/objects/items/trash_vr.dm @@ -29,4 +29,9 @@ /obj/item/trash/liquidprotein name = "\improper \"LiquidProtein\" ration" icon = 'icons/obj/trash_vr.dmi' - icon_state = "liquidprotein" \ No newline at end of file + icon_state = "liquidprotein" + +/obj/item/trash/fancyplate + name = "dirty fancy plate" + icon = 'icons/obj/trash_vr.dmi' + icon_state = "fancyplate" diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm index 8f7ec139ca..edb2d9482a 100644 --- a/code/modules/clothing/head/helmet_vr.dm +++ b/code/modules/clothing/head/helmet_vr.dm @@ -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' \ No newline at end of file + icon_override = 'icons/mob/head_vr.dmi' diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm new file mode 100644 index 0000000000..82cae35465 --- /dev/null +++ b/code/modules/clothing/head/misc_vr.dm @@ -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 diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 52f3752095..0321ca41bb 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -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" diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index f9aadda69d..bc375d0d70 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -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( diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi index 798bff510a..bf19238e2e 100644 Binary files a/icons/mob/head_vr.dmi and b/icons/mob/head_vr.dmi differ diff --git a/icons/obj/clothing/hats_vr.dmi b/icons/obj/clothing/hats_vr.dmi index f20d7c13d6..befa308d4b 100644 Binary files a/icons/obj/clothing/hats_vr.dmi and b/icons/obj/clothing/hats_vr.dmi differ diff --git a/icons/obj/food48x48_vr.dmi b/icons/obj/food48x48_vr.dmi new file mode 100644 index 0000000000..91d4307b37 Binary files /dev/null and b/icons/obj/food48x48_vr.dmi differ diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi index 08c984102b..7a6d3c5226 100644 Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ diff --git a/icons/obj/trash_vr.dmi b/icons/obj/trash_vr.dmi index 6c9d7ea7d3..17004c289d 100644 Binary files a/icons/obj/trash_vr.dmi and b/icons/obj/trash_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index bc9be432fc..4eff4d00b7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1604,6 +1604,7 @@ #include "code\modules\clothing\head\jobs.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_special.dm" +#include "code\modules\clothing\head\misc_vr.dm" #include "code\modules\clothing\head\pilot_helmet.dm" #include "code\modules\clothing\head\soft_caps.dm" #include "code\modules\clothing\head\solgov.dm"