diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index fe3905957b7..64aeee62873 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -139,10 +139,12 @@ desc = "You are much more prone to colder temperatures than other species, and become uncomfortable much more easier in cold environments." cost = -2 var_changes = list("cold_level_1" = 280, "cold_level_2" = 220, "cold_level_3" = 140, "breath_cold_level_1" = 260, "breath_cold_level_2" = 240, "breath_cold_level_3" = 120, "cold_discomfort_level" = 280) + excludes = list(/datum/trait/coldresist) /datum/trait/hotprone name = "Heat resistant" desc = "You are much more prone to hotter temperatures than other species, and become uncomfortable much more easier in hot environments." cost = -2 - var_changes = list("heat_level_1" = 305, "heat_level_2" = 360, "heat_level_3" = 700, "breath_heat_level_1" = 345, "breath_heat_level_2" = 380, "breath_heat_level_3" = 780, "heat_discomfort_level = 295") + var_changes = list("heat_level_1" = 305, "heat_level_2" = 360, "heat_level_3" = 700, "breath_heat_level_1" = 345, "breath_heat_level_2" = 380, "breath_heat_level_3" = 780, "heat_discomfort_level" = 295) + excludes = list(/datum/trait/hotresist) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index bd786d0e70b..8dcc38a957b 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -130,13 +130,15 @@ desc = "You are able to withstand much colder temperatures than other species, and can even be comfortable in extremely cold environments." cost = 2 var_changes = list("cold_level_1" = 200, "cold_level_2" = 150, "cold_level_3" = 90, "breath_cold_level_1" = 180, "breath_cold_level_2" = 100, "breath_cold_level_3" = 60, "cold_discomfort_level" = 210) + excludes = list(/datum/trait/coldprone) /datum/trait/hotresist name = "Heat resistant" desc = "You are able to withstand much hotter temperatures than other species, and can even be comfortable in extremely hot environments." cost = 2 - var_changes = list("heat_level_1" = 420, "heat_level_2" = 460, "heat_level_3" = 1100, "breath_heat_level_1" = 440, "breath_heat_level_2" = 510, "breath_heat_level_3" = 1500, "heat_discomfort_level = 390") - + var_changes = list("heat_level_1" = 420, "heat_level_2" = 460, "heat_level_3" = 1100, "breath_heat_level_1" = 440, "breath_heat_level_2" = 510, "breath_heat_level_3" = 1500, "heat_discomfort_level" = 390) + excludes = list(/datum/trait/hotprone) + /datum/trait/snowwalker name = "Snow walker" desc = "You are able to move unhindered on snow."