diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index a5af129ca4f..723bee03e32 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -1,28 +1,34 @@ -//Biosuit complete with shoes (in the item sprite) +//Basic biosuit, white and yellow /obj/item/clothing/head/bio_hood name = "bio hood" - icon_state = "bio" desc = "A hood that protects the head and face from biological contaminants." + icon = 'icons/obj/clothing/head/bio.dmi' + icon_state = "bio" + item_state = 'icons/mob/clothing/head/bio.dmi' + icon_override = 'icons/mob/clothing/head/bio.dmi' permeability_coefficient = 0.01 flags = BLOCKHAIR | THICKMATERIAL flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 200, FIRE = 20, ACID = INFINITY) flags_inv = HIDEMASK|HIDEEARS|HIDEEYES resistance_flags = ACID_PROOF - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/helmet.dmi', - "Unathi" = 'icons/mob/clothing/species/unathi/head.dmi', - "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi', - "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi', - "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + "Vox" = 'icons/mob/clothing/species/vox/head/bio.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/head/bio.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/head/bio.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head/bio.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head/bio.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/bio.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/bio.dmi' ) /obj/item/clothing/suit/bio_suit name = "bio suit" desc = "A suit that protects against biological contamination." + icon = 'icons/obj/clothing/suits/bio.dmi' icon_state = "bio" - item_state = "bio_suit" + item_state = 'icons/mob/clothing/suits/bio.dmi' + icon_override = 'icons/mob/clothing/suits/bio.dmi' w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 @@ -36,14 +42,17 @@ put_on_delay = 70 resistance_flags = ACID_PROOF sprite_sheets = list( - "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + "Tajaran" = 'icons/mob/clothing/species/tajaran/suits/bio.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suits/bio.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suits/bio.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suits/bio.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suits/bio.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suits/bio.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suits/bio.dmi' ) -//Standard biosuit, orange stripe +//Medical biosuit, white with blue /obj/item/clothing/head/bio_hood/general icon_state = "bio_general" @@ -51,7 +60,7 @@ icon_state = "bio_general" -//Virology biosuit, green stripe +//Virology biosuit, white with green /obj/item/clothing/head/bio_hood/virology icon_state = "bio_virology" @@ -59,7 +68,7 @@ icon_state = "bio_virology" -//Security biosuit, grey with red stripe across the chest +//Security biosuit, white with red and a vest /obj/item/clothing/head/bio_hood/security armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 200, FIRE = 20, ACID = INFINITY) icon_state = "bio_security" @@ -69,7 +78,7 @@ icon_state = "bio_security" -//Janitor's biosuit, grey with purple arms +//Janitor's biosuit, grey with purple /obj/item/clothing/head/bio_hood/janitor icon_state = "bio_janitor" @@ -77,7 +86,7 @@ icon_state = "bio_janitor" -//Scientist's biosuit, white with a pink-ish hue +//Scientist's biosuit, white with purple /obj/item/clothing/head/bio_hood/scientist icon_state = "bio_scientist" @@ -85,7 +94,7 @@ icon_state = "bio_scientist" -//CMO's biosuit, blue stripe +//CMO's biosuit, blue with white /obj/item/clothing/suit/bio_suit/cmo icon_state = "bio_cmo" @@ -102,9 +111,4 @@ strip_delay = 40 put_on_delay = 20 - sprite_sheets = list( - "Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi', - "Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi', - "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi', - ) hide_tail_by_species = list("Unathi", "Tajaran", "Vulpkanin") diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 9c743a9e373..78100d015d6 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -845,14 +845,14 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) if(head) var/mutable_appearance/standing - if(head.icon_override) - standing = mutable_appearance(head.icon_override, "[head.icon_state]", layer = -HEAD_LAYER) - else if(head.sprite_sheets && head.sprite_sheets[dna.species.sprite_sheet_name]) + if(head.sprite_sheets && head.sprite_sheets[dna.species.sprite_sheet_name]) standing = mutable_appearance(head.sprite_sheets[dna.species.sprite_sheet_name], "[head.icon_state]", layer = -HEAD_LAYER) if(istype(head, /obj/item/clothing/head/helmet/space/plasmaman)) var/obj/item/clothing/head/helmet/space/plasmaman/P = head if(!P.up) standing.overlays += P.visor_icon + else if(head.icon_override) + standing = mutable_appearance(head.icon_override, "[head.icon_state]", layer = -HEAD_LAYER) else standing = mutable_appearance('icons/mob/clothing/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER) @@ -905,10 +905,10 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) client.screen += wear_suit //Either way, add the item to the HUD var/mutable_appearance/standing - if(wear_suit.icon_override) - standing = mutable_appearance(wear_suit.icon_override, "[wear_suit.icon_state]", layer = -SUIT_LAYER) - else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.sprite_sheet_name]) + if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.sprite_sheet_name]) standing = mutable_appearance(wear_suit.sprite_sheets[dna.species.sprite_sheet_name], "[wear_suit.icon_state]", layer = -SUIT_LAYER) + else if(wear_suit.icon_override) + standing = mutable_appearance(wear_suit.icon_override, "[wear_suit.icon_state]", layer = -SUIT_LAYER) else standing = mutable_appearance('icons/mob/clothing/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER) diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index c8c13afe615..1698773b6e1 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/head/bio.dmi b/icons/mob/clothing/head/bio.dmi new file mode 100644 index 00000000000..bdd8e128fa5 Binary files /dev/null and b/icons/mob/clothing/head/bio.dmi differ diff --git a/icons/mob/clothing/species/drask/head/bio.dmi b/icons/mob/clothing/species/drask/head/bio.dmi new file mode 100644 index 00000000000..efb4d2dba9f Binary files /dev/null and b/icons/mob/clothing/species/drask/head/bio.dmi differ diff --git a/icons/mob/clothing/species/drask/suits/bio.dmi b/icons/mob/clothing/species/drask/suits/bio.dmi new file mode 100644 index 00000000000..31ffe68c205 Binary files /dev/null and b/icons/mob/clothing/species/drask/suits/bio.dmi differ diff --git a/icons/mob/clothing/species/grey/head/bio.dmi b/icons/mob/clothing/species/grey/head/bio.dmi new file mode 100644 index 00000000000..ee388a72f26 Binary files /dev/null and b/icons/mob/clothing/species/grey/head/bio.dmi differ diff --git a/icons/mob/clothing/species/grey/suits/bio.dmi b/icons/mob/clothing/species/grey/suits/bio.dmi new file mode 100644 index 00000000000..caa5c4645f8 Binary files /dev/null and b/icons/mob/clothing/species/grey/suits/bio.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/bio.dmi b/icons/mob/clothing/species/kidan/head/bio.dmi new file mode 100644 index 00000000000..97a8a78a0e7 Binary files /dev/null and b/icons/mob/clothing/species/kidan/head/bio.dmi differ diff --git a/icons/mob/clothing/species/kidan/suits/bio.dmi b/icons/mob/clothing/species/kidan/suits/bio.dmi new file mode 100644 index 00000000000..fa1f3e1da0f Binary files /dev/null and b/icons/mob/clothing/species/kidan/suits/bio.dmi differ diff --git a/icons/mob/clothing/species/tajaran/head.dmi b/icons/mob/clothing/species/tajaran/head.dmi index 7837a3009f9..74eed5427c6 100644 Binary files a/icons/mob/clothing/species/tajaran/head.dmi and b/icons/mob/clothing/species/tajaran/head.dmi differ diff --git a/icons/mob/clothing/species/tajaran/head/bio.dmi b/icons/mob/clothing/species/tajaran/head/bio.dmi new file mode 100644 index 00000000000..da25ce6beba Binary files /dev/null and b/icons/mob/clothing/species/tajaran/head/bio.dmi differ diff --git a/icons/mob/clothing/species/tajaran/suit.dmi b/icons/mob/clothing/species/tajaran/suit.dmi index d9a9352d29c..fbf27e8b0b4 100644 Binary files a/icons/mob/clothing/species/tajaran/suit.dmi and b/icons/mob/clothing/species/tajaran/suit.dmi differ diff --git a/icons/mob/clothing/species/tajaran/suits/bio.dmi b/icons/mob/clothing/species/tajaran/suits/bio.dmi new file mode 100644 index 00000000000..2353d2364e8 Binary files /dev/null and b/icons/mob/clothing/species/tajaran/suits/bio.dmi differ diff --git a/icons/mob/clothing/species/unathi/head.dmi b/icons/mob/clothing/species/unathi/head.dmi index 0c5e1884f10..0d3f32d007f 100644 Binary files a/icons/mob/clothing/species/unathi/head.dmi and b/icons/mob/clothing/species/unathi/head.dmi differ diff --git a/icons/mob/clothing/species/unathi/head/bio.dmi b/icons/mob/clothing/species/unathi/head/bio.dmi new file mode 100644 index 00000000000..28ea5c7c9c2 Binary files /dev/null and b/icons/mob/clothing/species/unathi/head/bio.dmi differ diff --git a/icons/mob/clothing/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi index 59c8faa766a..3e29ac07b8f 100644 Binary files a/icons/mob/clothing/species/unathi/suit.dmi and b/icons/mob/clothing/species/unathi/suit.dmi differ diff --git a/icons/mob/clothing/species/unathi/suits/bio.dmi b/icons/mob/clothing/species/unathi/suits/bio.dmi new file mode 100644 index 00000000000..0cf598d206b Binary files /dev/null and b/icons/mob/clothing/species/unathi/suits/bio.dmi differ diff --git a/icons/mob/clothing/species/vox/head/bio.dmi b/icons/mob/clothing/species/vox/head/bio.dmi new file mode 100644 index 00000000000..df00de1e367 Binary files /dev/null and b/icons/mob/clothing/species/vox/head/bio.dmi differ diff --git a/icons/mob/clothing/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi index 47e6adb7b52..0455dc22667 100644 Binary files a/icons/mob/clothing/species/vox/helmet.dmi and b/icons/mob/clothing/species/vox/helmet.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index e3a62a2c190..70f6748d3f0 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/suits/bio.dmi b/icons/mob/clothing/species/vox/suits/bio.dmi new file mode 100644 index 00000000000..35d9c400a8d Binary files /dev/null and b/icons/mob/clothing/species/vox/suits/bio.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/head.dmi b/icons/mob/clothing/species/vulpkanin/head.dmi index 140ef199b34..6bbea18640c 100644 Binary files a/icons/mob/clothing/species/vulpkanin/head.dmi and b/icons/mob/clothing/species/vulpkanin/head.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/head/bio.dmi b/icons/mob/clothing/species/vulpkanin/head/bio.dmi new file mode 100644 index 00000000000..86e4127039d Binary files /dev/null and b/icons/mob/clothing/species/vulpkanin/head/bio.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/suit.dmi b/icons/mob/clothing/species/vulpkanin/suit.dmi index f03f0627393..89304b769e5 100644 Binary files a/icons/mob/clothing/species/vulpkanin/suit.dmi and b/icons/mob/clothing/species/vulpkanin/suit.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/suits/bio.dmi b/icons/mob/clothing/species/vulpkanin/suits/bio.dmi new file mode 100644 index 00000000000..f1b1903cbbb Binary files /dev/null and b/icons/mob/clothing/species/vulpkanin/suits/bio.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index a0c8e148e31..2d4bec4c9c6 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/bio.dmi b/icons/mob/clothing/suits/bio.dmi new file mode 100644 index 00000000000..c72eec1c792 Binary files /dev/null and b/icons/mob/clothing/suits/bio.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 2a3aa32d723..0a63130372e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/head/bio.dmi b/icons/obj/clothing/head/bio.dmi new file mode 100644 index 00000000000..21855d49be1 Binary files /dev/null and b/icons/obj/clothing/head/bio.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 71c13db926a..e229ed6a2ff 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/bio.dmi b/icons/obj/clothing/suits/bio.dmi new file mode 100644 index 00000000000..a1ea57e56c8 Binary files /dev/null and b/icons/obj/clothing/suits/bio.dmi differ