salving external wounds can salve internal ones (#8631)

progression pain only triggers on self-progression, otherwise deferring pain to other processes
severity reduction resetting progress now also resets death progress
resetting progress/death progress flags becomes branchless
chems can temporarily stabilize wounds

Author: vode-code

code/__DEFINES/damage_organs.dm

@@ -177,12 +177,20 @@
 #define IWOUND_SPREAD			(1<<3)
 #define IWOUND_HALLUCINATE		(1<<4)
 #define IWOUND_AGGRAVATION      (1<<5)
+#define IWOUND_RECOVER              (1<<6)
+#define IWOUND_STASIS               (1<<7) // disables certain automatic flag changes
 
 #define IWOUND_INSIGNIFICANT_DAMAGE 0.05
 #define IWOUND_LIGHT_DAMAGE 0.1
 #define IWOUND_MEDIUM_DAMAGE 0.25
 #define IWOUND_HEAVY_DAMAGE 0.5
 
+#define WE_SALVE "salve" // salves
+#define WE_BANDAGE "bandage" // bandaging
+
+#define WOUND_STABLE 1
+#define WOUND_RECOVER 2
+
 #define IWOUND_1_MINUTE	30
 #define IWOUND_2_MINUTES 60
 #define IWOUND_3_MINUTES 90

code/modules/organs/external/_external.dm

@@ -705,6 +705,12 @@ This function completely restores a damaged organ to perfect condition.
 	for(var/datum/wound/W in wounds)
 		rval |= !W.salved
 		W.salved = 1
+	if(rval)
+		for(var/obj/item/organ/internal/tofix in internal_organs)
+			for(var/grabthis in tofix.wounddatums)
+				if(istype(tofix.wounddatums[grabthis], /datum/internal_wound))
+					var/datum/internal_wound/patchthis = tofix.wounddatums[grabthis]
+					patchthis.first_aid(list(WE_SALVE))
 	return rval
 
 /obj/item/organ/external/proc/clamp_wounds()

code/modules/organs/internal/_internal.dm

@@ -474,6 +474,7 @@
 	if(IW in wounddatums)
 		var/datum/internal_wound/old_wound = wounddatums[IW]
 		old_wound.progress()	// Getting a new wound of the same type as an existing wound will progress it
+		old_wound.characteristic_flag &= ~(IWOUND_STASIS) // and knock it out of stasis
 	else
 		var/datum/internal_wound/new_wound = new IW()
 		if(wound_name)

code/modules/organs/internal/internal_wounds/_internal_wound.dm

@@ -5,6 +5,8 @@
 	var/list/treatments_item = list()	// list(/obj/item = amount)
 	var/list/treatments_tool = list()	// list(QUALITY_TOOL = FAILCHANCE)
 	var/list/treatments_chem = list()	// list(CE_CHEMEFFECT = strength)
+	var/list/stabilizers_chem = list()	 // like the above, but for stabilizing the wound.
+	var/list/firstaid_type = list()			//list(WE_TREATMENTTYPE = TREATEFFECT)
 	var/datum/internal_wound/scar			// If defined, applies this wound type when successfully treated
 
 	var/diagnosis_stat					// BIO for organic, MEC for robotic
@@ -17,6 +19,8 @@
 	// IWOUND_SPREAD - Allows the wound to spread to another organ
 	// IWOUND_HALLUCINATE - Causes hallucinations
 	// IWOUND_AGGRAVATION - inheritance increases severity gradually if progress IW flag is not present
+	//IWOUND_RECOVER - recovers over time
+	//IWOUND_STASIS - disables certain automatic changes
 	var/characteristic_flag = IWOUND_CAN_DAMAGE|IWOUND_PROGRESS
 
 	var/severity = 0					// How much the wound contributes to internal organ damage
@@ -92,8 +96,10 @@
 	if((!parent || O.status & ORGAN_DEAD) && !(characteristic_flag & IWOUND_PROGRESS_DEATH))
 		return PROCESS_KILL
 
-	// Progress if not in a cryo tube or in stasis
-	if(characteristic_flag & IWOUND_PROGRESS && (H && !(H.bodytemperature < 170 || H.in_stasis)))
+	// Progress if not recovering or in a cryo tube or in stasis
+	if(characteristic_flag & IWOUND_RECOVER)
+		treatment_slow()
+	else if(characteristic_flag & IWOUND_PROGRESS && (H && !(H.bodytemperature < 170 || H.in_stasis)))
 		++current_progression_tick
 		if(current_progression_tick >= progression_threshold)
 			current_progression_tick = 0
@@ -102,6 +108,7 @@
 	if(!H)
 		return
 
+	var/stabilized = characteristic_flag & IWOUND_STASIS
 	// Chemical treatment handling
 	var/list/owner_ce = H.chem_effects
 	for(var/chem_effect in owner_ce)
@@ -110,6 +117,12 @@
 			owner_ce[chem_effect] -= treatment_threshold
 			treatment(FALSE)
 			return
+		if(chem_effect in stabilizers_chem)
+			stabilized = TRUE
+	if(stabilized)
+		characteristic_flag &= ~(IWOUND_PROGRESS|IWOUND_PROGRESS_DEATH) // gotta do this somehow
+	else if(severity < severity_max)
+		characteristic_flag |= (initial(characteristic_flag) & (IWOUND_PROGRESS|IWOUND_PROGRESS_DEATH)) // re-add if not stabilized/stasis
 
 	// Spread once
 	if(characteristic_flag & IWOUND_SPREAD)
@@ -153,10 +166,10 @@
 	var/obj/item/organ/O = parent
 	var/obj/item/organ/external/E = parent ? O.parent : null
 	var/mob/living/carbon/human/H = parent ? O.owner : null
-	if(((characteristic_flag & IWOUND_CAN_DAMAGE) || hal_damage) && H)
-		H.custom_pain("Something inside your [E.name] hurts a lot.", 0)
 	if(severity < severity_max)
 		++severity
+		if(((characteristic_flag & IWOUND_CAN_DAMAGE) || hal_damage) && H)
+			H.custom_pain("Something inside your [E.name] hurts a lot.", 0)
 	else
 		characteristic_flag &= ~(IWOUND_PROGRESS|IWOUND_PROGRESS_DEATH)	// Lets us remove the wound from processing
 		if(next_wound && ispath(next_wound, /datum/internal_wound))
@@ -227,8 +240,7 @@
 	if(severity > 0 && !used_tool)
 		--severity
 		// If it was turned off by reaching the max, turn it on again.
-		if(initial(characteristic_flag) & IWOUND_PROGRESS)
-			characteristic_flag |= IWOUND_PROGRESS
+		characteristic_flag |= (initial(characteristic_flag) & (IWOUND_PROGRESS|IWOUND_PROGRESS_DEATH))
 	else
 		if(!used_autodoc && scar && ispath(scar, /datum/internal_wound))
 			SEND_SIGNAL_OLD(parent, COMSIG_IORGAN_ADD_WOUND, pick(subtypesof(scar)))
@@ -243,6 +255,19 @@
 	if(!QDELING(src) && treatmentamount < amount)
 		treatment_slow(amount - treatmentamount)
 
+/datum/internal_wound/proc/first_aid(list/aideffects = list())
+	parent?.owner.visible_message("aid attempt")
+	for(var/totest in aideffects)
+		if(firstaid_type[totest])
+			switch(firstaid_type[totest])
+				if(WOUND_STABLE)
+					characteristic_flag &= ~(IWOUND_PROGRESS|IWOUND_PROGRESS_DEATH)
+					characteristic_flag |= IWOUND_STASIS
+				if(WOUND_RECOVER)
+					characteristic_flag |= IWOUND_RECOVER
+					break // most potent effect should end the loop
+
+
 /datum/internal_wound/proc/apply_effects()
 	var/obj/item/organ/internal/O = parent
 

code/modules/organs/internal/internal_wounds/organic.dm

@@ -87,7 +87,8 @@
 /datum/internal_wound/organic/burn
 	treatments_item = list(/obj/item/stack/medical/advanced/ointment = 2)
 	treatments_tool = list(QUALITY_CUTTING = FAILCHANCE_NORMAL)
-	treatments_chem = list(CE_STABLE = 1)	// Inaprov will only keep it from killing you
+	firstaid_type = list(WE_SALVE = WOUND_STABLE) //salving won't cure it, but it will stabilize it.
+	stabilizers_chem = list(CE_STABLE = 1)	// Inaprov will only keep it from killing you
 	scar = /datum/internal_wound/organic/necrosis_start
 	severity = 0
 	severity_max = 5
@@ -113,6 +114,8 @@
 
 /datum/internal_wound/organic/necrosis_start
 	treatments_tool = list(QUALITY_CUTTING = FAILCHANCE_NORMAL)
+	firstaid_type = list(CE_STABLE = WOUND_STABLE)
+	stabilizers_chem = list(CE_STABLE, CE_ANTIBIOTIC)
 	severity = 0
 	severity_max = 1
 	next_wound = /datum/internal_wound/organic/necrosis
@@ -251,6 +254,7 @@
 /datum/internal_wound/organic/swelling
 	treatments_tool = list(QUALITY_CUTTING = FAILCHANCE_NORMAL)
 	treatments_chem = list(CE_ANTIBIOTIC = 5) // Spaceacillin
+	firstaid_type = list(WE_SALVE = WOUND_RECOVER)
 	severity = 0
 	severity_max = 3
 	next_wound = /datum/internal_wound/organic/infection