shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

swift item action skills fix. (#12324)

Browse Source 
* Update _skill_holder.dm

* Update _skill_holder.dm

* Update _skill_holder.dm
This commit is contained in:
Ghom
2020-05-21 19:09:54 +02:00
committed by GitHub
parent 3430f0130d
commit e3922400a1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/skills/_skill_holder.dm
+6 -4
View File
@@ -154,15 +154,17 @@
. = value
var/sum = 0
var/divisor = 0
var/one_trait = istext(traits)
var/one_bad_trait = istext(bad_traits)
for(var/k in I.used_skills)
var/datum/skill/S = GLOB.skill_datums[k]
if(!S)
continue
var/our_traits = S.skill_traits
var/item_traits = I.used_skills[k]
if(item_traits)
our_traits |= item_traits
if((traits && !(our_traits[traits] || length(our_traits & traits))) || (bad_traits && (our_traits[bad_traits] || length(our_traits & bad_traits))))
our_traits |= I.used_skills[k]
if(traits && !(one_trait ? (traits in our_traits) : length(our_traits & traits)))
continue
if(bad_traits && (one_bad_trait ? (bad_traits in our_traits) : length(our_traits & bad_traits)))
continue
var/mod = S.base_multiplier
switch(S.progression_type)