Merge branch 'master' into AI_announcer_new

code/modules/shuttle/assault_pod.dm

@@ -33,8 +33,8 @@
 
 /obj/item/assault_pod/attack_self(mob/living/user)
 	var/target_area
-	target_area = input("Area to land", "Select a Landing Zone", target_area) in GLOB.teleportlocs
-	var/area/picked_area = GLOB.teleportlocs[target_area]
+	target_area = input("Area to land", "Select a Landing Zone", target_area) in SSmapping.teleportlocs
+	var/area/picked_area = SSmapping.teleportlocs[target_area]
 	if(!src || QDELETED(src))
 		return
 

code/modules/shuttle/emergency.dm

@@ -276,8 +276,6 @@
 				for(var/mob/M in GLOB.player_list)
 					if(!isnewplayer(M) && !M.client.karma_spent && !(M.client.ckey in GLOB.karma_spenders) && !M.get_preference(PREFTOGGLE_DISABLE_KARMA_REMINDER))
 						to_chat(M, "<i>You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under Special Verbs tab, Award Karma.</i>")
-				if(config.map_voting_enabled)
-					SSvote.initiate_vote("map", "the server", TRUE)
 
 		if(SHUTTLE_ESCAPE)
 			if(time_left <= 0)

code/modules/shuttle/supply.dm

@@ -311,7 +311,7 @@
 	var/packagesAmt = SSshuttle.shoppinglist.len + ((errors & MANIFEST_ERROR_COUNT) ? rand(1,2) : 0)
 
 	slip.name = "Shipping Manifest - '[object.name]' for [orderedby]"
-	slip.info = "<h3>[command_name()] Shipping Manifest</h3><hr><br>"
+	slip.info = "<h3>NAS Trurl Shipping Manifest</h3><hr><br>"
 	slip.info +="Order: #[ordernum]<br>"
 	slip.info +="Destination: [stationName]<br>"
 	slip.info +="Requested By: [orderedby]<br>"