Merge branch 'master' into upstream-merge-10401

code/game/mecha/equipment/tools/orescanner.dm

@@ -28,7 +28,7 @@
 	if(!enable_special)
 		target = get_turf(chassis)
 
-	var/datum/beam/ScanBeam = chassis.Beam(target,"g_beam",'icons/effects/beam.dmi',time=2 SECONDS,10,/obj/effect/ebeam,2)
+	var/datum/beam/ScanBeam = chassis.Beam(target, "g_beam", 'icons/effects/beam.dmi', 2 SECONDS, 10, /obj/effect/ebeam, 2)
 
 	if(do_after(chassis.occupant, 2 SECONDS))
 		my_scanner.ScanTurf(target, chassis.occupant, exact_scan)

code/game/mecha/equipment/tools/shield.dm

@@ -67,7 +67,6 @@
 	return
 
 /obj/item/mecha_parts/mecha_equipment/combat_shield/proc/toggle_shield()
-	..()
 	if(chassis)
 		my_shield.attack_self(chassis.occupant)
 		if(my_shield.active)

code/game/mecha/equipment/tools/shield_omni.dm

@@ -39,7 +39,6 @@
 		shields.update_shield_positions()
 
 /obj/item/mecha_parts/mecha_equipment/omni_shield/proc/toggle_shield()
-	..()
 	if(shields)
 		shields.set_on(!shields.active)
 		if(shields.active)

code/game/mecha/equipment/tools/syringe_gun.dm

@@ -461,7 +461,6 @@
 						E.status &= ~ORGAN_BROKEN
 
 /obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/toggle_drone()
-	..()
 	if(chassis)
 		enabled = !enabled
 		if(enabled)

code/game/mecha/equipment/weapons/weapons.dm

@@ -43,7 +43,7 @@
 		var/turf/aimloc = targloc
 		if(deviation)
 			aimloc = locate(targloc.x+GaussRandRound(deviation,1),targloc.y+GaussRandRound(deviation,1),targloc.z)
-		if(!aimloc || aimloc == curloc || (locs && aimloc in locs))
+		if(!aimloc || aimloc == curloc || (locs && (aimloc in locs)))
 			break
 		playsound(src, fire_sound, fire_volume, 1)
 		projectiles--

code/game/mecha/mecha.dm

@@ -1569,7 +1569,7 @@
 	return 0
 
 /obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob)
-	if(mmi_as_oc && user in range(1))
+	if(mmi_as_oc && (user in range(1)))
 		if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client)
 			to_chat(user, "Consciousness matrix not detected.")
 			return 0
@@ -1886,7 +1886,7 @@
 	return
 
 /obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob)
-	if(H && H.client && H in range(1))
+	if(H && H.client && (H in range(1)))
 		H.reset_view(src)
 		/*
 		H.client.perspective = EYE_PERSPECTIVE
@@ -2514,7 +2514,7 @@
 		var/mob/occupant = P.occupant
 
 		user.visible_message("<span class='notice'>\The [user] begins opening the hatch on \the [P]...</span>", "<span class='notice'>You begin opening the hatch on \the [P]...</span>")
-		if (!do_after(user, 40, needhand=0))
+		if (!do_after(user, 40))
 			return
 
 		user.visible_message("<span class='notice'>\The [user] opens the hatch on \the [P] and removes [occupant]!</span>", "<span class='notice'>You open the hatch on \the [P] and remove [occupant]!</span>")
@@ -2564,7 +2564,7 @@
 				src.log_message("Recalibration of coordination system failed with 1 error.",1)
 	if(href_list["drop_from_cargo"])
 		var/obj/O = locate(href_list["drop_from_cargo"])
-		if(O && O in src.cargo)
+		if(O && (O in src.cargo))
 			src.occupant_message("<span class='notice'>You unload [O].</span>")
 			O.forceMove(get_turf(src))
 			src.cargo -= O
@@ -2632,7 +2632,6 @@
 				AI.icon_state = "ai-crash"
 			src.occupant = cur_occupant
 */
-	return
 
 ///////////////////////
 ///// Power stuff /////

code/game/mecha/mecha_control_console.dm

@@ -27,11 +27,13 @@
 /obj/machinery/computer/mecha/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
 	var/list/data = ..()
 	
-	data["beacons"] = list()
+	
+	var/list/beacons = list()
 	for(var/obj/item/mecha_parts/mecha_tracking/TR in world)
 		var/list/tr_data = TR.tgui_data(user)
 		if(tr_data)
-			data["beacons"].Add(list(tr_data))
+			beacons.Add(list(tr_data))
+	data["beacons"] = beacons
 	
 	LAZYINITLIST(stored_data)
 	data["stored_data"] = stored_data