Combat hotfixes (#8260)

* gunmod dmg fixes * Lethality reduction This also makes combo fire + brute deadlier * Revert "Lethality reduction" This reverts commit 8d8d9c4. * lethality nerf * Update code/modules/organs/internal/_internal.dm
discordia-space · Aug 25, 2023 · d6d37e5 · d6d37e5
1 parent ecdc275
commit d6d37e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/code/datums/craft/gun_parts.dm b/code/datums/craft/gun_parts.dm
@@ -403,7 +403,7 @@ semi accepts weird caliber - +1 points
 			if(2)
 				damage_name = pick("exceptional", "flawless", "superb")
 		name = damage_name + " " + initial(name)
-	I.weapon_upgrades[GUN_UPGRADE_DAMAGEMOD_PLUS] = damage_bonus - old_quality / 20
+	I.weapon_upgrades[GUN_UPGRADE_DAMAGEMOD_PLUS] = damage_bonus + old_quality / 20
 
 /obj/item/part/gun/modular/mechanism/pistol
 	name = "pistol mechanism"
@@ -602,7 +602,7 @@ semi accepts weird caliber - +1 points
 			if(2)
 				damage_name = pick("exceptional", "flawless", "superb")
 		name = damage_name + " " + initial(name)
-	I.weapon_upgrades[GUN_UPGRADE_DAMAGEMOD_PLUS] = 1 - old_quality / 20
+	I.weapon_upgrades[GUN_UPGRADE_DAMAGEMOD_PLUS] = old_quality / 20
 
 /obj/item/part/gun/modular/barrel/pistol
 	name = ".35 barrel"

diff --git a/code/modules/organs/internal/_internal.dm b/code/modules/organs/internal/_internal.dm
@@ -101,7 +101,7 @@
 	if(!damage_type || status & ORGAN_DEAD)
 		return FALSE
 
-	var/wound_count = max(0, round(amount / 4))	// At base values, every 8 points of damage is 1 wound
+	var/wound_count = max(0, round(amount / (damage_type == BRUTE || damage_type == BURN ? 4 : 8)))	// At base values, every 8 points of damage is 1 wound, or 4 if brute or burn.
 
 	if(!wound_count)
 		return FALSE