From 2ce142ead532214115b557b57676e2d3a3ce8c57 Mon Sep 17 00:00:00 2001 From: Cerebulon Date: Tue, 23 Jan 2018 18:03:27 +0000 Subject: [PATCH] Fixes air tank and similar item sprites in suit storage slot for Teshari. (#4608) Overlooked in last air tank fix PR. Suit storage sprites can now be defined per-species if the need arises for anything as weird as Tesh. That method seemed neater than a bit of unique code just for Teshari in the base update_icons code. --- .../mob/living/carbon/human/species/species.dm | 1 + .../carbon/human/species/station/seromi.dm | 1 + .../mob/living/carbon/human/update_icons.dm | 2 +- icons/mob/species/seromi/belt_mirror.dmi | Bin 0 -> 4291 bytes 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 icons/mob/species/seromi/belt_mirror.dmi diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index d38ac45d31e..41746137659 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -15,6 +15,7 @@ var/speech_bubble_appearance = "normal" // Part of icon_state to use for speech bubbles when talking. See talk.dmi for available icons. var/fire_icon_state = "humanoid" // The icon_state used inside OnFire.dmi for when on fire. + var/suit_storage_icon = 'icons/mob/belt_mirror.dmi' // Icons used for worn items in suit storage slot. // Damage overlay and masks. var/damage_overlays = 'icons/mob/human_races/masks/dam_human.dmi' diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm index c84b9ad64fa..17305be9e86 100644 --- a/code/modules/mob/living/carbon/human/species/station/seromi.dm +++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm @@ -33,6 +33,7 @@ damage_overlays = 'icons/mob/human_races/masks/dam_seromi.dmi' damage_mask = 'icons/mob/human_races/masks/dam_mask_seromi.dmi' blood_mask = 'icons/mob/human_races/masks/blood_seromi.dmi' + suit_storage_icon = 'icons/mob/species/seromi/belt_mirror.dmi' fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying. diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 340b49e94f2..db3bde87578 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -875,7 +875,7 @@ var/global/list/damage_icon_parts = list() if(s_store) var/t_state = s_store.item_state if(!t_state) t_state = s_store.icon_state - overlays_standing[SUIT_STORE_LAYER] = image("icon" = 'icons/mob/belt_mirror.dmi', "icon_state" = "[t_state]") + overlays_standing[SUIT_STORE_LAYER] = image("icon" = species.suit_storage_icon, "icon_state" = "[t_state]") s_store.screen_loc = ui_sstore1 //TODO else overlays_standing[SUIT_STORE_LAYER] = null diff --git a/icons/mob/species/seromi/belt_mirror.dmi b/icons/mob/species/seromi/belt_mirror.dmi new file mode 100644 index 0000000000000000000000000000000000000000..c7a8411c6a83008661d79293d8fbeba8ac37822b GIT binary patch literal 4291 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 literal 0 HcmV?d00001