From c69d43a3ed3741d21a9d7f687cd6db09ac3f3138 Mon Sep 17 00:00:00 2001 From: Cadyn Date: Sat, 28 Nov 2020 20:22:50 -0800 Subject: [PATCH] Fix broken ass trait bullshit --- .../species/station/traits_vr/positive_ch.dm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm index 7b273a297c..09117b09be 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm @@ -7,7 +7,7 @@ /datum/trait/densebones name = "Dense bones" desc = "Your bones (or robotic limbs) are more dense or stronger then what is considered normal. It is much harder to fracture your bones, yet pain from fractures is much more intense." - cost = 2 + cost = 3 excludes = list(/datum/trait/hollow) /datum/trait/densebones/apply(var/datum/species/S,var/mob/living/carbon/human/H) @@ -108,6 +108,22 @@ special_env = TRUE excludes = list(/datum/trait/slipperydirt) +/datum/trait/endurance_high + cost = 3 + excludes = list(/datum/trait/brute_resist, /datum/trait/minor_brute_resist, /datum/trait/minor_burn_resist, /datum/trait/burn_resist) + +/datum/trait/brute_resist + excludes = list(/datum/trait/minor_brute_resist, /datum/trait/burn_resist, /datum/trait/endurance_high) + +/datum/trait/minor_brute_resist + excludes = list(/datum/trait/brute_resist, /datum/trait/endurance_high) + +/datum/trait/burn_resist + excludes = list(/datum/trait/minor_burn_resist, /datum/trait/brute_resist, /datum/trait/endurance_high) + +/datum/trait/minor_burn_resist + excludes = list(/datum/trait/burn_resist, /datum/trait/endurance_high) + /datum/trait/absorbent/handle_environment_special(var/mob/living/carbon/human/H) var/turf/T = get_turf(H) if(istype(T))