cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tesla Update/Rebalance

Browse Source
This commit is contained in:
Fox-McCloud
2016-04-30 06:44:01 -04:00
parent 12b6b22aad
commit 8322aa9338
9 changed files with 235 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/beam.dm
+7 -9
View File
@@ -19,13 +19,9 @@
/datum/beam/New(beam_origin,beam_target,beam_icon='icons/effects/beam.dmi',beam_icon_state="b_beam",time=50,maxdistance=10,btype = /obj/effect/ebeam)
endtime = world.time+time
origin = beam_origin
origin_oldloc = origin.loc
if(isarea(origin_oldloc))
origin_oldloc = origin
origin_oldloc = get_turf(origin)
target = beam_target
target_oldloc = target.loc
if(isarea(target_oldloc))
target_oldloc = target
target_oldloc = get_turf(target)
if(origin_oldloc == origin && target_oldloc == target)
static_beam = 1
max_distance = maxdistance
@@ -38,9 +34,11 @@
/datum/beam/proc/Start()
Draw()
while(!finished && origin && target && world.time < endtime && get_dist(origin,target)<max_distance && origin.z == target.z)
if(!static_beam && (origin.loc != origin_oldloc || target.loc != target_oldloc))
origin_oldloc = origin.loc //so we don't keep checking against their initial positions, leading to endless Reset()+Draw() calls
target_oldloc = target.loc
var/origin_turf = get_turf(origin)
var/target_turf = get_turf(target)
if(!static_beam && (origin_turf != origin_oldloc || target_turf != target_oldloc))
origin_oldloc = origin_turf //so we don't keep checking against their initial positions, leading to endless Reset()+Draw() calls
target_oldloc = target_turf
Reset()
Draw()
sleep(sleep_time)
code/datums/uplink_item.dm
+5 -2
View File
@@ -846,8 +846,11 @@ var/list/uplink_items = list()
cost = 10
/datum/uplink_item/device_tools/singularity_beacon
name = "Singularity Beacon"
desc = "When screwed to wiring attached to an electric grid, then activated, this large device pulls the singularity towards it. Does 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 sends you a small beacon that will teleport the larger beacon to your location on activation."
name = "Power Beacon"
desc = "When screwed to wiring attached to an electric grid and activated, this large device pulls any \
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."
reference = "SNGB"
item = /obj/item/device/radio/beacon/syndicate
cost = 14