Escape pods added to test out the concept.

Before you read on this revision is more of a thing being tested than a feature that is guaranteed to stay.

4 escape pods have been added to the station, 2 at arrivals, 1 in engineering and one in security. Each pod is 4x3 tiles in size with a window tile, 2 chairs and a door. So it has 3 floor tiles to stand on.

Pods don't have any sort of emagging capabilities, hijacking a pod does not count as completing the escape alone objective, surviving in a pod however counts towards the escape alive objective. Cult members in pods do not count towards the acolyte victory.

Changelog updated with listed changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2663 316c924e-a436-60f5-8080-3fe189b3f50e

code/datums/shuttle_controller.dm

@@ -135,10 +135,27 @@ datum/shuttle_controller
 
 					else
 						location = 2
+
+						//main shuttle
 						var/area/start_location = locate(/area/shuttle/escape/station)
 						var/area/end_location = locate(/area/shuttle/escape/centcom)
 
 						start_location.move_contents_to(end_location)
+
+						//pods
+						start_location = locate(/area/shuttle/escape_pod1/station)
+						end_location = locate(/area/shuttle/escape_pod1/centcom)
+						start_location.move_contents_to(end_location)
+						start_location = locate(/area/shuttle/escape_pod2/station)
+						end_location = locate(/area/shuttle/escape_pod2/centcom)
+						start_location.move_contents_to(end_location)
+						start_location = locate(/area/shuttle/escape_pod3/station)
+						end_location = locate(/area/shuttle/escape_pod3/centcom)
+						start_location.move_contents_to(end_location)
+						start_location = locate(/area/shuttle/escape_pod5/station)
+						end_location = locate(/area/shuttle/escape_pod5/centcom)
+						start_location.move_contents_to(end_location)
+
 						online = 0
 
 						return 1

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

@@ -144,6 +144,46 @@ proc/process_ghost_teleport_locs()
 /area/shuttle/escape/centcom
 	icon_state = "shuttle"
 
+/area/shuttle/escape_pod1
+	name = "Escape Pod One"
+	music = "music/escape.ogg"
+
+/area/shuttle/escape_pod1/station
+	icon_state = "shuttle2"
+
+/area/shuttle/escape_pod1/centcom
+	icon_state = "shuttle"
+
+/area/shuttle/escape_pod2
+	name = "Escape Pod Two"
+	music = "music/escape.ogg"
+
+/area/shuttle/escape_pod2/station
+	icon_state = "shuttle2"
+
+/area/shuttle/escape_pod2/centcom
+	icon_state = "shuttle"
+
+/area/shuttle/escape_pod3
+	name = "Escape Pod Three"
+	music = "music/escape.ogg"
+
+/area/shuttle/escape_pod3/station
+	icon_state = "shuttle2"
+
+/area/shuttle/escape_pod3/centcom
+	icon_state = "shuttle"
+
+/area/shuttle/escape_pod5 //Pod 4 was lost to meteors
+	name = "Escape Pod Five"
+	music = "music/escape.ogg"
+
+/area/shuttle/escape_pod5/station
+	icon_state = "shuttle2"
+
+/area/shuttle/escape_pod5/centcom
+	icon_state = "shuttle"
+
 /area/shuttle/mining
 	name = "Mining Shuttle"
 	music = "music/escape.ogg"
@@ -1211,6 +1251,10 @@ proc/process_ghost_teleport_locs()
 var/list/centcom_areas = list (
 	/area/centcom,
 	/area/shuttle/escape/centcom,
+	/area/shuttle/escape_pod1/centcom,
+	/area/shuttle/escape_pod2/centcom,
+	/area/shuttle/escape_pod3/centcom,
+	/area/shuttle/escape_pod5/centcom,
 	/area/shuttle/transport1/centcom,
 	/area/shuttle/transport2/centcom,
 	/area/shuttle/administration/centcom,
@@ -1221,6 +1265,10 @@ var/list/centcom_areas = list (
 var/list/the_station_areas = list (
 	/area/shuttle/arrival,
 	/area/shuttle/escape/station,
+	/area/shuttle/escape_pod1/station,
+	/area/shuttle/escape_pod2/station,
+	/area/shuttle/escape_pod3/station,
+	/area/shuttle/escape_pod5/station,
 	/area/shuttle/mining/station,
 	/area/shuttle/transport1/station,
 	// /area/shuttle/transport2/station,

code/game/gamemodes/meteor/meteor.dm

@@ -37,6 +37,7 @@
 /datum/game_mode/meteor/declare_completion()
 	var/list/survivors = list()
 	var/area/escape_zone = locate(/area/shuttle/escape/centcom)
+	var/area/pod_zone = list( /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod5/centcom )
 
 	for(var/mob/living/player in world)
 		if (player.client)
@@ -44,6 +45,8 @@
 				var/turf/location = get_turf(player.loc)
 				if (location in escape_zone)
 					survivors[player.real_name] = "shuttle"
+				else if (location.loc.type in pod_zone)
+					survivors[player.real_name] = "pod"
 				else
 					survivors[player.real_name] = "alive"
 

code/game/gamemodes/objective.dm

@@ -226,6 +226,14 @@ datum/objective/escape
 		var/area/check_area = location.loc
 		if(istype(check_area, /area/shuttle/escape/centcom))
 			return 1
+		if(istype(check_area, /area/shuttle/escape_pod1/centcom))
+			return 1
+		if(istype(check_area, /area/shuttle/escape_pod2/centcom))
+			return 1
+		if(istype(check_area, /area/shuttle/escape_pod3/centcom))
+			return 1
+		if(istype(check_area, /area/shuttle/escape_pod5/centcom))
+			return 1
 		else
 			return 0
 

html/changelog.html

@@ -62,6 +62,12 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<li>User Interface preferences now properly get transferred when you get cloned.</li>
   </ul>
   </li>
+  <li><b>Erro updated:</b>
+  <ul>
+	<li>Escape pods have been added to test the concept.</li>
+	<li>Escaping alone in a pod does not count towards the escape alone objective, it counts towards the escape alive objective tho. Escape alone only requires you to escape alone on the emergency shuttle, it doesn't require you to ensure all pods are empty. Cult members that escape on the pods do not ocunt towards the cult escaping acolyte number objective. Escaping on a pod is a valid way to survive meteor.</li>
+  </ul>
+  </li>
 </ul>
 
 <b><font color='blue'>8 December 2011</font><b>