Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065

[MIRROR] Fixes escape pods not getting to their default destination
2018-04-10 07:47:00 +00:00
parent 9647de2806 96191b8b6a
commit f33d77a073
1 changed files with 17 additions and 2 deletions
@@ -426,8 +426,23 @@

 /obj/docking_port/mobile/pod/Initialize()
 	. = ..()
-	if(id == "pod")
-		WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")
+	var/static/i = 1
+	if(id == initial(id))
+		id = "[initial(id)][i]"
+	if(name == initial(name))
+		name = "[initial(name)] [i]"
+
+	for(var/k in shuttle_areas)
+		var/area/place = k
+		for(var/obj/machinery/computer/shuttle/pod/pod_comp in place)
+			if(pod_comp.shuttleId == initial(pod_comp.shuttleId))
+				pod_comp.shuttleId = id
+			if(pod_comp.possible_destinations == initial(pod_comp.possible_destinations))
+				pod_comp.possible_destinations = "pod_lavaland[i]"
+
+	i++
+
+

 /obj/docking_port/mobile/pod/cancel()
 	return