From 84b66218813eb43dc46787f653e487f81c244d9f Mon Sep 17 00:00:00 2001 From: Cadyn Date: Sat, 18 Jul 2020 22:46:06 -0700 Subject: [PATCH 1/7] Added more custom species traits for temperature resistance --- .../species/station/traits_vr/negative.dm | 13 ++++++++++++ .../species/station/traits_vr/positive.dm | 20 ++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) 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 402c1928ddd..fe3905957b7 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,3 +133,16 @@ /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 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) + +/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") + \ 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 3a1e50dee67..bd786d0e70b 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 @@ -123,4 +123,22 @@ name = "Traceur" desc = "You're capable of parkour and can *flip over low objects (most of the time)." cost = 2 - var_changes = list("agility" = 90) \ No newline at end of file + 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 = 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) + +/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") + +/datum/trait/snowwalker + name = "Snow walker" + desc = "You are able to move unhindered on snow." + cost = 1 + var_changes = list("snow_movement" = -2) \ No newline at end of file From 161cc4237d42d849d91fab5eaa4e0cad35ef39b6 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Sat, 18 Jul 2020 23:18:13 -0700 Subject: [PATCH 2/7] Fixed a typo and added exclusions in addition to ACTUALLY TESTING IT THIS TIME :) --- .../carbon/human/species/station/traits_vr/negative.dm | 4 +++- .../carbon/human/species/station/traits_vr/positive.dm | 6 ++++-- 2 files changed, 7 insertions(+), 3 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 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." From 473f7a6c99f4da0da48250042d168d8b6c6c9a6c Mon Sep 17 00:00:00 2001 From: Cadyn Date: Sat, 18 Jul 2020 23:22:56 -0700 Subject: [PATCH 3/7] Fixed another silly mistake and a dumb grammar mistake. --- .../carbon/human/species/station/traits_vr/negative.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 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 64aeee62873..ceb9ace7d0e 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 @@ -136,14 +136,14 @@ /datum/trait/coldprone name = "Cold prone" - desc = "You are much more prone to colder temperatures than other species, and become uncomfortable much more easier in cold environments." + desc = "You are much more prone to colder temperatures than other species, and become uncomfortable much more easily 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." + 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 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) From 9ee33fcd85256be30e2007408f8744219c2ecb7b Mon Sep 17 00:00:00 2001 From: Cadyn Date: Sat, 18 Jul 2020 23:51:00 -0700 Subject: [PATCH 4/7] 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 ceb9ace7d0e..526beb241f2 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 8dcc38a957b..084cbdee6c9 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" From 046266f50414910813f6d5cedf49c92406cf261d Mon Sep 17 00:00:00 2001 From: Cadyn Date: Sun, 19 Jul 2020 00:04:59 -0700 Subject: [PATCH 5/7] Quick fix for more dumb typos aaa --- .../living/carbon/human/species/station/traits_vr/negative.dm | 4 ++-- .../living/carbon/human/species/station/traits_vr/positive.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 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 526beb241f2..f60e563bfdc 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,12 +139,12 @@ 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/traits/cold_discomfort, /datum/traits/hot_discomfort) + 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/traits/cold_discomfort, /datum/traits/hot_discomfort) + 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/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 084cbdee6c9..2436cbb8f67 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,14 +130,14 @@ 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/traits/cold_discomfort, /datum/traits/hot_discomfort) + 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/traits/cold_discomfort, /datum/traits/hot_discomfort) + excludes = list(/datum/trait/hotprone, /datum/trait/cold_discomfort, /datum/trait/hot_discomfort) /datum/trait/snowwalker name = "Snow walker" From fac86ebbd5438ff1e086565111ccd1021b02fee4 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Mon, 20 Jul 2020 15:45:09 -0700 Subject: [PATCH 6/7] 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 f60e563bfdc..8b6cfd0b602 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 1cc453a7687..5732858ef8e 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 2436cbb8f67..2c3f9a26948 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." From ca7092c80c71d4ce6109f4c3029b545f39ed3549 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Tue, 21 Jul 2020 14:48:50 -0700 Subject: [PATCH 7/7] Minor grammar changes --- .../carbon/human/species/station/traits_vr/neutral.dm | 6 +++--- .../carbon/human/species/station/traits_vr/positive.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 5732858ef8e..e3403fc754b 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 @@ -20,14 +20,14 @@ excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_down) /datum/trait/coldadapt - name = "Cold adapted" + 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("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) + 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" + 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("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) 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 2c3f9a26948..148f151e591 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 @@ -126,7 +126,7 @@ var_changes = list("agility" = 90) /datum/trait/snowwalker - name = "Snow walker" + name = "Snow Walker" desc = "You are able to move unhindered on snow." cost = 1 var_changes = list("snow_movement" = -2) \ No newline at end of file