some fixes (#16494)

* some fixes

* module deselect

* .

* .

* .

* .
This commit is contained in:
Kashargul
2024-10-20 12:10:52 +02:00
committed by GitHub
parent 7be625e0cb
commit 40f956a414
7 changed files with 27 additions and 9 deletions
+3 -1
View File
@@ -650,8 +650,10 @@ var/list/global/slot_flags_enumeration = list(
return
//if we haven't made our blood_overlay already
if( !blood_overlay )
if(!blood_overlay)
generate_blood_overlay()
else
overlays.Remove(blood_overlay)
//Make the blood_overlay have the proper color then apply it.
blood_overlay.color = blood_color
@@ -75,7 +75,7 @@
var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
var/OX = M.getOxyLoss() > 50 ? span_bold("[M.getOxyLoss()]") : M.getOxyLoss()
var/TX = M.getToxLoss() > 50 ? span_bold("[M.getToxLoss()]") : M.getToxLoss()
var/BU = M.getFireLoss() > 50 ? span_bold("M.getFireLoss()]") : M.getFireLoss()
var/BU = M.getFireLoss() > 50 ? span_bold("[M.getFireLoss()]") : M.getFireLoss()
var/BR = M.getBruteLoss() > 50 ? span_bold("[M.getBruteLoss()]") : M.getBruteLoss()
var/analyzed_results = ""
if(M.status_flags & FAKEDEATH)
+15 -2
View File
@@ -559,9 +559,22 @@
return
busy = 0
user.clean_blood()
if(ishuman(user))
user:update_inv_gloves()
var/mob/living/carbon/human/H = user
H.gunshot_residue = null
if(H.gloves)
H.gloves.clean_blood()
H.update_inv_gloves()
H.gloves.germ_level = 0
else
if(H.r_hand)
H.r_hand.clean_blood()
if(H.l_hand)
H.l_hand.clean_blood()
H.bloody_hands = 0
H.germ_level = 0
else
user.clean_blood()
for(var/mob/V in viewers(src, null))
V.show_message(span_notice("[user] washes their hands using \the [src]."))