last tweaks (#26060)

This commit is contained in:
HMBGERDO
2024-06-27 23:47:56 +02:00
committed by GitHub
parent 7decdecc1f
commit 5ccce78ba0
3 changed files with 3 additions and 17 deletions
+1 -10
View File
@@ -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
-1
View File
@@ -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
@@ -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)