From 9ee33fcd85256be30e2007408f8744219c2ecb7b Mon Sep 17 00:00:00 2001 From: Cadyn Date: Sat, 18 Jul 2020 23:51:00 -0700 Subject: [PATCH] hot/cold-blood conflict prevention + points balancing --- .../carbon/human/species/station/traits_vr/negative.dm | 8 ++++---- .../carbon/human/species/station/traits_vr/positive.dm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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 ceb9ace7d0..526beb241f 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 @@ -137,14 +137,14 @@ /datum/trait/coldprone name = "Cold prone" desc = "You are much more prone to colder temperatures than other species, and become uncomfortable much more easily in cold environments." - cost = -2 + cost = -1 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) + excludes = list(/datum/trait/coldresist, /datum/traits/cold_discomfort, /datum/traits/hot_discomfort) /datum/trait/hotprone name = "Heat prone" desc = "You are much more prone to hotter temperatures than other species, and become uncomfortable much more easily in hot environments." - cost = -2 + cost = -1 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) + excludes = list(/datum/trait/hotresist, /datum/traits/cold_discomfort, /datum/traits/hot_discomfort) \ 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 8dcc38a957..084cbdee6c 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 @@ -128,16 +128,16 @@ /datum/trait/coldresist name = "Cold resistant" desc = "You are able to withstand much colder temperatures than other species, and can even be comfortable in extremely cold environments." - cost = 2 + cost = 1 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) + excludes = list(/datum/trait/coldprone, /datum/traits/cold_discomfort, /datum/traits/hot_discomfort) /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 + cost = 1 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) + excludes = list(/datum/trait/hotprone, /datum/traits/cold_discomfort, /datum/traits/hot_discomfort) /datum/trait/snowwalker name = "Snow walker"