From 08cc205c35a0100826f167091d0c63bd8cac63b6 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 20 Aug 2020 19:23:42 -0700 Subject: [PATCH] Merge pull request #7503 from Cyantime/patch-2 Replaces cable attack_ghost with normal examine --- code/modules/power/cable.dm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 1ab2d6a5ea..183956e562 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -110,17 +110,10 @@ var/list/possible_cable_coil_colours = list( cable_list -= src //remove it from global cable list return ..() // then go ahead and delete the cable -// Ghost examining the cable -> tells him the power -/obj/structure/cable/attack_ghost(mob/user) - if(user.client && user.client.inquisitive_ghost) - user.examinate(src) - // following code taken from attackby (multitool) - if(powernet && (powernet.avail > 0)) - to_chat(user, "[DisplayPower(powernet.avail)] in power network.") - else - to_chat(user, "The cable is not powered.") - return - +/obj/structure/cable/examine(mob/user) + . = ..() + if(isobserver(user)) + . += "[powernet?.avail > 0 ? "[DisplayPower(powernet.avail)] in power network." : "The cable is not powered."]" // Rotating cables requires d1 and d2 to be rotated /obj/structure/cable/set_dir(new_dir)