From e94e29ff3bdc31951d6101c4f1cecdbe3c9071cd Mon Sep 17 00:00:00 2001
From: Denton <32391752+81Denton@users.noreply.github.com>
Date: Sun, 9 Sep 2018 14:32:14 +0200
Subject: [PATCH 1/2] Shows buffer info when examining multitools+quantum pads
---
code/game/machinery/quantum_pad.dm | 37 ++++++++++++++------
code/game/objects/items/devices/multitool.dm | 7 ++++
2 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
index 8962ab60a59..ae2f75dffb2 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -11,7 +11,7 @@
var/teleport_cooldown = 400 //30 seconds base due to base parts
var/teleport_speed = 50
var/last_teleport //to handle the cooldown
- var/teleporting = 0 //if it's in the process of teleporting
+ var/teleporting = FALSE //if it's in the process of teleporting
var/power_efficiency = 1
var/obj/machinery/quantumpad/linked_pad
@@ -29,6 +29,14 @@
mapped_quantum_pads -= map_pad_id
return ..()
+/obj/machinery/quantumpad/examine(mob/user)
+ ..()
+ to_chat(user, "It is [ linked_pad ? "currently" : "not"] linked to another pad.")
+ if(!panel_open)
+ to_chat(user, "Unscrew the panel to read the pad's link buffer.")
+ else
+ to_chat(user, "Use a multitool to read the pad's link data.")
+
/obj/machinery/quantumpad/RefreshParts()
var/E = 0
for(var/obj/item/stock_parts/capacitor/C in component_parts)
@@ -50,14 +58,21 @@
if(istype(I, /obj/item/multitool))
var/obj/item/multitool/M = I
M.buffer = src
- to_chat(user, "You save the data in [I]'s buffer.")
- return 1
+ to_chat(user, "You save the data in [I]'s buffer. It can now be saved to pads with closed panels.")
+ return TRUE
else if(istype(I, /obj/item/multitool))
var/obj/item/multitool/M = I
if(istype(M.buffer, /obj/machinery/quantumpad))
- linked_pad = M.buffer
- to_chat(user, "You link [src] to the one in [I]'s buffer.")
- return 1
+ if(M.buffer == src)
+ to_chat(user, "You cannot link a pad to itself!")
+ return TRUE
+ else
+ linked_pad = M.buffer
+ to_chat(user, "You link [src] to the one in [I]'s buffer.")
+ return TRUE
+ else
+ to_chat(user, "There is no quantum pad data saved in [I]'s buffer!")
+ return TRUE
if(default_deconstruction_crowbar(I))
return
@@ -105,22 +120,22 @@
/obj/machinery/quantumpad/proc/doteleport(mob/user)
if(linked_pad)
playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1)
- teleporting = 1
+ teleporting = TRUE
spawn(teleport_speed)
if(!src || QDELETED(src))
- teleporting = 0
+ teleporting = FALSE
return
if(stat & NOPOWER)
to_chat(user, "[src] is unpowered!")
- teleporting = 0
+ teleporting = FALSE
return
if(!linked_pad || QDELETED(linked_pad) || linked_pad.stat & NOPOWER)
to_chat(user, "Linked pad is not responding to ping. Teleport aborted.")
- teleporting = 0
+ teleporting = FALSE
return
- teleporting = 0
+ teleporting = FALSE
last_teleport = world.time
// use a lot of power
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 8d1fcf79765..f8b1d6e15b3 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -32,6 +32,13 @@
var/datum/integrated_io/selected_io = null //functional for integrated circuits.
var/mode = 0
+/obj/item/multitool/examine(mob/user)
+ ..()
+ if(selected_io)
+ to_chat(user, "Activate [src] to detach the data wire.")
+ if(buffer)
+ to_chat(user, "Its buffer contains [buffer].")
+
/obj/item/multitool/suicide_act(mob/living/carbon/user)
user.visible_message("[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!")
return OXYLOSS//theres a reason it wasnt recommended by doctors
From 0448247f71f6a3a6dfd642a5d4d2f6682d2296f6 Mon Sep 17 00:00:00 2001
From: Denton
Date: Mon, 10 Sep 2018 10:02:11 +0200
Subject: [PATCH 2/2] More immersive descs by cobby
---
code/game/machinery/quantum_pad.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
index ae2f75dffb2..7a8552607b5 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -33,9 +33,9 @@
..()
to_chat(user, "It is [ linked_pad ? "currently" : "not"] linked to another pad.")
if(!panel_open)
- to_chat(user, "Unscrew the panel to read the pad's link buffer.")
+ to_chat(user, "The panel is screwed in, obstructing the linking device.")
else
- to_chat(user, "Use a multitool to read the pad's link data.")
+ to_chat(user, "The linking device is now able to be scanned with a multitool.")
/obj/machinery/quantumpad/RefreshParts()
var/E = 0