diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 0fb03895d8e..4ed17d0b76c 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -17,8 +17,6 @@ var/list/blood_DNA var/blood_color - /// Wont gloves/hands spend blood spill points to make this bloody - var/easy_to_spill_blood = FALSE /// Will the atom spread blood when touched? var/should_spread_blood = FALSE var/pass_flags = 0 @@ -783,7 +781,6 @@ if(fingerprintslast != H.ckey) fingerprintshidden += "\[[all_timestamps()]\] (Wearing gloves). Real name: [H.real_name], Key: [H.key]" fingerprintslast = H.ckey - H.gloves.add_fingerprint(M) return FALSE //More adminstuffz @@ -900,17 +897,11 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/add_blood(list/blood_dna, b_color) return FALSE -/obj/add_blood(list/blood_dna, b_color) - if(isnull(b_color)) - b_color = "#A10808" - blood_color = b_color - return transfer_blood_dna(blood_dna) - /obj/item/add_blood(list/blood_dna, b_color) if(isnull(b_color)) b_color = "#A10808" var/blood_count = !blood_DNA ? 0 : length(blood_DNA) - if(!..()) + if(!transfer_blood_dna(blood_dna)) return FALSE blood_color = b_color // update the blood color if(!blood_count) //apply the blood-splatter overlay if it isn't already in there diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f0eb4e5ac75..199f7c320cb 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -27,7 +27,6 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons can_be_hit = FALSE suicidal_hands = TRUE - easy_to_spill_blood = TRUE /// Sound played when you hit something with the item var/hitsound diff --git a/code/modules/detective_work/detective_work.dm b/code/modules/detective_work/detective_work.dm index 3c034c8c995..4d67d40fb05 100644 --- a/code/modules/detective_work/detective_work.dm +++ b/code/modules/detective_work/detective_work.dm @@ -3,9 +3,7 @@ /atom/proc/add_fibers(mob/living/carbon/human/M) if(M.gloves && isclothing(M.gloves)) var/obj/item/clothing/gloves/G = M.gloves - if(easy_to_spill_blood && G.blood_DNA) - add_blood(G.blood_DNA, G.blood_color) - else if(G.transfer_blood > 1 && add_blood(G.blood_DNA, G.blood_color)) + if(G.transfer_blood > 1 && add_blood(G.blood_DNA, G.blood_color)) G.transfer_blood-- if(blood_DNA && should_spread_blood) @@ -15,9 +13,7 @@ M.update_inv_gloves() else - if(easy_to_spill_blood && M.blood_DNA) - add_blood(M.blood_DNA, M.hand_blood_color) - else if(M.bloody_hands > 1 && add_blood(M.blood_DNA, M.hand_blood_color)) + if(M.bloody_hands > 1 && add_blood(M.blood_DNA, M.hand_blood_color)) M.bloody_hands-- if(blood_DNA && should_spread_blood)