Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_transition_runtime_fix

This commit is contained in:
Crazylemon64
2016-08-23 13:41:39 -07:00
75 changed files with 1412 additions and 871 deletions
@@ -38,7 +38,7 @@
var/list/default_map_traits = MAP_TRANSITION_CONFIG
/proc/check_level_trait(z, trait)
if(z == 0)
if(!z)
return 0 // If you're nowhere, you have no traits
var/list/trait_list
if(space_manager.initialized)