cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7503 from Cyantime/patch-2

Browse Source 
Replaces cable attack_ghost with normal examine
This commit is contained in:
Atermonera
2020-08-20 19:23:42 -07:00
committed by VirgoBot
parent 1e26cc77b4
commit 08cc205c35
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/power/cable.dm
View File

@@ -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, "<span class='warning'>[DisplayPower(powernet.avail)] in power network.</span>")
else
to_chat(user, "<span class='warning'>The cable is not powered.</span>")
return
/obj/structure/cable/examine(mob/user)
. = ..()
if(isobserver(user))
. += "<span class='warning'>[powernet?.avail > 0 ? "[DisplayPower(powernet.avail)] in power network." : "The cable is not powered."]</span>"
// Rotating cables requires d1 and d2 to be rotated
/obj/structure/cable/set_dir(new_dir)