cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix beam runtimes and charging cable messages (#10529)

Browse Source
This commit is contained in:
JohnWildkins
2020-11-14 12:19:33 +01:00
committed by GitHub
parent 77c5eb44d4
commit 8f0d1c1ea4
5 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/hardware/tesla_link.dm
+17 -16
View File
@@ -26,25 +26,21 @@
/obj/item/computer_hardware/tesla_link/charging_cable/Destroy()
if(source || beam)
deactivate()
untether()
return ..()
/obj/item/computer_hardware/tesla_link/charging_cable/toggle(var/obj/machinery/power/power_source, mob/user)
if(!source)
if(!istype(power_source))
return
if(in_range(power_source, src))
to_chat(user, SPAN_NOTICE("You connect \the [src] to \the [power_source]."))
activate(power_source)
tether(power_source)
else
to_chat(SPAN_NOTICE("\The [src] is too far from \the [power_source] to connect."))
else
deactivate()
/obj/item/computer_hardware/tesla_link/charging_cable/proc/activate(var/obj/machinery/power/power_source)
if(istype(power_source))
tether(power_source)
/obj/item/computer_hardware/tesla_link/charging_cable/proc/deactivate()
untether()
untether(message=FALSE)
to_chat(user, SPAN_NOTICE("You disconnect \the [src] from \the [power_source]."))
/obj/item/computer_hardware/tesla_link/charging_cable/check_functionality()
..()
@@ -53,18 +49,23 @@
return TRUE
/obj/item/computer_hardware/tesla_link/charging_cable/proc/tether(var/obj/machinery/power/P)
if(!istype(P))
return
source = P
var/datum/beam/power/B = new(src, source, beam_icon_state = "explore_beam", time = -1, maxdistance = cable_length)
B.owner = src
B.Start()
beam = B
if(istype(B))
playsound(get_turf(src), 'sound/machines/click.ogg', 30, 0)
B.owner = src
B.Start()
beam = B
/obj/item/computer_hardware/tesla_link/charging_cable/proc/untether(var/destroy_beam = TRUE)
/obj/item/computer_hardware/tesla_link/charging_cable/proc/untether(var/destroy_beam = TRUE, var/message=TRUE)
source = null
if(parent_computer)
parent_computer.visible_message(SPAN_WARNING("The charging cable suddenly disconnects from the APC, quickly reeling back into the computer!"))
if(message)
parent_computer.visible_message(SPAN_WARNING("The charging cable suddenly disconnects from the APC, quickly reeling back into the computer!"))
playsound(get_turf(src), 'sound/machines/click.ogg', 30, 0)
if(!destroy_beam)
return
if(beam)
beam.End()
beam.End()