cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Traits

Browse Source
This commit is contained in:
Chompstation Bot
2021-04-09 01:21:15 +00:00
parent 23af41589b
commit b421878f3f
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/_helpers/global_lists_vr.dm
View File

@@ -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)

8
code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
View File

@@ -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"