Merge branch 'master' into final_away_maps_additions

# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm

code/modules/overmap/README.dm

@@ -37,7 +37,7 @@ If this zlevel (or any of connected ones for multiz) doesn't have this object, y
 2. Put it anywhere on the ship/sector map. It will do the rest on its own during init.
 If your thing is multiz, only one is needed per multiz sector/ship.
 
-If it's player's main base (e.g Exodus), set 'base' var to 1, so it adds itself to station_levels list.
+If it's player's main base (e.g Aurora), set 'base' var to 1, so it adds itself to station_levels list.
 If this place cannot be reached or left with EVA, set 'in_space' var to 0
 If you want exploration shuttles (look below) to be able to dock here, set up waypoints lists.
 generic_waypoints is list of landmark_tags of waypoints any shttle should be able to visit.
@@ -84,4 +84,4 @@ Lets you control shuttles that can change destinations and visit other sectors/s
 2. Define a /datum/shuttle/autodock/overmap for your shuttle. Same as normal shuttle, aside from 'range' var - how many squares on overmap it can travel on its own.
 3. Place console anywhere on the ship/sector. Set shuttle_tag to shuttle's name.
 4. Use. You can select destinations if you're in range (on same tile by defualt) on the map and sector has waypoints lists defined
-*/
+*/