diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 60523d6c0e8..416aaace5a3 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -188,17 +188,27 @@ icon_state = "hardsuit0-ert_paranormal" item_color = "ert_paranormal" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - sprite_sheets = null actions_types = list() has_camera = FALSE + sprite_sheets = list( + "Grey" = 'icons/mob/species/grey/helmet.dmi', + "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', + "Unathi" = 'icons/mob/species/unathi/helmet.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' + ) /obj/item/clothing/suit/space/hardsuit/ert/paranormal name = "paranormal response team suit" desc = "Powerful wards are built into this hardsuit, protecting the user from all manner of paranormal threats." icon_state = "hardsuit-paranormal" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - sprite_sheets = null helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal + sprite_sheets = list( + "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi' + ) + hide_tail_by_species = list("Unathi, Tajaran, Vulpkanin") /obj/item/clothing/suit/space/hardsuit/ert/paranormal/New() ..() diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 466fb2fc2fd..c085aea93da 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -357,7 +357,6 @@ heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT unacidable = TRUE - sprite_sheets = null /obj/item/clothing/suit/space/hardsuit/syndi/elite name = "elite syndicate hardsuit" @@ -369,7 +368,6 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT unacidable = TRUE - sprite_sheets = null //Strike team hardsuits /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/sst @@ -415,10 +413,6 @@ armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50) heat_protection = HEAD //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - - sprite_sheets = list( - "Grey" = 'icons/mob/species/grey/helmet.dmi' - ) magical = TRUE /obj/item/clothing/suit/space/hardsuit/wizard @@ -433,7 +427,6 @@ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard - sprite_sheets = null magical = TRUE //Medical hardsuit @@ -478,11 +471,10 @@ /obj/item/clothing/head/helmet/space/hardsuit/security/hos name = "head of security's hardsuit helmet" - desc = "a special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." + desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor." icon_state = "hardsuit0-hos" item_color = "hos" armor = list(melee = 45, bullet = 25, laser = 30,energy = 10, bomb = 25, bio = 100, rad = 50) - sprite_sheets = null /obj/item/clothing/suit/space/hardsuit/security/hos name = "head of security's hardsuit" @@ -491,7 +483,7 @@ armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos jetpack = /obj/item/tank/jetpack/suit - sprite_sheets = null + //Singuloth armor /obj/item/clothing/head/helmet/space/hardsuit/singuloth diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 86130ba8008..349a28b5fe3 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -12,6 +12,9 @@ sprite_sheets = list( "Vox" = 'icons/mob/species/vox/helmet.dmi', + "Unathi" = 'icons/mob/species/unathi/head.dmi', + "Tajaran" = 'icons/mob/species/tajaran/head.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi', "Grey" = 'icons/mob/species/grey/head.dmi' ) @@ -33,11 +36,13 @@ strip_delay = 70 put_on_delay = 70 burn_state = FIRE_PROOF - sprite_sheets = list( + "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', "Vox" = 'icons/mob/species/vox/suit.dmi' ) - hide_tail_by_species = list("Vox") + //Standard biosuit, orange stripe /obj/item/clothing/head/bio_hood/general @@ -98,4 +103,9 @@ strip_delay = 40 put_on_delay = 20 - sprite_sheets = null + sprite_sheets = list( + "Tajaran" = 'icons/mob/species/tajaran/suit.dmi', + "Unathi" = 'icons/mob/species/unathi/suit.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', + ) + hide_tail_by_species = list("Unathi, Tajaran, Vulpkanin") \ No newline at end of file diff --git a/icons/mob/species/grey/helmet.dmi b/icons/mob/species/grey/helmet.dmi index b8942e8fd7f..cf244cec6b2 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/tajaran/head.dmi b/icons/mob/species/tajaran/head.dmi new file mode 100644 index 00000000000..84b0ba96ffa Binary files /dev/null and b/icons/mob/species/tajaran/head.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 41e8c84959b..298ff823ea4 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi index d579a1c8384..f189a8d950d 100644 Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index bcc02304de0..6d43df756c7 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ diff --git a/icons/mob/species/unathi/head.dmi b/icons/mob/species/unathi/head.dmi new file mode 100644 index 00000000000..55246ff29e2 Binary files /dev/null and b/icons/mob/species/unathi/head.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index 90dd1190e92..1fc21dd1611 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi index 535bec089f8..2e29c80faf2 100644 Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 3c372768f16..14d1eaaa73a 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/mob/species/vulpkanin/head.dmi b/icons/mob/species/vulpkanin/head.dmi new file mode 100644 index 00000000000..ea0cecb2779 Binary files /dev/null and b/icons/mob/species/vulpkanin/head.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi index add8982a149..4f346411738 100644 Binary files a/icons/mob/species/vulpkanin/helmet.dmi and b/icons/mob/species/vulpkanin/helmet.dmi differ diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/species/vulpkanin/mask.dmi index c839ee98e2d..344adeae617 100644 Binary files a/icons/mob/species/vulpkanin/mask.dmi and b/icons/mob/species/vulpkanin/mask.dmi differ diff --git a/icons/mob/species/vulpkanin/suit.dmi b/icons/mob/species/vulpkanin/suit.dmi index 751ecf7626d..f871c7c5374 100644 Binary files a/icons/mob/species/vulpkanin/suit.dmi and b/icons/mob/species/vulpkanin/suit.dmi differ