From 1dfa822cc137ffdb9d47f42b07ff582be072bb0e Mon Sep 17 00:00:00 2001 From: Rykka Date: Wed, 15 Jan 2020 01:04:14 -0700 Subject: [PATCH 1/4] Revert the changes to neutral.dm --- .../carbon/human/species/station/traits_vr/neutral_ch.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm index 13db694c6a..9dcb66c480 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral_ch.dm @@ -1,6 +1,6 @@ /datum/trait/mobegglaying - name = "Egg laying" - desc = "you can lay eggs" + name = "Egg Laying" + desc = "You can lay eggs, much like an avian." cost = 0 /datum/trait/mobegglaying/apply(var/datum/species/S,var/mob/living/carbon/human/H) @@ -9,8 +9,8 @@ /datum/trait/succubus_bite - name = "Succubus bite" - desc = "allows you to inject your prey with your posion" + name = "Succubus Bite" + desc = "Allows you to inject your prey with poison, much like a venemous snake." cost = 0 /datum/trait/succubus_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H) From 054f493f4bf8d754adee4d08476c8bd78bed0904 Mon Sep 17 00:00:00 2001 From: Rykka Date: Wed, 15 Jan 2020 01:06:34 -0700 Subject: [PATCH 2/4] Update to clarify what Cold-Blooded did, renamed to Extreme Cold Pref --- .../living/carbon/human/species/station/traits_vr/neutral.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 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 674d884aaa..5412921b9b 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 @@ -46,8 +46,8 @@ // YW Addition /datum/trait/cold_blood - name = "Cold Blooded" - desc = "Your body relies on the outside temperature to keep warm. Wearing warm clothing such as jackets is commonplace for you." + name = "Extreme Cold Preference" + desc = "You are too cold at the standard 20C. 24C is more suitable. Wearing clothing that covers your legs and torso helps." cost = 0 var_changes = list("cold_discomfort_level" = T0C+24) excludes = list(/datum/trait/hot_discomfort, /datum/trait/cold_discomfort) From 3eed9167ef1a3c4b89472af3be9e127f01546c0d Mon Sep 17 00:00:00 2001 From: Rykka Date: Wed, 15 Jan 2020 01:16:53 -0700 Subject: [PATCH 3/4] Update Trait names and var names to be more clear. --- .../human/species/station/traits_vr/neutral.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 5412921b9b..3b7f386d97 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,12 +19,12 @@ 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-Preference" +/datum/trait/hot-blood + name = "Hot-Blooded" desc = "You are too hot at the standard 20C. 18C is more suitable. Rolling down your jumpsuit or being unclothed helps." cost = 0 var_changes = list("heat_discomfort_level" = T0C+19) - excludes = list(/datum/trait/hot_discomfort, /datum/trait/cold_blood) + excludes = list(/datum/trait/cold_blood, /datum/trait/extreme_cold_blood) // YW Addition /* @@ -37,20 +37,20 @@ */ // YW Addition End -/datum/trait/hot_discomfort - name = "Cold-Preference" +/datum/trait/cold_blood + 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." cost = 0 var_changes = list("cold_discomfort_level" = T0C+21) - excludes = list(/datum/trait/cold_discomfort, /datum/trait/cold_blood) + excludes = list(/datum/trait/hot-blood, /datum/trait/extreme_cold_blood) // YW Addition -/datum/trait/cold_blood - name = "Extreme Cold Preference" +/datum/trait/extreme_cold_blood + name = "Extremely Cold-Blooded" desc = "You are too cold at the standard 20C. 24C is more suitable. Wearing clothing that covers your legs and torso helps." cost = 0 var_changes = list("cold_discomfort_level" = T0C+24) - excludes = list(/datum/trait/hot_discomfort, /datum/trait/cold_discomfort) + excludes = list(/datum/trait/hot-blood, /datum/trait/cold_blood) // YW Addition End /datum/trait/autohiss_unathi From ad7870d9042559a3abca608795c9ad2bc7d010d6 Mon Sep 17 00:00:00 2001 From: Rykka Date: Wed, 15 Jan 2020 01:28:30 -0700 Subject: [PATCH 4/4] Correcting an error in syntax --- .../carbon/human/species/station/traits_vr/neutral.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 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 3b7f386d97..001a65fa8f 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,7 +19,7 @@ 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/hot-blood +/datum/trait/hot_blood name = "Hot-Blooded" desc = "You are too hot at the standard 20C. 18C is more suitable. Rolling down your jumpsuit or being unclothed helps." cost = 0 @@ -42,7 +42,7 @@ desc = "You are too cold at the standard 20C. 22C is more suitable. Wearing clothing that covers your legs and torso helps." cost = 0 var_changes = list("cold_discomfort_level" = T0C+21) - excludes = list(/datum/trait/hot-blood, /datum/trait/extreme_cold_blood) + excludes = list(/datum/trait/hot_blood, /datum/trait/extreme_cold_blood) // YW Addition /datum/trait/extreme_cold_blood @@ -50,7 +50,7 @@ desc = "You are too cold at the standard 20C. 24C is more suitable. Wearing clothing that covers your legs and torso helps." cost = 0 var_changes = list("cold_discomfort_level" = T0C+24) - excludes = list(/datum/trait/hot-blood, /datum/trait/cold_blood) + excludes = list(/datum/trait/hot_blood, /datum/trait/cold_blood) // YW Addition End /datum/trait/autohiss_unathi