Fixes tape instantly falling off bleeding wounds & cleanmedical gauze (#95667)

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
Leland Kemble
2026-04-08 16:45:08 +02:00
committed by GitHub
co-authored by MrMelbert
parent 366448d63c
commit cc0fc61d9e
5 changed files with 17 additions and 17 deletions
+5 -5
View File
@@ -649,7 +649,7 @@
var/obj/item/stack/medical/wrap/current_gauze = LAZYACCESS(limb.applied_items, LIMB_ITEM_GAUZE)
if ((wound_flags & ACCEPTS_GAUZE) && current_gauze)
var/sling_condition = get_gauze_condition()
desc = "[victim.p_Their()] [limb.plaintext_zone] is [sling_condition] fastened in a sling of [current_gauze.name]"
desc = "[victim.p_Their()] [limb.plaintext_zone] is [sling_condition]fastened in a sling of [current_gauze.name]"
else
desc = "[victim.p_Their()] [limb.plaintext_zone] [examine_desc]"
@@ -693,13 +693,13 @@
switch(current_gauze.absorption_capacity)
if(0 to 1.25)
return "just barely"
return "just barely "
if(1.25 to 2.75)
return "loosely"
return "loosely "
if(2.75 to 4)
return "mostly"
return "mostly "
if(4 to INFINITY)
return "tightly"
return "tightly "
/// Spans [desc] based on our severity.
/datum/wound/proc/get_desc_intensity(desc)
+5 -5
View File
@@ -158,15 +158,15 @@
var/bandage_condition
switch(current_gauze.absorption_capacity)
if(0 to 1.25)
bandage_condition = "nearly ruined"
bandage_condition = "nearly ruined "
if(1.25 to 2.75)
bandage_condition = "badly worn"
bandage_condition = "badly worn "
if(2.75 to 4)
bandage_condition = "slightly stained"
bandage_condition = "slightly stained "
if(4 to INFINITY)
bandage_condition = "clean"
bandage_condition = "clean "
condition += " underneath a dressing of [bandage_condition] [current_gauze.name]."
condition += " underneath a dressing of [bandage_condition][current_gauze.name]."
else
switch(infection)
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
+1 -1
View File
@@ -113,7 +113,7 @@
//gauze always reduces blood flow, even for non bleeders
var/obj/item/stack/medical/wrap/current_gauze = LAZYACCESS(limb.applied_items, LIMB_ITEM_GAUZE)
if(current_gauze)
if(current_gauze?.absorption_rate)
var/gauze_power = current_gauze.absorption_rate
limb.seep_gauze(gauze_power * seconds_per_tick)
adjust_blood_flow((-clot_rate * seconds_per_tick) + (-gauze_power * gauzed_clot_rate * seconds_per_tick))
+5 -5
View File
@@ -102,13 +102,13 @@
// how much life we have left in these bandages
switch(current_gauze.absorption_capacity)
if(0 to 1.25)
msg += "nearly ruined"
msg += "nearly ruined "
if(1.25 to 2.75)
msg += "badly worn"
msg += "badly worn "
if(2.75 to 4)
msg += "slightly bloodied"
msg += "slightly bloodied "
if(4 to INFINITY)
msg += "clean"
msg += "clean "
msg += "[current_gauze.name]!"
return "<B>[msg.Join()]</B>"
@@ -158,7 +158,7 @@
adjust_blood_flow(0.25) // old heparin used to just add +2 bleed stacks per tick, this adds 0.5 bleed flow to all open cuts which is probably even stronger as long as you can cut them first
var/obj/item/stack/medical/wrap/current_gauze = LAZYACCESS(limb.applied_items, LIMB_ITEM_GAUZE)
if(current_gauze)
if(current_gauze?.absorption_rate)
var/gauze_power = current_gauze.absorption_rate
limb.seep_gauze(gauze_power * seconds_per_tick)
adjust_blood_flow(-gauze_power * seconds_per_tick)