diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 417b1c5257..75697053aa 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -129,3 +129,17 @@ Talon winter coat /datum/gear/suit/russofurcoat display_name = "long fur coat" path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat + +//Colorable Hoodie + +/datum/gear/suit/hoodie_vr + display_name = "hoodie with hood (colorable)" + path = /obj/item/clothing/suit/storage/hooded/hoodie + +/datum/gear/suit/hoodie_vr/New() + var/list/hoodies = list() + for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/hooded/hoodie)) + var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style + hoodies[initial(hoodie.name)] = hoodie + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies)) + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index 8f7f752ee0..4243b0fa27 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -203,9 +203,16 @@ name = "techpriest hood" desc = "A techpriest hood." icon_state = "techpriesthood" - + /obj/item/clothing/head/hood/siffet_hood name = "siffet hood" desc = "A hood that looks vaguely like a siffet's head. Guaranteed to traumatize your Promethean coworkers." icon_state = "siffet" item_state_slots = list(slot_r_hand_str = "siffet", slot_l_hand_str = "siffet") + +/obj/item/clothing/head/hood/hoodie + name = "hood" + desc = "The hood of a hoodie. Cosy!" + icon = 'icons/inventory/head/item_vr.dmi' + icon_override = 'icons/inventory/head/mob_vr.dmi' + icon_state = "hood_plain" diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index 89470f7e8b..2dedc13987 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -60,6 +60,8 @@ hood.canremove = FALSE icon_state = "[toggleicon]_t" H.update_inv_wear_suit() + if(color != hood.color) + hood.color = color else RemoveHood() diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index cb279936aa..4b79a4e3c0 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -78,3 +78,45 @@ icon_state = "taloncoat" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) hoodtype = /obj/item/clothing/head/hood/winter/talon + +//Functional hoodie + +/obj/item/clothing/suit/storage/hooded/hoodie + name = "hoodie" + desc = "A warm jacket, now featuring a hood!" + icon = 'icons/inventory/suit/item_vr.dmi' + icon_override = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "hoodie_plain" + item_state_slots = list(slot_r_hand_str = "grey_hoodie", slot_l_hand_str = "grey_hoodie") + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + flags_inv = HIDEHOLSTER + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + hoodtype = /obj/item/clothing/head/hood/hoodie + allowed = list(/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, + /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit) + +/obj/item/clothing/suit/storage/hooded/hoodie/redtrim + name = "red-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a bold red trim!" + icon_state = "hoodie_redtrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/bluetrim + name = "blue-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a cool blue trim!" + icon_state = "hoodie_bluetrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/greentrim + name = "green-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a chilled green trim!" + icon_state = "hoodie_greentrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/purpletrim + name = "purple-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and a smart purple trim!" + icon_state = "hoodie_purpletrim" + +/obj/item/clothing/suit/storage/hooded/hoodie/yellowtrim + name = "yellow-trimmed hoodie" + desc = "A warm jacket, now featuring a hood and an eye-catching yellow trim!" + icon_state = "hoodie_yellowtrim" diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index 54a988a2b7..d8e7dbd97f 100644 Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/inventory/head/mob_vr.dmi b/icons/inventory/head/mob_vr.dmi index 2c417cdd25..2da016ca45 100644 Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index 806c8a021a..fb17453b3c 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index c97f407958..eb19cb108c 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ