diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index f51b4386482..c1490344287 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -33,7 +33,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, var/produced_power var/energy_to_raise = 32 var/energy_to_lower = -20 - + /obj/singularity/energy_ball/Destroy() if(orbiting && istype(orbiting, /obj/singularity/energy_ball)) var/obj/singularity/energy_ball/EB = orbiting @@ -79,9 +79,12 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, var/first_move = dir for(var/i in 0 to move_amount) var/move_dir = pick(alldirs + first_move) //give the first move direction a bit of favoring. + if(target && prob(60)) + move_dir = get_dir(src,target) var/turf/T = get_step(src, move_dir) if(can_move(T)) loc = T + /obj/singularity/energy_ball/proc/handle_energy() if(energy >= energy_to_raise) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 60959c47f9b..6cfde7c206a 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -857,11 +857,10 @@ var/list/uplink_items = list() // Global list so we only initialize this once. cost = 10 /datum/uplink_item/device_tools/singularity_beacon - name = "Singularity Beacon" + name = "Power Beacon" desc = "When screwed to wiring attached to an electric grid and activated, this large device pulls any \ - active gravitational singularities towards it. This will not work when the singularity is still \ - in containment. A singularity beacon can cause catastrophic damage to a space station, \ - leading to an emergency evacuation. Because of its size, it cannot be carried. Ordering this \ + active gravitational singularities or tesla balls towards it. This will not work when the engine is still \ + in containment. Because of its size, it cannot be carried. Ordering this \ sends you a small beacon that will teleport the larger beacon to your location upon activation." item = /obj/item/device/sbeacondrop cost = 14