From b421878f3f17b5398b2ee86a773d503ab5647b04 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Fri, 9 Apr 2021 01:21:15 +0000 Subject: [PATCH] Fixes Traits --- code/_helpers/global_lists_vr.dm | 9 +++++++++ .../carbon/human/species/station/traits_vr/positive.dm | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index b5b1d82dea..c309d91e96 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -492,8 +492,17 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, var/datum/trait/instance = new path() if(!instance.name) continue //A prototype or something +<<<<<<< HEAD var/cost = instance.cost traits_costs[path] = cost +||||||| parent of 6c7827ade5... Merge pull request #10105 from Novacat/nova-ert + var/category = instance.category + traits_costs[path] = category +======= + var/category = instance.category + var/cost = instance.cost + traits_costs[path] = cost +>>>>>>> 6c7827ade5... Merge pull request #10105 from Novacat/nova-ert all_traits[path] = instance switch(cost) if(-INFINITY to -0.1) 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 407cd327de..f5c1e9cc4d 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 @@ -24,8 +24,16 @@ /datum/trait/hardy_plus name = "Major Hardy" desc = "Allows you to carry heavy equipment with almost no slowdown." +<<<<<<< HEAD cost = 2 var_changes = list("item_slowdown_mod" = 0.1) +||||||| parent of 6c7827ade5... Merge pull request #10105 from Novacat/nova-ert + cost = 3 + var_changes = list("item_slowdown_mod" = 0.25) +======= + cost = 2 + var_changes = list("item_slowdown_mod" = 0.25) +>>>>>>> 6c7827ade5... Merge pull request #10105 from Novacat/nova-ert /datum/trait/endurance_high name = "High Endurance"