Fixes some stuff

.gitignore

@@ -6,6 +6,7 @@ Thumbs.db
 *.dmb
 *.lk
 *.backup
+*.pyc
 data/
 cfg/
 

maps/southern_cross/items/encryptionkey_sc.dm

@@ -6,7 +6,7 @@
 /obj/item/device/encryptionkey/explorer
 	name = "explorer radio encryption key"
 	icon_state = "com_cypherkey"
-	channels = list("Explorer" = 1)
+	channels = list("Science" = 1, "Explorer" = 1) //VOREStation Edit
 
 /obj/item/device/encryptionkey/sar
 	name = "sar's encryption key"

maps/tether/submaps/beach/beach.dm

@@ -1,8 +1,8 @@
 // -- Datums -- //
 
 //We're including two new shuttle destinations. One is in orbit of our 'desert planet'
-/datum/shuttle_destination/excursion/desert_planet //Must be a unique path
-	name = "Desert Planet Orbit" //The name of the destination
+/datum/shuttle_destination/excursion/virgo2orbit //Must be a unique path
+	name = "Virgo-2 Orbit" //The name of the destination
 	my_area = /area/shuttle/excursion/space //The area the shuttle goes when it's settled at this destination
 	preferred_interim_area = /area/shuttle/excursion/space_moving //The area the shuttle goes while it's moving there
 	skip_me = TRUE //Must be TRUE on all away-mission destinations for reasons
@@ -19,7 +19,7 @@
 	skip_me = TRUE
 
 	routes_to_make = list(
-		/datum/shuttle_destination/excursion/desert_planet = 30 SECONDS //This is the above one
+		/datum/shuttle_destination/excursion/virgo2orbit = 30 SECONDS //This is the above one
 	)
 
 //This is a special subtype of the thing that generates ores on a map
@@ -64,7 +64,7 @@
 	name = "shuttle connector - beach"
 	shuttle_name = "Excursion Shuttle"
 	//This list needs to be in the correct order, and start with the one that connects to the rest of the shuttle 'network'
-	destinations = list(/datum/shuttle_destination/excursion/desert_planet, /datum/shuttle_destination/excursion/beach)
+	destinations = list(/datum/shuttle_destination/excursion/virgo2orbit, /datum/shuttle_destination/excursion/beach)
 
 //This object simply performs any map setup that needs to happen on our map if it loads.
 //As with the above, you do need to place this object on the map somewhere.

maps/tether/tether_areas2.dm

@@ -413,6 +413,9 @@
 /area/tether/station/excursion_dock
 	name = "\improper Excursion Shuttle Dock"
 
+/area/tether/station/explorer_prep
+	name = "\improper Explorer Prep Room"
+
 /area/shuttle/excursion
 	name = "\improper Excursion Shuttle"
 	icon_state = "shuttle2"

tools/mapmerge2/dmm2tgm.bat

@@ -1,5 +1,5 @@
 @echo off
-set MAPROOT=../../_maps/
+set MAPROOT=../../maps/tether
 set TGM=1
 python convert.py
 pause

tools/mapmerge2/tgm2dmm.bat

@@ -1,5 +1,5 @@
 @echo off
-set MAPROOT=../../_maps/
+set MAPROOT=../../maps/tether
 set TGM=0
 python convert.py
 pause