diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm index daa4bbd164a..8da5a13f971 100644 --- a/code/datums/components/bloodysoles.dm +++ b/code/datums/components/bloodysoles.dm @@ -271,7 +271,7 @@ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS equipped_slot = ITEM_SLOT_FEET - var/static/mutable_appearance/bloody_feet + var/mutable_appearance/bloody_feet //BUBBER EDIT - ORIGINAL: var/static/mutable_appearance/bloody_feet /// List of DNA on mob's feet, so we can handle it separately from blood on mob's hands var/list/blood_DNA = null @@ -282,17 +282,34 @@ wielder = parent + /*BUBBER EDIT BEGIN - Species specific blood icons. if(!bloody_feet) bloody_feet = mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER) + */ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, PROC_REF(on_step_blood)) RegisterSignals(parent, list(COMSIG_MOB_EQUIPPED_ITEM, COMSIG_MOB_UNEQUIPPED_ITEM), PROC_REF(shoecover)) + // BUBBER ADDITION BEGIN - Species specific blood icons. + RegisterSignal(parent, COMSIG_SPECIES_GAIN, PROC_REF(on_species_change)) + RegisterSignal(parent, COMSIG_SPECIES_LOSS, PROC_REF(on_species_change)) + // BUBBER ADDITION END if(new_blood) blood_DNA = new_blood update_icon() +// BUBBER EDIT ADDITION BEGIN - Species specific blood icons. +/datum/component/bloodysoles/feet/proc/on_species_change(datum/source) + SIGNAL_HANDLER + update_icon() + +/datum/component/bloodysoles/feet/proc/get_blood_appearance() + if(icon_exists('modular_zubbers/icons/effects/blood_species.dmi', "shoeblood_[wielder.dna.species.id]")) + return mutable_appearance('modular_zubbers/icons/effects/blood_species.dmi', "shoeblood_[wielder.dna.species.id]", SHOES_LAYER) + return mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER) +// BUBBER EDIT ADDITION END + /datum/component/bloodysoles/feet/InheritComponent(datum/component/bloodysoles/feet/soles, original, list/new_blood) if (!length(new_blood)) return @@ -316,6 +333,7 @@ wielder.update_worn_shoes() return + bloody_feet = get_blood_appearance() // BUBBER EDIT ADDITION bloody_feet.color = wielder.get_blood_dna_color() wielder.overlays_standing[SHOES_LAYER] = bloody_feet wielder.apply_overlay(SHOES_LAYER) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 33bb5b745e3..16cd5da9d46 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -654,7 +654,14 @@ BLIND // can't see anything if(clothing_flags & LARGE_WORN_ICON) blood_overlay = mutable_appearance('icons/effects/64x64.dmi', "[blood_state]blood_large") else - blood_overlay = mutable_appearance('icons/effects/blood.dmi', "[blood_state]blood") + //BUBBER EDIT BEGIN - Species specific blood icons. + // blood_overlay = mutable_appearance('icons/effects/blood.dmi', "[blood_state]blood") ORIGNAL + var/mob/living/carbon/human/wearer = loc + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/blood_species.dmi', "[blood_state]blood_[wearer.dna.species.id]")) + blood_overlay = mutable_appearance('modular_zubbers/icons/effects/blood_species.dmi', "[blood_state]blood_[wearer.dna.species.id]") + else + blood_overlay = mutable_appearance('icons/effects/blood.dmi', "[blood_state]blood") + //BUBBER EDIT END blood_overlay.color = get_blood_dna_color() diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index 15f299eaacf..81c0c8afae1 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -49,7 +49,14 @@ if(isinhands) return if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves") + //BUBBER EDIT BEGIN - Species specific damage states. + //. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves") //ORIGINAL + var/mob/living/carbon/human/wearer = loc + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedgloves_[wearer.dna.species.id]")) + . += mutable_appearance('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedgloves_[wearer.dna.species.id]") + else + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves") + //BUBBER EDIT END /obj/item/clothing/gloves/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands, icon_file, bodyshape = NONE) . = ..() diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index 081cabf7a85..2cc8da7776b 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -60,7 +60,14 @@ if(isinhands) return if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet") + //BUBBER EDIT BEGIN - Species specific damage states. + //. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet") //ORIGINAL + var/mob/living/carbon/human/wearer = loc + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedhelmet_[wearer.dna.species.id]")) + . += mutable_appearance('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedhelmet_[wearer.dna.species.id]") + else + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet") + //BUBBER EDIT END /obj/item/clothing/head/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands, icon_file, bodyshape = NONE) . = ..() diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index e365abec485..93710d04a9c 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -31,7 +31,14 @@ if(isinhands || !(body_parts_covered & HEAD)) return if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") + //BUBBER EDIT BEGIN - Species specific damage states. + //. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") //ORIGINAL + var/mob/living/carbon/human/wearer = loc + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedmask_[wearer.dna.species.id]")) + . += mutable_appearance('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedmask_[wearer.dna.species.id]") + else + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") + //BUBBER EDIT END /obj/item/clothing/mask/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands, icon_file, bodyshape = NONE) . = ..() diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index f1096272bf1..91f1e219c21 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -13,7 +13,14 @@ if(isinhands || !(body_parts_covered & HEAD)) return if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") + //BUBBER EDIT BEGIN - Species specific damage states. + //. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") //ORIGINAL + var/mob/living/carbon/human/wearer = loc + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedmask_[wearer.dna.species.id]")) + . += mutable_appearance('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedmask_[wearer.dna.species.id]") + else + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask") + //BUBBER EDIT END /obj/item/clothing/neck/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands, icon_file, bodyshape = NONE) . = ..() diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 474ee102bd5..54c7354fd64 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -72,7 +72,14 @@ if(isinhands) return if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe") + //BUBBER EDIT BEGIN - Species specific damage states. + //. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe") //ORIGINAL + var/mob/living/carbon/human/wearer = loc + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedshoe_[wearer.dna.species.id]")) + . += mutable_appearance('modular_zubbers/icons/effects/item_damage_species.dmi', "damagedshoe_[wearer.dna.species.id]") + else + . += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe") + //BUBBER EDIT END /obj/item/clothing/shoes/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands = FALSE, icon_file, bodyshape = NONE) . = ..() diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 254c45d8b5d..4e57043c311 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -23,20 +23,20 @@ if(isinhands) return - if(damaged_clothes) - //SKYRAT EDIT CHANGE BEGIN - //. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") //ORIGINAL - var/damagefile2use = (bodyshape & STYLE_TAUR_ALL) ? 'modular_skyrat/master_files/icons/mob/64x32_item_damage.dmi' : 'icons/effects/item_damage.dmi' - . += mutable_appearance(damagefile2use, "damaged[blood_overlay_type]") - //SKYRAT EDIT CHANGE END - if(GET_ATOM_BLOOD_DNA_LENGTH(src)) - //SKYRAT EDIT CHANGE BEGIN - //. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood") //ORIGINAL - var/bloodfile2use = (bodyshape & STYLE_TAUR_ALL) ? 'modular_skyrat/master_files/icons/mob/64x32_blood.dmi' : 'icons/effects/blood.dmi' - . += mutable_appearance(bloodfile2use, "[blood_overlay_type]blood") - //SKYRAT EDIT CHANGE END - + //BUBBER EDIT BEGIN - Species specific damage states. var/mob/living/carbon/human/wearer = loc + if(damaged_clothes) + //. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]") //ORIGINAL + //todo: the taur icon doesn't exist anymore. Needs replacement. + var/icon/damage_icon_file = (bodyshape & STYLE_TAUR_ALL) ? 'modular_skyrat/master_files/icons/mob/64x32_item_damage.dmi' : 'icons/effects/item_damage.dmi' + var/damage_icon_state = "damaged[blood_overlay_type]" + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/item_damage_species.dmi', "damaged[blood_overlay_type]_[wearer.dna.species.id]")) + damage_icon_file = 'modular_zubbers/icons/effects/item_damage_species.dmi' + damage_icon_state = "damaged[blood_overlay_type]_[wearer.dna.species.id]" + + . += mutable_appearance(damage_icon_file, damage_icon_state) + //BUBBER EDIT END + if(!ishuman(wearer) || !wearer.w_uniform) return var/obj/item/clothing/under/undershirt = wearer.w_uniform diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 174a7ce034c..9bf60c9a7f0 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -112,7 +112,14 @@ if(isinhands) return if(damaged_clothes) - . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") + //BUBBER EDIT BEGIN + //. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") //ORIGINAL + var/mob/living/carbon/human/wearer = loc + if(ishuman(wearer) && icon_exists('modular_zubbers/icons/effects/item_damage_species.dmi', "damageduniform_[wearer.dna.species.id]")) + . += mutable_appearance('modular_zubbers/icons/effects/item_damage_species.dmi', "damageduniform_[wearer.dna.species.id]") + else + . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") + //BUBBER EDIT END . += get_accessory_overlays() /obj/item/clothing/under/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands = FALSE, icon_file, bodyshape = NONE) diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 7a0b23796e2..56a892332dc 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -302,11 +302,11 @@ if(!iter_part.dmg_overlay_type) continue if(isnull(damage_overlay) && (iter_part.brutestate || iter_part.burnstate)) - damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "blank", -DAMAGE_LAYER, appearance_flags = KEEP_TOGETHER) + damage_overlay = mutable_appearance('modular_zubbers/icons/mob/effects/dam_mob.dmi', "blank", -DAMAGE_LAYER, appearance_flags = KEEP_TOGETHER) //BUBBER EDIT: Extra species damage icons. Original: 'icons/mob/effects/dam_mob.dmi' if(iter_part.brutestate) - var/mutable_appearance/blood_damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "[iter_part.dmg_overlay_type]_[iter_part.body_zone]_[iter_part.brutestate]0", appearance_flags = RESET_COLOR) //we're adding icon_states of the base image as overlays + var/mutable_appearance/blood_damage_overlay = mutable_appearance('modular_zubbers/icons/mob/effects/dam_mob.dmi', "[iter_part.dmg_overlay_type]_[iter_part.body_zone]_[iter_part.brutestate]0", appearance_flags = RESET_COLOR) //we're adding icon_states of the base image as overlays //BUBBER EDIT: Extra species damage icons. Original: 'icons/mob/effects/dam_mob.dmi' blood_damage_overlay.color = get_bloodtype()?.get_damage_color(src) - var/mutable_appearance/brute_damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "[iter_part.dmg_overlay_type]_[iter_part.body_zone]_[iter_part.brutestate]0_overlay", appearance_flags = RESET_COLOR) + var/mutable_appearance/brute_damage_overlay = mutable_appearance('modular_zubbers/icons/mob/effects/dam_mob.dmi', "[iter_part.dmg_overlay_type]_[iter_part.body_zone]_[iter_part.brutestate]0_overlay", appearance_flags = RESET_COLOR) //BUBBER EDIT: Extra species damage icons. Original: 'icons/mob/effects/dam_mob.dmi' blood_damage_overlay.overlays += brute_damage_overlay damage_overlay.add_overlay(blood_damage_overlay) if(iter_part.burnstate) @@ -330,10 +330,23 @@ var/mutable_appearance/wound_overlay for(var/obj/item/bodypart/iter_part as anything in get_bodyparts()) if(iter_part.bleed_overlay_icon) + /*BUBBER EDIT BEGIN - Species specific bleed overlay icons. var/mutable_appearance/blood_overlay = mutable_appearance('icons/mob/effects/bleed_overlays.dmi', "blank", -WOUND_LAYER, appearance_flags = KEEP_TOGETHER) blood_overlay.color = blood_type.get_wound_color(src) wound_overlay ||= blood_overlay wound_overlay.add_overlay(iter_part.bleed_overlay_icon) + */ + var/icon/bleed_overlay_icon_file = 'icons/mob/effects/bleed_overlays.dmi' + var/bleed_overlay_icon_state = iter_part.bleed_overlay_icon + if(ishuman(src) && icon_exists('modular_zubbers/icons/mob/effects/bleed_overlays_species.dmi', "[iter_part.bleed_overlay_icon]_[src.dna.species.id]")) + bleed_overlay_icon_file = 'modular_zubbers/icons/mob/effects/bleed_overlays_species.dmi' + bleed_overlay_icon_state = "[iter_part.bleed_overlay_icon]_[src.dna.species.id]" + + var/mutable_appearance/blood_overlay = mutable_appearance(bleed_overlay_icon_file, "blank", -WOUND_LAYER, appearance_flags = KEEP_TOGETHER) + blood_overlay.color = blood_type.get_wound_color(src) + wound_overlay ||= blood_overlay + wound_overlay.add_overlay(mutable_appearance(bleed_overlay_icon_file, bleed_overlay_icon_state)) + //BUBBER EDIT END if(isnull(wound_overlay)) return diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 87a02d4ec87..8d1d526daa0 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -1364,14 +1364,14 @@ if(dropped && dmg_overlay_type) if(brutestate) // divided into two overlays: one that gets colored and one that doesn't. - var/image/brute_blood_overlay = image('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, dir = SOUTH) + var/image/brute_blood_overlay = image('modular_zubbers/icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, dir = SOUTH) //BUBBER EDIT: Extra species damage icons. Original: 'icons/mob/effects/dam_mob.dmi' brute_blood_overlay.color = get_color_from_blood_list(blood_dna_info) - var/mutable_appearance/brute_damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0_overlay", -DAMAGE_LAYER, appearance_flags = RESET_COLOR) + var/mutable_appearance/brute_damage_overlay = mutable_appearance('modular_zubbers/icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0_overlay", -DAMAGE_LAYER, appearance_flags = RESET_COLOR) //BUBBER EDIT: Extra species damage icons. Original: 'icons/mob/effects/dam_mob.dmi' if(brute_damage_overlay) brute_blood_overlay.overlays += brute_damage_overlay . += brute_blood_overlay if(burnstate) - . += image('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, dir = SOUTH) + . += image('modular_zubbers/icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, dir = SOUTH) //BUBBER EDIT: Extra species damage icons. Original: 'icons/mob/effects/dam_mob.dmi' if(is_husked) . += huskify_image(thing_to_husk = limb) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_obsessed.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_obsessed.png index b3466f068ec..2375c45ff3d 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_obsessed.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_obsessed.png differ diff --git a/icons/mob/effects/bleed_overlays.dmi b/icons/mob/effects/bleed_overlays.dmi index f376eb05f03..d3b334a6b39 100644 Binary files a/icons/mob/effects/bleed_overlays.dmi and b/icons/mob/effects/bleed_overlays.dmi differ diff --git a/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm index d651f8921d0..c1ab41e1970 100644 --- a/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/teshari_bodyparts.dm @@ -8,6 +8,7 @@ icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER head_flags = HEAD_EYESPRITES|HEAD_EYECOLOR|HEAD_EYEHOLES|HEAD_DEBRAIN|HEAD_HAIR @@ -36,6 +37,7 @@ icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER @@ -77,26 +79,27 @@ icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI unarmed_damage_low = TESHARI_PUNCH_LOW unarmed_damage_high = TESHARI_PUNCH_HIGH brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER - /obj/item/bodypart/arm/right/mutant/teshari icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI unarmed_damage_low = TESHARI_PUNCH_LOW unarmed_damage_high = TESHARI_PUNCH_HIGH brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER - /obj/item/bodypart/leg/left/mutant/teshari icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI digitigrade_type = /obj/item/bodypart/leg/left/digitigrade/teshari brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER @@ -105,6 +108,7 @@ icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI digitigrade_type = /obj/item/bodypart/leg/right/digitigrade/teshari brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER @@ -113,6 +117,7 @@ icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM base_limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER @@ -120,6 +125,7 @@ icon_greyscale = BODYPART_ICON_TESHARI bodyshape = parent_type::bodyshape | BODYSHAPE_CUSTOM base_limb_id = SPECIES_TESHARI + dmg_overlay_type = SPECIES_TESHARI brute_modifier = TESHARI_BRUTE_MODIFIER burn_modifier = TESHARI_BURN_MODIFIER diff --git a/modular_zubbers/icons/effects/blood_species.dmi b/modular_zubbers/icons/effects/blood_species.dmi new file mode 100644 index 00000000000..71b1aba632c Binary files /dev/null and b/modular_zubbers/icons/effects/blood_species.dmi differ diff --git a/modular_zubbers/icons/effects/item_damage_species.dmi b/modular_zubbers/icons/effects/item_damage_species.dmi new file mode 100644 index 00000000000..bbe4550ce74 Binary files /dev/null and b/modular_zubbers/icons/effects/item_damage_species.dmi differ diff --git a/modular_zubbers/icons/mob/effects/bleed_overlays_species.dmi b/modular_zubbers/icons/mob/effects/bleed_overlays_species.dmi new file mode 100644 index 00000000000..e44ba2a16cd Binary files /dev/null and b/modular_zubbers/icons/mob/effects/bleed_overlays_species.dmi differ diff --git a/modular_zubbers/icons/mob/effects/dam_mob.dmi b/modular_zubbers/icons/mob/effects/dam_mob.dmi new file mode 100644 index 00000000000..0b8a0d22c80 Binary files /dev/null and b/modular_zubbers/icons/mob/effects/dam_mob.dmi differ