From 241723aaa388fe385d74b335cab369648ff91a74 Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Sat, 18 Apr 2026 17:00:37 -0400 Subject: [PATCH] Fixes excludes (#19421) --- .../living/carbon/human/species/station/traits/negative.dm | 4 ++-- .../living/carbon/human/species/station/traits/positive.dm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits/negative.dm index 887a357845c..df191c574a0 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits/negative.dm @@ -159,7 +159,7 @@ activation_message="You feel off balance..." primitive_expression_messages=list("staggers") - excludes = list(/datum/trait/negative/lightweight_light) + excludes = list(/datum/trait/negative/lightweight_light, /datum/trait/positive/heavyweight) /datum/trait/negative/neural_hypersensitivity name = "Neural Hypersensitivity" @@ -732,7 +732,7 @@ desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping if you are unprepared)" cost = -1 var_changes = list("lightweight_light" = 1) - excludes = list(/datum/trait/negative/lightweight) + excludes = list(/datum/trait/negative/lightweight, /datum/trait/positive/heavyweight) custom_only = FALSE /datum/trait/negative/scrawny diff --git a/code/modules/mob/living/carbon/human/species/station/traits/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits/positive.dm index 9331901883e..5b0591a1bd7 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits/positive.dm @@ -648,6 +648,7 @@ desc = "You are more heavyweight or otherwise more sturdy than most species, and as such, more resistant to knockdown effects and stuns. Stuns are only half as effective on you, and neither players nor mobs can trade places with you or bump you out of the way." cost = 2 var_changes = list("stun_mod" = 0.5, "weaken_mod" = 0.5) // Stuns are 50% as effective - a stun of 3 seconds will be 2 seconds due to rounding up. Set to 0.5 to be in-line with the trait's description. (Weaken is used alongside stun to prevent aiming.) + excludes = list(/datum/trait/negative/lightweight_light, /datum/trait/negative/lightweight) /datum/trait/positive/heavyweight/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..()