From a8b7888ae9efb4011d1afaa55ff8fa608704b3f2 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sun, 24 Jan 2021 13:39:08 +0000
Subject: [PATCH] Cable Retracting (#15285)
---
code/game/objects/items/weapons/misc.dm | 3 +--
.../mob/living/silicon/pai/software/pai_apps.dm | 15 ++++++++-------
tgui/packages/tgui/interfaces/pai/pai_doorjack.js | 7 ++-----
tgui/packages/tgui/public/tgui.bundle.js | 2 +-
4 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm
index 147f4dc3183..09ed31ac65d 100644
--- a/code/game/objects/items/weapons/misc.dm
+++ b/code/game/objects/items/weapons/misc.dm
@@ -120,11 +120,10 @@
desc = "A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity."
/obj/item/pai_cable
- desc = "A flexible coated cable with a universal jack on one end."
name = "data cable"
+ desc = "A flexible coated cable with a universal jack on one end."
icon = 'icons/obj/power.dmi'
icon_state = "wire1"
-
var/obj/machinery/machine
/obj/item/phone
diff --git a/code/modules/mob/living/silicon/pai/software/pai_apps.dm b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
index 2dc05917e32..2dad56dd4b4 100644
--- a/code/modules/mob/living/silicon/pai/software/pai_apps.dm
+++ b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
@@ -317,16 +317,17 @@
to_chat(usr, "You are already hacking that door!")
else
hacking = TRUE
- INVOKE_ASYNC(src, /datum/pai_software/door_jack/.proc/hackloop)
+ INVOKE_ASYNC(src, .proc/hackloop)
if("cancel")
hackdoor = null
if("cable")
- if(cable)
- to_chat(usr, "You already have a cable deployed!")
- return
- var/turf/T = get_turf(pai_holder)
- cable = new /obj/item/pai_cable(T)
- pai_holder.visible_message("A port on [pai_holder] opens to reveal [cable], which promptly falls to the floor.")
+ playsound(pai_holder, 'sound/mecha/mechmove03.ogg', 25, TRUE)
+ if(cable) // Retracting
+ pai_holder.visible_message("[cable] is pulled back into [pai_holder] with a quick snap.")
+ QDEL_NULL(cable)
+ else // Extending
+ cable = new /obj/item/pai_cable(get_turf(pai_holder))
+ pai_holder.visible_message("A port on [pai_holder] opens to reveal [cable], which promptly falls to the floor.")
/**
* Door jack hack loop
diff --git a/tgui/packages/tgui/interfaces/pai/pai_doorjack.js b/tgui/packages/tgui/interfaces/pai/pai_doorjack.js
index f6a92afc8e8..7ff4767ca4d 100644
--- a/tgui/packages/tgui/interfaces/pai/pai_doorjack.js
+++ b/tgui/packages/tgui/interfaces/pai/pai_doorjack.js
@@ -17,14 +17,11 @@ export const pai_doorjack = (props, context) => {
cableContent = (
);
- } else if (cable) {
- cableContent = (
-
- );
} else {
cableContent = (