cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scanned wounds stay scanned when healing (#96174)

Browse Source
This commit is contained in:
Leland Kemble
2026-05-25 20:54:20 -04:00
committed by GitHub
parent 4ed20b2458
commit f761462047
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wounds/_wounds.dm
+3
View File
@@ -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)
code/datums/wounds/pierce.dm
+1 -1
View File
@@ -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))
code/datums/wounds/slash.dm
+1 -1
View File
@@ -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))