diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 1654670e504..9b03a328382 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -405,6 +405,9 @@ var/obj/item/bodypart/cached_limb = limb // remove_wound() nulls limb so we have to track it locally remove_wound(replaced=TRUE) new_wound.apply_wound(cached_limb, old_wound = src, smited = smited, attack_direction = attack_direction, wound_source = wound_source, replacing = TRUE) + if(HAS_TRAIT(src, TRAIT_WOUND_SCANNED) && severity > new_wound.severity) + for(var/trait_source in GET_TRAIT_SOURCES(src, TRAIT_WOUND_SCANNED)) + ADD_TRAIT(new_wound, TRAIT_WOUND_SCANNED, trait_source) . = new_wound qdel(src) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index 28a9286a775..e13fd79e935 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -169,7 +169,7 @@ playsound(user, 'sound/items/handling/surgery/cautery2.ogg', 75, TRUE) - var/bleeding_wording = (!limb.can_bleed() ? "holes" : "bleeding") + var/bleeding_wording = (limb.can_bleed() ? "bleeding" : "holes") user.visible_message(span_green("[user] cauterizes some of the [bleeding_wording] on [victim]."), span_green("You cauterize some of the [bleeding_wording] on [victim].")) victim.apply_damage(2 + severity, BURN, limb, wound_bonus = CANT_WOUND) if(prob(30)) diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 856a54f8631..e0ac7b30ddc 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -276,7 +276,7 @@ playsound(user, 'sound/items/handling/surgery/cautery2.ogg', 75, TRUE) - var/bleeding_wording = (!limb.can_bleed() ? "cuts" : "bleeding") + var/bleeding_wording = (limb.can_bleed() ? "bleeding" : "cuts") user.visible_message(span_green("[user] cauterizes some of the [bleeding_wording] on [victim]."), span_green("You cauterize some of the [bleeding_wording] on [victim].")) victim.apply_damage(2 + severity, BURN, limb, wound_bonus = CANT_WOUND) if(prob(30))