From f27f770c30b396d7f2fda35777339df9b0cca859 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Wed, 21 Oct 2020 13:37:18 -0400 Subject: [PATCH] Fix being able to select synth-blacklisted traits --- code/modules/client/preference_setup/vore/07_traits.dm | 2 +- .../living/carbon/human/species/station/traits_vr/positive.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index e653166b7a..cde40bce1d 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -264,7 +264,7 @@ if(pref.dirty_synth && instance.not_for_synths)//if you are a synth you can't take this trait. alert("You cannot take this trait as a SYNTH.\ Please remove that trait, or pick another trait to add.","Error") - pref.dirty_synth = 0 //Just to be sure + //pref.dirty_synth = 0 //Just to be sure // Commented out CHOMP Edit return TOPIC_REFRESH 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 d4e4b11d5c..0bf4336701 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 @@ -247,7 +247,7 @@ 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, "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) - not_for_synths = 1 + not_for_synths = 1 // CHOMP edit /datum/trait/hotadapt name = "Heat-Adapted" @@ -255,7 +255,7 @@ 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, "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) - not_for_synths = 1 + not_for_synths = 1 // CHOMP edit // YW Addition end /datum/trait/snowwalker