diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index decb7027db..ff198ab1ec 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -1,5 +1,11 @@ /datum/supply_pack/randomised/hospitality/pizza cost = 50 + contains = list( + /obj/random/pizzabox = 5, + /obj/item/weapon/material/knife/plastic, + /obj/item/clothing/under/pizzaguy, + /obj/item/clothing/head/pizzaguy + ) /datum/supply_pack/randomised/hospitality/burgers_vr num_contained = 5 diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 0dbfa97d5e..4fa20e8db7 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -46,4 +46,97 @@ /obj/item/clothing/head/shiny_hood/closed/poly name = "polychromic closed shiny hood" icon_state = "hood_col_o" - polychromic = TRUE \ No newline at end of file +<<<<<<< HEAD + polychromic = TRUE +||||||| parent of 25fcce0fa9... Merge pull request #10271 from Heroman3003/pizza-time + polychromic = TRUE + +/obj/item/clothing/head/pelt + name = "Bear pelt" + desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through winter." + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + icon_state = "bearpelt_brown" + item_state = "bearpelt_brown" + +/obj/item/clothing/head/pelt/wolfpelt + name = "Wolf pelt" + desc = "A fuzzy wolf pelt, demanding respect as a hunter, well if it isn't synthetic or anything at least. Or bought." + icon_override = 'icons/mob/wolfpelt_vr.dmi' + icon_state = "wolfpelt_brown" + item_state = "wolfpelt_brown" + +/obj/item/clothing/head/pelt/wolfpeltblack + name = "Wolf pelt" + desc = "A fuzzy wolf pelt, demanding respect as a hunter, well if it isn't synthetic or anything at least. Or bought." + icon_override = 'icons/mob/wolfpelt_vr.dmi' + icon_state = "wolfpelt_gray" + item_state = "wolfpelt_gray" + +/obj/item/clothing/head/pelt/tigerpelt + name = "Shiny tiger pelt" + desc = "A vibrant tiger pelt, particularly fabulous." + icon_state = "tigerpelt_shiny" + item_state = "tigerpelt_shiny" + +/obj/item/clothing/head/pelt/tigerpeltsnow + name = "Snow tiger pelt" + desc = "A pelt of a less vibrant tiger, but rather warm." + icon_state = "tigerpelt_snow" + item_state = "tigerpelt_snow" + +/obj/item/clothing/head/pelt/tigerpeltpink + name = "Pink tiger pelt" + desc = "A particularly vibrant tiger pelt, for those who want to be the most fabulous at parties." + icon_state = "tigerpelt_pink" + item_state = "tigerpelt_pink" +======= + polychromic = TRUE + +/obj/item/clothing/head/pelt + name = "Bear pelt" + desc = "A luxurious bear pelt, good to keep warm in winter. Or to sleep through winter." + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' + icon_state = "bearpelt_brown" + item_state = "bearpelt_brown" + +/obj/item/clothing/head/pelt/wolfpelt + name = "Wolf pelt" + desc = "A fuzzy wolf pelt, demanding respect as a hunter, well if it isn't synthetic or anything at least. Or bought." + icon_override = 'icons/mob/wolfpelt_vr.dmi' + icon_state = "wolfpelt_brown" + item_state = "wolfpelt_brown" + +/obj/item/clothing/head/pelt/wolfpeltblack + name = "Wolf pelt" + desc = "A fuzzy wolf pelt, demanding respect as a hunter, well if it isn't synthetic or anything at least. Or bought." + icon_override = 'icons/mob/wolfpelt_vr.dmi' + icon_state = "wolfpelt_gray" + item_state = "wolfpelt_gray" + +/obj/item/clothing/head/pelt/tigerpelt + name = "Shiny tiger pelt" + desc = "A vibrant tiger pelt, particularly fabulous." + icon_state = "tigerpelt_shiny" + item_state = "tigerpelt_shiny" + +/obj/item/clothing/head/pelt/tigerpeltsnow + name = "Snow tiger pelt" + desc = "A pelt of a less vibrant tiger, but rather warm." + icon_state = "tigerpelt_snow" + item_state = "tigerpelt_snow" + +/obj/item/clothing/head/pelt/tigerpeltpink + name = "Pink tiger pelt" + desc = "A particularly vibrant tiger pelt, for those who want to be the most fabulous at parties." + icon_state = "tigerpelt_pink" + item_state = "tigerpelt_pink" + +/obj/item/clothing/head/pizzaguy + name = "pizza delivery visor" + desc = "A fancy visor showing alignment to pizza delivery service. Extremely risky career choice." + icon_state = "pizzadelivery" + icon = 'icons/obj/clothing/hats_vr.dmi' + icon_override = 'icons/mob/head_vr.dmi' +>>>>>>> 25fcce0fa9... Merge pull request #10271 from Heroman3003/pizza-time diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 4c581d728b..56ec70ede9 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -138,3 +138,13 @@ name = "red qipao" icon_state = "qipao_red" item_state = "qipao_red" + +/obj/item/clothing/under/pizzaguy + name = "pizza delivery uniform" + desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin." + icon = 'icons/obj/clothing/uniforms_vr.dmi' + icon_override = 'icons/mob/uniform_vr.dmi' + rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi' + icon_state = "pizzadelivery" + item_state = "pizzadelivery" + rolled_down = 1 diff --git a/icons/mob/uniform_rolled_down_vr.dmi b/icons/mob/uniform_rolled_down_vr.dmi new file mode 100644 index 0000000000..8504c4112b Binary files /dev/null and b/icons/mob/uniform_rolled_down_vr.dmi differ diff --git a/icons/mob/uniform_vr.dmi b/icons/mob/uniform_vr.dmi index 7be0960b79..164207c314 100644 Binary files a/icons/mob/uniform_vr.dmi and b/icons/mob/uniform_vr.dmi differ diff --git a/icons/obj/clothing/uniforms_vr.dmi b/icons/obj/clothing/uniforms_vr.dmi index 793a6004b3..17204c732e 100644 Binary files a/icons/obj/clothing/uniforms_vr.dmi and b/icons/obj/clothing/uniforms_vr.dmi differ