From 85514af724ea3c45c1f6058bae3195121e7f3c6b Mon Sep 17 00:00:00 2001 From: Robustin Date: Fri, 18 Mar 2016 16:11:56 -0400 Subject: [PATCH 1/6] Update syndicatebeacon.dm --- code/game/machinery/syndicatebeacon.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index d8fce89f1ea..fd8e25a4780 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -125,6 +125,9 @@ for(var/obj/singularity/singulo in world) if(singulo.z == z) singulo.target = src + for(var/obj/singularity/energy_ball in world) + if(energy_ball.z == z) + energy_ball.home = src icon_state = "[icontype]1" active = 1 machines |= src From a152febb5a243143628d1669c8fd17c4b114228b Mon Sep 17 00:00:00 2001 From: Robustin Date: Fri, 18 Mar 2016 16:30:19 -0400 Subject: [PATCH 2/6] Update energy_ball.dm --- code/modules/power/tesla/energy_ball.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index ac5b9089de3..1b280e0acbd 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -33,6 +33,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, var/produced_power var/energy_to_raise = 32 var/energy_to_lower = -20 + var/home = null // Syndie Beacon target /obj/singularity/energy_ball/Destroy() if(orbiting && istype(orbiting, /obj/singularity/energy_ball)) @@ -79,9 +80,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(home && prob(60)) + move_dir = get_dir(src,home) 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) From 64a04cbe4db1202952ea1cf8cf8751cc13b798cc Mon Sep 17 00:00:00 2001 From: Robustin Date: Fri, 18 Mar 2016 16:32:17 -0400 Subject: [PATCH 3/6] Update syndicatebeacon.dm --- code/game/machinery/syndicatebeacon.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index fd8e25a4780..e347c66d071 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -125,9 +125,9 @@ for(var/obj/singularity/singulo in world) if(singulo.z == z) singulo.target = src - for(var/obj/singularity/energy_ball in world) - if(energy_ball.z == z) - energy_ball.home = src + for(var/obj/singularity/energy_ball/tesla in world) + if(tesla.z == z) + tesla.home = src icon_state = "[icontype]1" active = 1 machines |= src From b1fbd3a0b6ab2e8ba97340f7844a14bb4cca7b49 Mon Sep 17 00:00:00 2001 From: Robustin Date: Fri, 18 Mar 2016 16:46:41 -0400 Subject: [PATCH 4/6] Update energy_ball.dm --- code/modules/power/tesla/energy_ball.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 1b280e0acbd..8bbb732b61c 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -33,8 +33,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, var/produced_power var/energy_to_raise = 32 var/energy_to_lower = -20 - var/home = null // Syndie Beacon target - + /obj/singularity/energy_ball/Destroy() if(orbiting && istype(orbiting, /obj/singularity/energy_ball)) var/obj/singularity/energy_ball/EB = orbiting @@ -80,8 +79,8 @@ 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(home && prob(60)) - move_dir = get_dir(src,home) + if(target && prob(60)) + move_dir = get_dir(src,target) var/turf/T = get_step(src, move_dir) if(can_move(T)) loc = T From b5dc62a119b900ac957a33f80cf9d064d0dc7dc5 Mon Sep 17 00:00:00 2001 From: Robustin Date: Fri, 18 Mar 2016 16:47:52 -0400 Subject: [PATCH 5/6] Update syndicatebeacon.dm --- code/game/machinery/syndicatebeacon.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index e347c66d071..d8fce89f1ea 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -125,9 +125,6 @@ for(var/obj/singularity/singulo in world) if(singulo.z == z) singulo.target = src - for(var/obj/singularity/energy_ball/tesla in world) - if(tesla.z == z) - tesla.home = src icon_state = "[icontype]1" active = 1 machines |= src From f8a59bb002717a206d222d260f2b0bd33539476f Mon Sep 17 00:00:00 2001 From: Robustin Date: Mon, 21 Mar 2016 10:52:26 -0400 Subject: [PATCH 6/6] Update uplink_item.dm --- code/modules/uplink/uplink_item.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 685fb69e0b0..fb78a54ac23 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -855,11 +855,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