From e239652625796139c7f3f544eb38006a1906394f Mon Sep 17 00:00:00 2001 From: TobyThorne <45202681+TobyThorne@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:02:56 +0600 Subject: [PATCH] tvari --- code/game/machinery/computer/teleporter.dm | 45 +++++-------------- code/game/machinery/teleporter.dm | 7 +-- .../core/prefab/prefabs.dm | 2 +- tgui/packages/tgui/interfaces/Teleporter.js | 23 +--------- tgui/public/tgui.bundle.js | 2 +- 5 files changed, 16 insertions(+), 63 deletions(-) diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 77b912bc265..304c714e702 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -19,7 +19,6 @@ var/id var/mode = MODE_TELEPORT - var/calibrating = FALSE var/list/linked_consoles var/weakref/target_ref var/obj/machinery/teleporter_gate/gate @@ -62,6 +61,18 @@ id = "[random_id(/obj/machinery/computer/teleporter, 1000, 9999)]" link_gate() +/obj/machinery/computer/teleporter/verb/set_id(t as text) + set category = "Object" + set name = "Set teleporter ID" + set src in oview(1) + set desc = "ID Tag:" + + if(stat & (NOPOWER|BROKEN) || !istype(usr,/mob/living)) + return + if(t) + src.id = t + return + /obj/machinery/computer/teleporter/Destroy() if(gate) gate.console = null @@ -125,7 +136,6 @@ var/list/data = list() data["gate"] = gate ? TRUE : FALSE data["panel"] = panel_open - data["calibrating"] = calibrating data["target"] = !target ? "None" : "[get_area(target)]" switch(mode) @@ -141,34 +151,12 @@ else data["engaged"] = FALSE - if(gate?.calibrated) - data["calibrated"] = TRUE - else - data["calibrated"] = FALSE - return data /obj/machinery/computer/teleporter/proc/change_mode() mode = mode + 1 > 2 ? 0 : mode + 1 set_teleport_target(null) -/obj/machinery/computer/teleporter/proc/finish_calibrating() - calibrating = FALSE - if(!gate) - audible_message(SPAN_WARNING("Failure: Unable to detect gate.")) - return - audible_message("Calibration complete.") - gate.calibrated = TRUE - gate.set_state(TRUE) - update_icon() - -/obj/machinery/computer/teleporter/proc/start_calibrating(auto = FALSE) - if(auto && gate?.accuracy + gate?.calc_acceleration < MIN_MAX_GATE_LEVEL) - return - calibrating = TRUE - audible_message("Processing hub calibration to target...") - addtimer(CALLBACK(src, nameof(.proc/finish_calibrating)), 2 SECONDS * (4 - gate.calc_acceleration)) - /obj/machinery/computer/teleporter/tgui_act(action, params) . = ..() @@ -185,19 +173,10 @@ to_chat(usr, "\The [src]'s maintanence panel is now [panel_open ? "opened" : "closed"].") if("modeset") gate.set_state(FALSE) - gate.calibrated = FALSE change_mode() if("targetset") gate.set_state(FALSE) - gate.calibrated = FALSE set_target(usr) - if("calibrate") - if(!target_ref) - audible_message("Error: No target set to calibrate to.") - return - if(gate.calibrated) - audible_message("Error: Hub is already calibrated!") - start_calibrating() return TRUE diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index fcfe5c59118..d3489d69629 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -14,7 +14,6 @@ light_color = "#7de1e1" var/engaged = FALSE - var/calibrated = FALSE var/accuracy var/calc_acceleration var/obj/machinery/computer/teleporter/console @@ -114,11 +113,7 @@ if(istype(A)) use_power_oneoff(5 KILO WATTS) - do_teleport(A, target, calibrated ? 0 : clamp(DESTINATION_SPREAD_MIN, 10 - accuracy, DESTINATION_SPREAD_MAX)) - calibrated = FALSE - - console.start_calibrating(TRUE) - + do_teleport(A, target) return /obj/machinery/teleporter_gate/Crossed(A) diff --git a/code/modules/integrated_electronics/core/prefab/prefabs.dm b/code/modules/integrated_electronics/core/prefab/prefabs.dm index 5ac0a76dd98..1b2bde179e7 100644 --- a/code/modules/integrated_electronics/core/prefab/prefabs.dm +++ b/code/modules/integrated_electronics/core/prefab/prefabs.dm @@ -3,7 +3,7 @@ assembly_icon = 'icons/obj/device.dmi' assembly_icon_state = "hand_tele" assembly_w_class = ITEM_SIZE_SMALL - data = {"{'assembly':{'type':'type-c electronic machine','name':'Hand Teleporter'},'components':\[{'type':'button','name':'Open RIft'},{'type':'teleporter locator'},{'type':'bluespace rift generator'}],'wires':\[\[\[1,'A',1],\[3,'A',1]],\[\[2,'O',1],\[3,'I',1]]]}"} + data = {"{'assembly':{'type':'type-c electronic machine','name':'Hand Teleporter'},'components':\[{'type':'button','name':'Open Rift'},{'type':'teleporter locator'},{'type':'bluespace rift generator'}],'wires':\[\[\[1,'A',1],\[3,'A',1]],\[\[2,'O',1],\[3,'I',1]]]}"} power_cell_type = /obj/item/cell/hyper /obj/prefab/hand_teleporter diff --git a/tgui/packages/tgui/interfaces/Teleporter.js b/tgui/packages/tgui/interfaces/Teleporter.js index 8fe79991cf1..5d697b49ace 100644 --- a/tgui/packages/tgui/interfaces/Teleporter.js +++ b/tgui/packages/tgui/interfaces/Teleporter.js @@ -15,7 +15,7 @@ export const Teleporter = (props, context) => { const UiData = (props, context) => { const { act, data } = useBackend(context) - const { gate, calibrating, target, mode, calibrated, engaged, panel} = data + const { gate, target, mode, engaged, panel} = data if(!gate) return Error: No Gate connected. @@ -58,27 +58,6 @@ const UiData = (props, context) => { - - - - Calibration: - - - { - (calibrating && In Progress) || - (!calibrated && Sub-Optimal) || - (calibrated && Optimal) - } - - -