Merge branch 'master' into findnreplace

code/datums/helper_datums/map_template.dm

@@ -114,6 +114,7 @@
 		preloadRuinTemplates()
 	preloadShelterTemplates()
 	preloadShuttleTemplates()
+	preloadVRTemplates()
 
 /proc/preloadRuinTemplates()
 	// Still supporting bans by filename
@@ -163,4 +164,15 @@
 		var/datum/map_template/shuttle/S = new shuttle_type()
 
 		shuttle_templates[S.shuttle_id] = S
-		map_templates[S.shuttle_id] = S
+		map_templates[S.shuttle_id] = S
+
+/proc/preloadVRTemplates()
+	for(var/item in subtypesof(/datum/map_template/vr))
+		var/datum/map_template/vr/vr_type = item
+		if(!initial(vr_type.suffix))
+			continue
+
+		var/datum/map_template/vr/V = new vr_type()
+
+		vr_templates[V.id] = V
+		map_templates[V.id] = V