diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm index dfa221084bc..cd5bc0a40cc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm @@ -119,7 +119,7 @@ new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/watertank/atmos(src) - new /obj/item/clothing/suit/fire/atmos(src) + new /obj/item/clothing/suit/fire/firefighter/atmos(src) new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/rpd(src) diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 62dda694baf..40ba093a9f3 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -90,9 +90,11 @@ /obj/item/clothing/head/hardhat/atmos name = "atmospheric technician's firefighting helmet" desc = "A firefighter's helmet, able to keep the user cool in any situation." + icon = 'icons/obj/clothing/head/utility.dmi' + icon_override = 'icons/mob/clothing/head/utility.dmi' icon_state = "hardhat0_atmos" - item_state = "hardhat0_atmos" item_color = "atmos" + item_state = 'icons/mob/clothing/head/utility.dmi' flags = STOPSPRESSUREDMAGE flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE heat_protection = HEAD @@ -101,6 +103,11 @@ min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT dog_fashion = null sprite_sheets = list( - "Grey" = 'icons/mob/clothing/species/grey/helmet.dmi', - "Vox" = 'icons/mob/clothing/species/vox/head.dmi' - ) + "Vox" = 'icons/mob/clothing/species/vox/head/utility.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/head/utility.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/head/utility.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head/utility.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head/utility.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/utility.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/utility.dmi' + ) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 19abb245f1b..e5eff27c9b7 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -32,32 +32,27 @@ resistance_flags = FIRE_PROOF /obj/item/clothing/suit/fire/firefighter - icon_state = "firesuit" + icon = 'icons/obj/clothing/suits/utility.dmi' + icon_override = 'icons/mob/clothing/suits/utility.dmi' + icon_state = "firefighter" item_state = "firefighter" - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' - ) + "Tajaran" = 'icons/mob/clothing/species/tajaran/suits/utility.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suits/utility.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suits/utility.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi' + ) -/obj/item/clothing/suit/fire/heavy - name = "firesuit" - desc = "A suit that protects against extreme fire and heat." - //icon_state = "thermal" - item_state = "ro_suit" - w_class = WEIGHT_CLASS_BULKY - slowdown = 1.5 - -/obj/item/clothing/suit/fire/atmos +/obj/item/clothing/suit/fire/firefighter/atmos name = "firesuit" desc = "An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame." - icon_state = "atmos_firesuit" - item_state = "firesuit_atmos" + icon_state = "firefighter_atmos" + item_state = "firefighter_atmos" max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' - ) - /* * Bomb protection */ @@ -124,7 +119,10 @@ */ /obj/item/clothing/head/radiation name = "radiation hood" - icon_state = "rad" + icon = 'icons/obj/clothing/head/utility.dmi' + icon_state = "radhood" + item_state = 'icons/mob/clothing/head/utility.dmi' + icon_override = 'icons/mob/clothing/head/utility.dmi' desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" flags = BLOCKHAIR|THICKMATERIAL flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH @@ -134,16 +132,22 @@ resistance_flags = NONE flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/head.dmi', - "Grey" = 'icons/mob/clothing/species/grey/head.dmi', - "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/helmet.dmi' - ) + "Vox" = 'icons/mob/clothing/species/vox/head/utility.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/head/utility.dmi', + "Tajaran" = 'icons/mob/clothing/species/tajaran/head/utility.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head/utility.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head/utility.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/utility.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/head/utility.dmi' + ) /obj/item/clothing/suit/radiation name = "radiation suit" desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation." - icon_state = "rad" - item_state = "rad_suit" + icon = 'icons/obj/clothing/suits/utility.dmi' + icon_override = 'icons/mob/clothing/suits/utility.dmi' + icon_state = "radsuit" + item_state = "radsuit" w_class = WEIGHT_CLASS_BULKY gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 @@ -158,5 +162,11 @@ resistance_flags = NONE flags_2 = RAD_PROTECT_CONTENTS_2 sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' - ) + "Tajaran" = 'icons/mob/clothing/species/tajaran/suits/utility.dmi', + "Unathi" = 'icons/mob/clothing/species/unathi/suits/utility.dmi', + "Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suits/utility.dmi', + "Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi' + ) diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index edbeea6e025..0d669c5831c 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index fc2dad935e8..1ad1058c260 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/head/utility.dmi b/icons/mob/clothing/head/utility.dmi new file mode 100644 index 00000000000..5f50af7c55e Binary files /dev/null and b/icons/mob/clothing/head/utility.dmi differ diff --git a/icons/mob/clothing/species/drask/head/utility.dmi b/icons/mob/clothing/species/drask/head/utility.dmi new file mode 100644 index 00000000000..c3826efd92b Binary files /dev/null and b/icons/mob/clothing/species/drask/head/utility.dmi differ diff --git a/icons/mob/clothing/species/drask/shoes.dmi b/icons/mob/clothing/species/drask/shoes.dmi index 3866f5e5a3f..56f04e27d67 100644 Binary files a/icons/mob/clothing/species/drask/shoes.dmi and b/icons/mob/clothing/species/drask/shoes.dmi differ diff --git a/icons/mob/clothing/species/drask/suits/utility.dmi b/icons/mob/clothing/species/drask/suits/utility.dmi index c89f6c7d5cc..a4ade6172a0 100644 Binary files a/icons/mob/clothing/species/drask/suits/utility.dmi and b/icons/mob/clothing/species/drask/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/grey/head/utility.dmi b/icons/mob/clothing/species/grey/head/utility.dmi new file mode 100644 index 00000000000..9d7ce8e2712 Binary files /dev/null and b/icons/mob/clothing/species/grey/head/utility.dmi differ diff --git a/icons/mob/clothing/species/grey/suits/utility.dmi b/icons/mob/clothing/species/grey/suits/utility.dmi index 54092c7bb0d..314c21b5efd 100644 Binary files a/icons/mob/clothing/species/grey/suits/utility.dmi and b/icons/mob/clothing/species/grey/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/utility.dmi b/icons/mob/clothing/species/kidan/head/utility.dmi new file mode 100644 index 00000000000..ef02100bb79 Binary files /dev/null and b/icons/mob/clothing/species/kidan/head/utility.dmi differ diff --git a/icons/mob/clothing/species/kidan/suits/utility.dmi b/icons/mob/clothing/species/kidan/suits/utility.dmi index ea4ed6f8561..a3b278bae09 100644 Binary files a/icons/mob/clothing/species/kidan/suits/utility.dmi and b/icons/mob/clothing/species/kidan/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/tajaran/head/utility.dmi b/icons/mob/clothing/species/tajaran/head/utility.dmi new file mode 100644 index 00000000000..9acda551ea7 Binary files /dev/null and b/icons/mob/clothing/species/tajaran/head/utility.dmi differ diff --git a/icons/mob/clothing/species/tajaran/suits/utility.dmi b/icons/mob/clothing/species/tajaran/suits/utility.dmi new file mode 100644 index 00000000000..d0a47460a56 Binary files /dev/null and b/icons/mob/clothing/species/tajaran/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/unathi/head/utility.dmi b/icons/mob/clothing/species/unathi/head/utility.dmi new file mode 100644 index 00000000000..94893fd960d Binary files /dev/null and b/icons/mob/clothing/species/unathi/head/utility.dmi differ diff --git a/icons/mob/clothing/species/unathi/suits/utility.dmi b/icons/mob/clothing/species/unathi/suits/utility.dmi new file mode 100644 index 00000000000..385c5a436af Binary files /dev/null and b/icons/mob/clothing/species/unathi/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/vox/head/utility.dmi b/icons/mob/clothing/species/vox/head/utility.dmi new file mode 100644 index 00000000000..1b36080aeab Binary files /dev/null and b/icons/mob/clothing/species/vox/head/utility.dmi differ diff --git a/icons/mob/clothing/species/vox/shoes.dmi b/icons/mob/clothing/species/vox/shoes.dmi index 6a7e1f4b65d..927ce1c6a5c 100644 Binary files a/icons/mob/clothing/species/vox/shoes.dmi and b/icons/mob/clothing/species/vox/shoes.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 6579bff670d..f0c217b777f 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/utility.dmi b/icons/mob/clothing/species/vox/suits/utility.dmi index 1a6201cb027..623f76fabea 100644 Binary files a/icons/mob/clothing/species/vox/suits/utility.dmi and b/icons/mob/clothing/species/vox/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/head/utility.dmi b/icons/mob/clothing/species/vulpkanin/head/utility.dmi new file mode 100644 index 00000000000..86f68303e63 Binary files /dev/null and b/icons/mob/clothing/species/vulpkanin/head/utility.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/suits/utility.dmi b/icons/mob/clothing/species/vulpkanin/suits/utility.dmi new file mode 100644 index 00000000000..e43302c4d3b Binary files /dev/null and b/icons/mob/clothing/species/vulpkanin/suits/utility.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index a892cb58a88..b72165ac3c7 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi index 5987ed6404e..c8d77fa5307 100644 Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi index 12e92193908..4b1908d9376 100644 Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index e86b7cecfeb..1d228c3e05b 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 533b6d5db48..7b15e3ba1f9 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/head/utility.dmi b/icons/obj/clothing/head/utility.dmi new file mode 100644 index 00000000000..87ac7263472 Binary files /dev/null and b/icons/obj/clothing/head/utility.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index ac1d8dc2ac3..660e72439eb 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 28812a7544e..c6c9e1caa29 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi index 68472663cef..ae087bdf190 100644 Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ