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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01

Browse Source 
# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png
This commit is contained in:
Leshana
2018-02-01 22:21:22 -05:00
parent f5511dc458 a493a379fe
commit 4f98fad36b
123 changed files with 2135 additions and 17043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/unit_tests/map_tests.dm
View File

@@ -39,8 +39,10 @@
exempt_from_atmos += using_map.unit_test_exempt_from_atmos.Copy()
exempt_from_apc += using_map.unit_test_exempt_from_apc.Copy()
var/list/zs_to_test = using_map.unit_test_z_levels || list(1) //Either you set it, or you just get z1
for(var/area/A in world)
if(A.z == 1 && !(A.type in exempt_areas))
if((A.z in zs_to_test) && !(A.type in exempt_areas))
area_test_count++
var/area_good = 1
var/bad_msg = "--------------- [A.name]([A.type])"