1

SierraBay · Jan 5, 2025 · a025e48 · a025e48
1 parent b510c33
commit a025e48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
@@ -48,10 +48,12 @@
 		return
 
 	// If we have repair capabilities, repair any damage.
-	if(weld_rate && occupant.getBruteLoss())
+	//if(weld_rate && occupant.getBruteLoss()) //SIERRA-REMOVE
+	if(weld_rate) //SIERRA-ADD
 		var/repair = weld_rate - use_power_oneoff(weld_power_use * weld_rate, LOCAL) / weld_power_use
 		occupant.adjustBruteLoss(-repair)
-	if(wire_rate && occupant.getFireLoss())
+	//if(wire_rate && occupant.getFireLoss()) //SIERRA-REMOVE
+	if(wire_rate) //SIERRA-ADD
 		var/repair = wire_rate - use_power_oneoff(wire_power_use * wire_rate, LOCAL) / wire_power_use
 		occupant.adjustFireLoss(-repair)
 

diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -325,8 +325,13 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
 
 		var/brute_was = picked.brute_dam
 		var/burn_was = picked.burn_dam
-
-		picked.heal_damage(brute,burn)
+//[SIERRA-ADD] to heal damaged robotic organs
+		var/organ_type = 0
+		if(picked.status & ORGAN_ROBOTIC)
+			organ_type = 1
+//[/SIERRA-ADD]
+		//picked.heal_damage(brute,burn)//[/SIERRA-REMOVE]
+		picked.heal_damage(brute,burn,0, organ_type)//[/SIERRA-ADD]
 
 		brute -= (brute_was-picked.brute_dam)
 		burn -= (burn_was-picked.burn_dam)