diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index 69ed45a817..8d92641cde 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -1,5 +1,5 @@ -#define WOUND_DAMAGE_EXPONENT 1.3 +#define WOUND_DAMAGE_EXPONENT 1.225 /// an attack must do this much damage after armor in order to roll for being a wound (incremental pressure damage need not apply) #define WOUND_MINIMUM_DAMAGE 5 @@ -31,7 +31,7 @@ #define WOUND_DETERMINATION_LOSS 7.5 /// the max amount of determination you can have -#define WOUND_DETERMINATION_MAX 10 +#define WOUND_DETERMINATION_MAX 10c /// set wound_bonus on an item or attack to this to disable checking wounding for the attack #define CANT_WOUND -100 diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 3335356b7e..128c860a6d 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -193,7 +193,7 @@ severity = WOUND_SEVERITY_MODERATE viable_zones = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) interaction_efficiency_penalty = 1.5 - limp_slowdown = 3 + limp_slowdown = 1.5 threshold_minimum = 45 threshold_penalty = 15 treatable_tool = TOOL_BONESET @@ -294,7 +294,7 @@ severity = WOUND_SEVERITY_SEVERE interaction_efficiency_penalty = 2 - limp_slowdown = 6 + limp_slowdown = 4 threshold_minimum = 70 threshold_penalty = 30 treatable_by = list(/obj/item/stack/sticky_tape/surgical, /obj/item/stack/medical/bone_gel) @@ -314,7 +314,7 @@ severity = WOUND_SEVERITY_CRITICAL interaction_efficiency_penalty = 4 - limp_slowdown = 9 + limp_slowdown = 6 sound_effect = 'sound/effects/wounds/crack2.ogg' threshold_minimum = 125 threshold_penalty = 50 diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 35dc7d0485..5124c5d62e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -175,7 +175,7 @@ Contains: icon_state = "hardsuit0-ert_commander" item_state = "hardsuit0-ert_commander" hardsuit_type = "ert_commander" - armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80. "wound" = 30) + armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80, "wound" = 30) strip_delay = 130 brightness_on = 7 resistance_flags = ACID_PROOF @@ -492,7 +492,7 @@ Contains: icon_state = "syndicate-orange" item_state = "syndicate-orange" slowdown = 2 - armor = list("melee" = 5, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0), "wound" = 5 + armor = list("melee" = 5, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 0, "acid" = 0, "wound" = 5) strip_delay = 65 /obj/item/clothing/suit/space/fragile/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 4546be22d7..c4ded65e9c 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -248,8 +248,8 @@ sharpness = SHARP_EDGED tool_behaviour = TOOL_SAW toolspeed = 1 - wound_bonus = 10 - bare_wound_bonus = 15 + wound_bonus = 5 + bare_wound_bonus = 10 /obj/item/circular_saw/Initialize() . = ..()