diff --git a/code/modules/clothing/head/helmet_vr.dm b/code/modules/clothing/head/helmet_vr.dm index 689ab46a116..edb2d9482ae 100644 --- a/code/modules/clothing/head/helmet_vr.dm +++ b/code/modules/clothing/head/helmet_vr.dm @@ -27,12 +27,3 @@ icon_state = "ge_helmcent" icon = 'icons/obj/clothing/hats_vr.dmi' icon_override = 'icons/mob/head_vr.dmi' - -/obj/item/clothing/head/helmet/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 - item_state_slots = list(slot_r_hand_str = "fishk", slot_l_hand_str = "fisk") \ No newline at end of file diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm new file mode 100644 index 00000000000..f54345f894a --- /dev/null +++ b/code/modules/clothing/head/misc_vr.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/head/helmet/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 622ba027a7a..21fe0130520 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -348,9 +348,9 @@ desc = "it's a fillet sliced from a monkfish." icon = 'icons/obj/food_vr.dmi' icon_state = "monkfish_fillet" - nutriment_amt = 0.5 + nutriment_amt = 5 -/obj/item/weapon/reagent_containers/food/snacks/cuttlefishcooked/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/monkfishfillet/Initialize() ..() bitesize = 3 reagents.add_reagent("protein", 1) @@ -364,7 +364,7 @@ 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/cuttlefishcooked/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/monkfishcooked/Initialize() ..() bitesize = 4 reagents.add_reagent("protein", 5) diff --git a/icons/mob/head_vr.dmi b/icons/mob/head_vr.dmi index d2122c70ccc..848dfe0ab44 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 f20d7c13d68..befa308d4b9 100644 Binary files a/icons/obj/clothing/hats_vr.dmi and b/icons/obj/clothing/hats_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index bc9be432fc1..4eff4d00b79 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"