Merge pull request #14469 from Seris02/teshbranch

All the tesh winter coats
This commit is contained in:
Heroman3003
2023-02-10 19:15:12 +10:00
committed by CHOMPStation2
parent f81a4f1bd1
commit 0a07539d01
8 changed files with 41 additions and 4 deletions

View File

@@ -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
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')

View File

@@ -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,

View File

@@ -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')