diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index ae694f8edf2..4ca71d73969 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -11,12 +11,15 @@ flags_inv = 0 actions_types = list(/datum/action/item_action/toggle_helmet_light) burn_state = FIRE_PROOF + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/head/hardhat/attack_self(mob/user) on = !on icon_state = "hardhat[on]_[item_color]" item_state = "hardhat[on]_[item_color]" - if(on) set_light(brightness_on) else diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index dc8c4b59a4d..5335e8b2d38 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -79,6 +79,10 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/head/snowman name = "snowman head" @@ -88,6 +92,10 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/head/that name = "sturdy top-hat" @@ -246,6 +254,10 @@ icon_state = "chickenhead" item_state = "chickensuit" flags = BLOCKHAIR + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/head/corgi name = "corgi suit head" @@ -396,6 +408,10 @@ item_state = "griffinhat" flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) actions_types = list(/datum/action/item_action/caw) /obj/item/clothing/head/griffin/attack_self() @@ -425,6 +441,10 @@ icon_state = "papersack" flags = BLOCKHAIR flags_inv = HIDEFACE|HIDEEARS + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/head/papersack/smiley name = "paper sack hat" @@ -432,6 +452,10 @@ icon_state = "papersack_smile" flags = BLOCKHAIR flags_inv = HIDEFACE|HIDEEARS + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/head/crown name = "crown" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index ab42d17e469..81d9ed04958 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -131,6 +131,10 @@ flags_inv = HIDEEARS cold_protection = HEAD min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/head/ushanka/attack_self(mob/user as mob) if(src.icon_state == "ushankadown") @@ -154,6 +158,10 @@ flags = BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) brightness_on = 2 //luminosity when on @@ -221,6 +229,11 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH species_disguise = "High-tech robot" + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/head.dmi' + ) + /obj/item/clothing/head/cardborg/equipped(mob/living/user, slot) ..() diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index cfb5a39ef4c..cea34e4c7d9 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -301,8 +301,10 @@ var/voicechange = 0 var/temporaryname = " the Horse" var/originalname = "" - - + species_fit = list("Grey") + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/mask.dmi' + ) /obj/item/clothing/mask/horsehead/equipped(mob/user, slot) if(flags & NODROP) //cursed masks only diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 532522747ed..2e34835f82e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -165,10 +165,9 @@ desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space." armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) species_restricted = list("exclude", "Diona", "Wryn") - species_fit = list("Vox", "Grey" , "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin") + species_fit = list("Vox", "Skrell" , "Tajaran" , "Drask" , "Unathi" , "Vulpkanin") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/suit.dmi', - "Grey" = 'icons/mob/species/grey/suit.dmi', "Skrell" = 'icons/mob/species/skrell/suit.dmi', "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', "Drask" = 'icons/mob/species/drask/suit.dmi', diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 7880dcc1dd3..0c85db3d533 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -9,10 +9,11 @@ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES burn_state = FIRE_PROOF - species_fit = list("Vox") + species_fit = list("Vox", "Grey") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi' - ) + "Vox" = 'icons/mob/species/vox/helmet.dmi', + "Grey" = 'icons/mob/species/grey/head.dmi' + ) /obj/item/clothing/suit/bio_suit name = "bio suit" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index e0b444afcd0..7f1ebfc101a 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -77,7 +77,8 @@ burn_state = FIRE_PROOF species_fit = list("Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/helmet.dmi' + "Vox" = 'icons/mob/species/vox/helmet.dmi', + "Grey" = 'icons/mob/species/grey/head.dmi' ) /obj/item/clothing/suit/bomb_suit @@ -130,7 +131,8 @@ burn_state = FIRE_PROOF species_fit = list("Vox") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/species/vox/head.dmi', + "Grey" = 'icons/mob/species/grey/head.dmi' ) /obj/item/clothing/suit/radiation diff --git a/icons/mob/species/grey/eyes.dmi b/icons/mob/species/grey/eyes.dmi index 2a1d7c1cd35..8c732aa782d 100644 Binary files a/icons/mob/species/grey/eyes.dmi and b/icons/mob/species/grey/eyes.dmi differ diff --git a/icons/mob/species/grey/head.dmi b/icons/mob/species/grey/head.dmi new file mode 100644 index 00000000000..5f0a6d25ced Binary files /dev/null and b/icons/mob/species/grey/head.dmi differ diff --git a/icons/mob/species/grey/helmet.dmi b/icons/mob/species/grey/helmet.dmi index ba1d4f860da..b81d6617e17 100644 Binary files a/icons/mob/species/grey/helmet.dmi and b/icons/mob/species/grey/helmet.dmi differ diff --git a/icons/mob/species/grey/mask.dmi b/icons/mob/species/grey/mask.dmi index d47fd4e7232..1225b1e68ad 100644 Binary files a/icons/mob/species/grey/mask.dmi and b/icons/mob/species/grey/mask.dmi differ diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/species/grey/uniform.dmi index cdaf6b25cf5..9416a10fb59 100644 Binary files a/icons/mob/species/grey/uniform.dmi and b/icons/mob/species/grey/uniform.dmi differ