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

# 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

code/_helpers/mobs.dm

@@ -248,3 +248,19 @@ Proc for attack log creation, because really why not
 
 	if (progbar)
 		qdel(progbar)
+
+/atom/proc/living_mobs(var/range = world.view)
+	var/list/viewers = oviewers(src,range)
+	var/list/living = list()
+	for(var/mob/living/L in viewers)
+		living += L
+
+	return living
+
+/atom/proc/human_mobs(var/range = world.view)
+	var/list/viewers = oviewers(src,range)
+	var/list/humans = list()
+	for(var/mob/living/carbon/human/H in viewers)
+		humans += H
+
+	return humans

code/_helpers/mobs_vr.dm

@@ -1,7 +0,0 @@
-/atom/proc/living_mobs(var/range = world.view)
-	var/list/viewers = oviewers(src,range)
-	var/list/living = list()
-	for(var/mob/living/L in viewers)
-		living += L
-
-	return living