From 94dccff76ce2e2c72ed5f26983fcff17bb830892 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 10 Jul 2021 18:54:51 -0400 Subject: [PATCH] Fix some suit state bugs --- code/game/objects/items.dm | 4 ++-- code/modules/clothing/spacesuits/void/ert_vr.dm | 2 ++ code/modules/clothing/spacesuits/void/void_vr.dm | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8c527334c0..7abfa3ea5f 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -843,9 +843,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. return icon_override //2: species-specific sprite sheets (skipped for inhands) - if(LAZYLEN(sprite_sheets)) + if(LAZYLEN(sprite_sheets) && !inhands) var/sheet = sprite_sheets[body_type] - if(sheet && !inhands) + if(sheet) return sheet //3: slot-specific sprite sheets diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index 330374fbdd..d49e4da8d9 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -8,6 +8,7 @@ siemens_coefficient = 0.5 species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI) //this thing can autoadapt icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' w_class = ITEMSIZE_NORMAL //the mark vii packs itself down when not in use, thanks future-materials breach_threshold = 16 //Extra Thicc resilience = 0.05 //Military Armor @@ -110,6 +111,7 @@ armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) siemens_coefficient = 0.5 icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_AUGMENTED) var/away_planes = null plane_slots = list(slot_head) diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index 4a8050ac44..8e1f9b543f 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -142,7 +142,6 @@ name = "AutoLok pressure suit" desc = "A high-tech snug-fitting pressure suit. Fits any species. It offers very little physical protection, but is equipped with sensors that will automatically deploy the integral helmet to protect the wearer." icon = 'icons/inventory/suit/item_vr.dmi' - icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "autoloksuit" item_state = "autoloksuit" item_state_slots = list(slot_r_hand_str = "space_suit_syndicate", slot_l_hand_str = "space_suit_syndicate") @@ -152,6 +151,7 @@ species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt breach_threshold = 6 //this thing is basically tissue paper w_class = ITEMSIZE_NORMAL //if it's snug, high-tech, and made of relatively soft materials, it should be much easier to store! + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' /obj/item/clothing/suit/space/void/autolok sprite_sheets = list( @@ -226,11 +226,12 @@ /obj/item/clothing/head/helmet/space/void/autolok name = "AutoLok pressure helmet" desc = "A rather close-fitting helmet designed to protect the wearer from hazardous conditions. Automatically deploys when the suit's sensors detect an environment that is hazardous to the wearer." + icon = 'icons/inventory/head/item_vr.dmi' icon_state = "autolokhelmet" item_state = "autolokhelmet" species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX) //this thing can autoadapt too - icon = 'icons/inventory/head/item_vr.dmi' flags_inv = HIDEEARS|BLOCKHAIR //removed HIDEFACE/MASK/EYES flags so sunglasses or facemasks don't disappear. still gotta have BLOCKHAIR or it'll clip out tho. + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' /obj/item/clothing/head/helmet/space/void/autolok sprite_sheets = list(