Hotfixes for March 3, 2017 (#260)

* fixes sterile mask box * fixes admin map templates https://github.com/tgstation/tgstation/pull/24581 * syndicate beacon refactor https://github.com/tgstation/tgstation/pull/24612 * singularity tracking https://github.com/tgstation/tgstation/pull/24609 * puddle description https://github.com/tgstation/tgstation/pull/24601 * aux base landing fix https://github.com/tgstation/tgstation/pull/24594 * comms console cooldown https://github.com/tgstation/tgstation/pull/24579 * cult fixes + pronouns https://github.com/tgstation/tgstation/pull/24590 * minebots now check for pressure https://github.com/tgstation/tgstation/pull/24604 * fixes a very annoying spawn https://github.com/tgstation/tgstation/pull/24588 * fixes false positive AI cheat check https://github.com/tgstation/tgstation/pull/24558 mso is bae * Fixes abductor surgery designs https://github.com/tgstation/tgstation/pull/24593 * Allows transit space shuttle repairs https://github.com/tgstation/tgstation/pull/24582 * fixes indentation error
2017-03-03 15:15:42 -05:00
parent 8abcb9859b
commit 97327d2beb
18 changed files with 79 additions and 59 deletions
@@ -302,19 +302,16 @@ obj/docking_port/stationary/public_mining_dock/onShuttleMove()
 	if(!Mport)
 		user << "<span class='warning'>This station is not equipped with an approprite mining shuttle. Please contact Nanotrasen Support.</span>"
 		return
-	var/search_radius = max(Mport.width, Mport.height)*0.5
-	var/list/landing_areas = get_areas_in_range(search_radius, landing_spot)
-	for(var/area/shuttle/auxillary_base/AB in landing_areas) //You land NEAR the base, not IN it.
-		user << "<span class='warning'>The mining shuttle must not land within the mining base itself.</span>"
-		SSshuttle.stationary.Remove(Mport)
-		qdel(Mport)
-		return
+
 	var/obj/docking_port/mobile/mining_shuttle
+	var/list/landing_turfs = list() //List of turfs where the mining shuttle may land.
 	for(var/S in SSshuttle.mobile)
 		var/obj/docking_port/mobile/MS = S
 		if(MS.id != "mining")
 			continue
 		mining_shuttle = MS
+		landing_turfs = mining_shuttle.return_ordered_turfs(x,y,z,dir)
+		break

 	if(!mining_shuttle) //Not having a mining shuttle is a map issue
 		user << "<span class='warning'>No mining shuttle signal detected. Please contact Nanotrasen Support.</span>"
@@ -322,6 +319,13 @@ obj/docking_port/stationary/public_mining_dock/onShuttleMove()
 		qdel(Mport)
 		return

+	for(var/L in landing_turfs) //You land NEAR the base, not IN it.
+		if(istype(get_area(L), /area/shuttle/auxillary_base))
+			user << "<span class='warning'>The mining shuttle must not land within the mining base itself.</span>"
+			SSshuttle.stationary.Remove(Mport)
+			qdel(Mport)
+			return
+
 	if(!mining_shuttle.canDock(Mport))
 		user << "<span class='warning'>Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.</span>"
 		SSshuttle.stationary.Remove(Mport)
@@ -331,7 +335,7 @@ obj/docking_port/stationary/public_mining_dock/onShuttleMove()
 	aux_base_console.set_mining_mode() //Lets the colony park the shuttle there, now that it has a dock.
 	user << "<span class='notice'>Mining shuttle calibration successful! Shuttle interface available at base console.</span>"
 	anchored = 1 //Locks in place to mark the landing zone.
-	playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+	playsound(loc, 'sound/machines/ping.ogg', 50, 0)

 /obj/structure/mining_shuttle_beacon/proc/clear_cooldown()
 	anti_spam_cd = 0