diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 09a6e5f11df4..8be566f41237 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -403,8 +403,10 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) - - sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi') + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood name = "winter hood" @@ -415,8 +417,10 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT flags = BLOCKHAIR flags_inv = HIDEEARS - - sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/pimpcoat name = "expensive coat" @@ -468,9 +472,17 @@ armor = list(MELEE = 15, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 0, ACID = 50) allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) hoodtype = /obj/item/clothing/head/hooded/winterhood/captain + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/captain icon_state = "winterhood_captain" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/security name = "security winter coat" @@ -502,9 +514,17 @@ allowed = list(/obj/item/analyzer, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator,/obj/item/healthanalyzer,/obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 40) hoodtype = /obj/item/clothing/head/hooded/winterhood/medical + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/medical icon_state = "winterhood_med" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/science name = "science winter coat" @@ -514,9 +534,17 @@ allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/applicator,/obj/item/healthanalyzer,/obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 5, RAD = 0, FIRE = 0, ACID = 0) hoodtype = /obj/item/clothing/head/hooded/winterhood/science + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/science icon_state = "winterhood_sci" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/engineering name = "engineering winter coat" @@ -526,18 +554,34 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 20, ACID = 40) allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd) hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/engineering icon_state = "winterhood_engi" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos name = "atmospherics winter coat" icon_state = "wintercoat_atmos" item_state = "coatatmos" hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/atmos + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/engineering/atmos icon_state = "winterhood_atmos" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/hydro name = "hydroponics winter coat" @@ -545,9 +589,17 @@ item_state = "coathydro" allowed = list(/obj/item/reagent_containers/spray, /obj/item/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/hatchet, /obj/item/storage/bag/plants) hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/hydro icon_state = "winterhood_hydro" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/cargo name = "cargo winter coat" @@ -555,9 +607,17 @@ item_state = "coatcargo" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/rcs, /obj/item/clipboard, /obj/item/envelope, /obj/item/storage/bag/mail, /obj/item/mail_scanner) hoodtype = /obj/item/clothing/head/hooded/winterhood/cargo + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/cargo icon_state = "winterhood_cargo" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/suit/hooded/wintercoat/miner name = "mining winter coat" @@ -567,9 +627,17 @@ allowed = list(/obj/item/pickaxe, /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/t_scanner/adv_mining_scanner, /obj/item/storage/bag/ore, /obj/item/gun/energy/kinetic_accelerator) armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) hoodtype = /obj/item/clothing/head/hooded/winterhood/miner + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + ) /obj/item/clothing/head/hooded/winterhood/miner icon_state = "winterhood_miner" + sprite_sheets = list( + "Grey" = 'icons/mob/clothing/species/grey/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + ) /obj/item/clothing/head/hooded/ablative name = "ablative hood" diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 82a5d6894f31..5b86db8ba29e 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index 96f92db3cb90..416f42df899b 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ