diff --git a/code/game/atoms.dm b/code/game/atoms.dm index bbc7ada992..3bce2bca38 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -414,10 +414,8 @@ blood_splatter_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant - - blood_overlay = image(blood_splatter_icon) - blood_overlay.color = blood_DNA_to_color() - add_overlay(blood_overlay) + blood_splatter_icon.Blend(blood_DNA_to_color(), ICON_MULTIPLY) + add_overlay(blood_splatter_icon) /obj/item/clothing/gloves/add_blood_DNA(list/blood_dna, list/datum/disease/diseases) . = ..() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index ec24863326..1e7e74e4a2 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -111,10 +111,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder! - //Blood overlay things - var/blood_color - var/image/blood_overlay //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite - /obj/item/Initialize() materials = typelist("materials", materials) @@ -545,7 +541,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) if(.) if(blood_splatter_icon) cut_overlay(blood_splatter_icon) - cut_overlay(blood_overlay) /obj/item/clothing/gloves/clean_blood() . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 45c2da8de0..7d8047236a 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -398,7 +398,7 @@ id = "slimeperson" limbs_id = "slime" default_color = "00FFFF" - species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD) + species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR) inherent_traits = list(TRAIT_TOXINLOVER) mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur") default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None") diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index c6d7e3da38..5821cd1cb1 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -38,6 +38,21 @@ if(volume >= 3 && istype(O)) O.add_blood_DNA(data) +/datum/reagent/blood/reaction_turf(turf/T, reac_volume)//splash the blood all over the place + if(!istype(T)) + return + if(reac_volume < 3) + return + + var/obj/effect/decal/cleanable/blood/B = locate() in T //find some blood here + if(!B) + B = new(T) + if(data["blood_DNA"]) + B.blood_DNA[data["blood_DNA"]] = data["blood_type"] + if(!B.reagents) + B.reagents.add_reagent(id, reac_volume) + B.update_icon() + /datum/reagent/blood/on_new(list/data) if(istype(data)) SetViruses(src, data) @@ -102,18 +117,6 @@ var/datum/disease/D = thing . += D -/datum/reagent/blood/reaction_turf(turf/T, reac_volume)//splash the blood all over the place - if(!istype(T)) - return - if(reac_volume < 3) - return - - T.add_blood_DNA(data) - var/obj/effect/decal/cleanable/blood/B = locate() in T //find some blood here - if(!B.reagents) - B.reagents.add_reagent(id, reac_volume) - B.update_icon() - /datum/reagent/blood/synthetics data = list("donor"=null,"viruses"=null,"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null) name = "Synthetic Blood" diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi index b23abd9b2a..5bc30f886c 100644 Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ