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

makes traits more paranoid, also removes the double application (#5929)

Browse Source
This commit is contained in:
Poojawa
2018-03-14 17:28:42 -05:00
committed by GitHub
parent 035b3458de
commit 452b58d1a1
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/processing/traits.dm
+7 -5
View File
@@ -26,10 +26,12 @@ PROCESSING_SUBSYSTEM_DEF(traits)
/datum/controller/subsystem/processing/traits/proc/AssignTraits(mob/living/user, client/cli, spawn_effects)
GenerateTraits(cli)
for(var/V in cli.prefs.character_traits)
user.add_trait_datum(V, spawn_effects)
if(user && cli && cli.prefs.character_traits)
for(var/V in cli.prefs.character_traits)
user.add_trait_datum(V, spawn_effects)
/datum/controller/subsystem/processing/traits/proc/GenerateTraits(client/user)
if(user.prefs.character_traits.len)
return
user.prefs.character_traits = user.prefs.all_traits
if(user && user.prefs && user.prefs.character_traits)
if(user.prefs.character_traits.len)
return
user.prefs.character_traits = user.prefs.all_traits