Merge pull request #21 from Neerti/6/21/2015_woodrat_map_hell_satan_praise_narsie

Adds the new map.

code/game/area/Space Station 13 areas.dm

@@ -921,6 +921,90 @@ area/space/atmosalert()
 	name = "\improper Dormitories"
 	icon_state = "Sleep"
 
+/area/crew_quarters/sleep/Apartment_A1
+	name = "\improper Apartment A1"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_A2
+	name = "\improper Apartment A2"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_A3
+	name = "\improper Apartment A3"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_A4
+	name = "\improper Apartment A4"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_A5
+	name = "\improper Apartment A5"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_A6
+	name = "\improper Apartment A6"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_A7
+	name = "\improper Apartment A7`"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_A8
+	name = "\improper Apartment A8"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_B1
+	name = "\improper Apartment B1"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_B2
+	name = "\improper Apartment B2"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Apartment_B3
+	name = "\improper Apartment B3"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_1
+	name = "\improper Dormitory Room 1"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_2
+	name = "\improper Dormitory Room 2"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_3
+	name = "\improper Dormitory Room 3"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_4
+	name = "\improper Dormitory Room 4"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_5
+	name = "\improper Dormitory Room 5"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_6
+	name = "\improper Dormitory Room 6"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_7
+	name = "\improper Dormitory Room 7"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_8
+	name = "\improper Dormitory Room 8"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_9
+	name = "\improper Dormitory Room 9"
+	icon_state = "Sleep"
+
+/area/crew_quarters/sleep/Dorm_10
+	name = "\improper Dormitory Room 10"
+	icon_state = "Sleep"
+
 /area/crew_quarters/sleep/engi_wash
 	name = "\improper Engineering Washroom"
 	icon_state = "toilet"

code/game/machinery/cryopod.dm

@@ -246,12 +246,13 @@
 	find_control_computer()
 
 /obj/machinery/cryopod/proc/find_control_computer(urgent=0)
-	control_computer = locate(/obj/machinery/computer/cryopod) in src.loc.loc
+	//control_computer = locate(/obj/machinery/computer/cryopod) in src.loc
+	control_computer = locate(/obj/machinery/computer/cryopod) in range(6,src)
 
 	// Don't send messages unless we *need* the computer, and less than five minutes have passed since last time we messaged
 	if(!control_computer && urgent && last_no_computer_message + 5*60*10 < world.time)
-		log_admin("Cryopod in [src.loc.loc] could not find control computer!")
-		message_admins("Cryopod in [src.loc.loc] could not find control computer!")
+		log_admin("Cryopod in [src.loc] could not find control computer!")
+		message_admins("Cryopod in [src.loc] could not find control computer!")
 		last_no_computer_message = world.time
 
 	return control_computer != null

polaris.dme

@@ -1744,9 +1744,6 @@
 #include "code\ZAS\Zone.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
-#include "maps\exodus-1.dmm"
+#include "maps\colony-1.dmm"
 #include "maps\exodus-2.dmm"
-#include "maps\exodus-4.dmm"
-#include "maps\exodus-5.dmm"
-#include "maps\exodus-6.dmm"
 // END_INCLUDE