diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm index cc911db7c8..442e9eefea 100644 --- a/code/modules/clothing/head/hood_vr.dm +++ b/code/modules/clothing/head/hood_vr.dm @@ -32,9 +32,28 @@ /obj/item/clothing/head/hood/winter/talon name = "Talon winter hood" desc = "A cozy winter hood attached to a heavy winter jacket." - icon_override = 'icons/inventory/head/mob_vr.dmi' + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "winterhood_talon" +// Centcom Winter Hood +/obj/item/clothing/head/hood/winter/centcom + name = "centcom winter hood" + desc = "A cozy winter hood attached to a heavy winter jacket." + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "winterhood_centcom" + armor = list(melee = 40, bullet = 45, laser = 45, energy = 35, bomb = 40, bio = 25, rad = 25, fire = 35, acid = 50) + +// SAR Winter Hood +/obj/item/clothing/head/hood/winter/medical/sar + name = "search and rescue winter hood" + desc = "A cozy winter hood attached to a heavy winter jacket." + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "winterhood_sar" + armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5) + //Food costumes // Hotdog suit hood /obj/item/clothing/head/hood_vr/hotdog_hood @@ -52,4 +71,8 @@ icon = 'icons/inventory/head/mob_vr.dmi' icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "turnip_hood" - flags_inv = HIDEEARS|BLOCKHAIR \ No newline at end of file + flags_inv = HIDEEARS|BLOCKHAIR + +/obj/item/clothing/head/hood/winter + sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi', + SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi') diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index fb6ab3f64b..0921d3b07b 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -207,7 +207,7 @@ desc = "A heavy winter jacket. A white star of life is emblazoned on the back, with the words search and rescue written underneath." icon_state = "coatsar" armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5) - hoodtype = /obj/item/clothing/head/hood/winter/medical + hoodtype = /obj/item/clothing/head/hood/winter/medical/sar //VOREStation edit: sar winter hood allowed = list (/obj/item/weapon/gun, /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/device/analyzer, /obj/item/stack/medical, /obj/item/weapon/dnainjector, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/hypospray, diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index d6f1465f45..f2e1fc1f4d 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -74,7 +74,7 @@ name = "Talon winter coat" desc = "A cozy winter coat, covered in thick fur and baring the colors of ITV Talon." icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' 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 @@ -145,3 +145,17 @@ name = "yellow-trimmed hoodie" desc = "A warm jacket, now featuring a hood and an eye-catching yellow trim!" icon_state = "hoodie_yellowtrim" + +// CC Winter Coat +/obj/item/clothing/suit/storage/hooded/wintercoat/centcom + name = "centcom winter coat" + desc = "A cozy winter coat, covered in green fur and the colors of CentCom. Armored for extra protection." + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "coatcentcom" + armor = list(melee = 40, bullet = 45, laser = 45, energy = 35, bomb = 40, bio = 25, rad = 25, fire = 35, acid = 50) //there is no cc armor here to base it off so, here's the values from the original cc coat + hoodtype = /obj/item/clothing/head/hood/winter/centcom + +/obj/item/clothing/suit/storage/hooded/wintercoat + sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi', + SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi') diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index d8e7dbd97f..7f0bda20ba 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 52e3a4121f..00b0686e30 100644 Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ diff --git a/icons/inventory/head/mob_vr_teshari.dmi b/icons/inventory/head/mob_vr_teshari.dmi index 7616f26095..35b3192053 100644 Binary files a/icons/inventory/head/mob_vr_teshari.dmi and b/icons/inventory/head/mob_vr_teshari.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index 8743a62765..52f5e50e15 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr_teshari.dmi b/icons/inventory/suit/mob_vr_teshari.dmi index 04ea0d2e7c..80f67332cb 100644 Binary files a/icons/inventory/suit/mob_vr_teshari.dmi and b/icons/inventory/suit/mob_vr_teshari.dmi differ