diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index b0670a430c9..96d5969d8ec 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -68,6 +68,8 @@ var/glove_type = /obj/item/clothing/gloves/rig var/cell_type = /obj/item/cell/large/high var/air_type = /obj/item/tank/oxygen + ///What the worn icon state should be when the RIG is offline; not at all suits have one, so it's optional + var/offline_icon = "" //Component/device holders. var/obj/item/tank/air_supply // Air tank, if any. @@ -553,6 +555,10 @@ return 'icons/mob/rig_back.dmi' /obj/item/rig/update_icon(var/update_mob_icon) + if(offline_icon) + item_state = active ? initial(icon_state) : offline_icon + wearer?.update_inv_back() + if(installed_modules.len) for(var/obj/item/rig_module/module in installed_modules) if(module.suit_overlay && !module.suit_overlay_mob_only) diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 79194bf2a19..13fbcaa7346 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -66,6 +66,7 @@ suit_type = "hazard hardsuit" desc = "A Security hardsuit designed for prolonged EVA in dangerous environments." icon_state = "hazard_rig" + offline_icon = "hazard_rig_off" armor = list( melee = 12, bullet = 9, diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 2f91c75995e..5fcfe0dd792 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -30,6 +30,7 @@ suit_type = "industrial hardsuit" desc = "A heavy, powerful rig used by construction crews and mining corporations. The soft plating can protect the wearer from unexpected hazards, but is not reliable in prolonged combat." icon_state = "engineering_rig" + offline_icon = "engineering_rig_off" price_tag = 350 armor = list( melee = 10, @@ -78,6 +79,7 @@ suit_type = "EVA hardsuit" desc = "A light rig for repairs and maintenance to the outside of habitats and vessels." icon_state = "eva_rig" + offline_icon = "eva_rig_off" armor = list( melee = 9, bullet = 3, @@ -238,6 +240,7 @@ Technomancer RIG suit_type = "hazmat hardsuit" desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it." icon_state = "science_rig" + offline_icon = "science_rig_off" spawn_tags = SPAWN_TAG_RIG_HAZMAT rarity_value = 25 price_tag = 350 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c4f581e0b2d..f7631017744 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -309,7 +309,7 @@ accessories += logo logo.has_suit = src loc = src - switch(logo_type) // All of the following names associated with some group of people, thus capitalized + switch(logo_type) // All of the following names associated with some group of people, thus capitalized if("punk_over_valentinos") name = "Valentinos jacket" if("punk_over_samurai") @@ -620,4 +620,4 @@ icon_state = "puffycoatred" item_state = "puffycoatred" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - siemens_coefficient = 0.7 + siemens_coefficient = 0.7 \ No newline at end of file diff --git a/icons/inventory/feet/icon.dmi b/icons/inventory/feet/icon.dmi index a6c7f66f3bb..52bee2f5d9a 100644 Binary files a/icons/inventory/feet/icon.dmi and b/icons/inventory/feet/icon.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index efa7f147871..247fea5deb1 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/hands/icon.dmi b/icons/inventory/hands/icon.dmi index a2c0c188e9f..dce38d79388 100644 Binary files a/icons/inventory/hands/icon.dmi and b/icons/inventory/hands/icon.dmi differ diff --git a/icons/inventory/hands/mob.dmi b/icons/inventory/hands/mob.dmi index 1a45b32ef12..00ee69b8807 100644 Binary files a/icons/inventory/hands/mob.dmi and b/icons/inventory/hands/mob.dmi differ diff --git a/icons/inventory/head/icon.dmi b/icons/inventory/head/icon.dmi index a97d44a4cdd..ef852ab7950 100644 Binary files a/icons/inventory/head/icon.dmi and b/icons/inventory/head/icon.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index b2697fba8fc..e86719f71ab 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/suit/icon.dmi b/icons/inventory/suit/icon.dmi index 0a49cf83036..d08ef5fa376 100644 Binary files a/icons/inventory/suit/icon.dmi and b/icons/inventory/suit/icon.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 262b94c9131..81c30b7fc07 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_fem.dmi b/icons/inventory/suit/mob_fem.dmi index 1812c3971ac..a898ce727c6 100644 Binary files a/icons/inventory/suit/mob_fem.dmi and b/icons/inventory/suit/mob_fem.dmi differ diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index f816787053d..6027b20d8fc 100644 Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi index c3c8e7e8584..e5fc1390ca0 100644 Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ