cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-15 18:06:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
Lohikar
2017-10-20 13:30:03 -05:00
parent 5a888996b8 ceb6c8acea
commit 383dd055e7
56 changed files with 355 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/02_settings.dm
+3 -1
View File
@@ -31,7 +31,9 @@
"toggles",
"asfx_togs",
"lastmotd" = "motd_hash",
"lastmemo" = "memo_hash"
"lastmemo" = "memo_hash",
"parallax_toggles" = "parallax_togs",
"parallax_speed"
),
"args" = list("ckey")
)
code/modules/client/preference_setup/loadout/loadout.dm
+1 -1
View File
@@ -64,7 +64,7 @@ var/list/gear_datums = list()
continue
if(G.whitelisted && preference_mob)
for(var/species in G.whitelisted)
if(is_alien_whitelisted(preference_mob, species))
if(is_alien_whitelisted(preference_mob, global.all_species[species]))
. += gear_name
break
else