From fac86ebbd5438ff1e086565111ccd1021b02fee4 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Mon, 20 Jul 2020 15:45:09 -0700 Subject: [PATCH] Combined opposite resistance and prone traits into nuetral adaptation traits and removed blooded traits. --- .../species/station/traits_vr/negative.dm | 14 ------------ .../species/station/traits_vr/neutral.dm | 22 +++++++++---------- .../species/station/traits_vr/positive.dm | 14 ------------ 3 files changed, 11 insertions(+), 39 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 f60e563bfd..8b6cfd0b60 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 @@ -133,18 +133,4 @@ /datum/trait/colorblind/para_taj/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.add_modifier(/datum/modifier/trait/colorblind_taj) - -/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 = -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, /datum/trait/cold_discomfort, /datum/trait/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 = -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, /datum/trait/cold_discomfort, /datum/trait/hot_discomfort) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 1cc453a768..5732858ef8 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -19,19 +19,19 @@ var_changes = list("metabolic_rate" = 1.4, "hunger_factor" = 0.4, "metabolism" = 0.012) // +40% rate and 8x hunger (Double Teshari) excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_down) -/datum/trait/cold_discomfort - name = "Hot-Blooded" - desc = "You are too hot at the standard 20C. 18C is more suitable. Rolling down your jumpsuit or being unclothed helps." +/datum/trait/coldadapt + name = "Cold adapted" + desc = "You are able to withstand much colder temperatures than other species, and can even be comfortable in extremely cold environments. You are also more vulnerable to hot environments as a consequence of these adaptations." cost = 0 - var_changes = list("heat_discomfort_level" = T0C+19) - excludes = list(/datum/trait/hot_discomfort) - -/datum/trait/hot_discomfort - name = "Cold-Blooded" - desc = "You are too cold at the standard 20C. 22C is more suitable. Wearing clothing that covers your legs and torso helps." + 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, "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/hotadapt) + +/datum/trait/hotadapt + name = "Heat adapted" + desc = "You are able to withstand much hotter temperatures than other species, and can even be comfortable in extremely hot environments. You are also more vulnerable to cold environments as a consequence of these adaptations." cost = 0 - var_changes = list("cold_discomfort_level" = T0C+21) - excludes = list(/datum/trait/cold_discomfort) + 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, "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/coldadapt) /datum/trait/autohiss_unathi name = "Autohiss (Unathi)" 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 2436cbb8f6..2c3f9a2694 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 @@ -125,20 +125,6 @@ cost = 2 var_changes = list("agility" = 90) -/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 = 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, /datum/trait/cold_discomfort, /datum/trait/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 = 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, /datum/trait/cold_discomfort, /datum/trait/hot_discomfort) - /datum/trait/snowwalker name = "Snow walker" desc = "You are able to move unhindered on snow."