cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-12-13 23:10:46 +10:30
parent eafaef5cfa 75d163705a
commit d2803ec4d7
29 changed files with 411 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+2 -5
View File
@@ -114,11 +114,8 @@ By design, d1 is the smallest direction and d2 is the highest
updateicon()
/obj/structure/cable/proc/updateicon()
if(invisibility)
icon_state = "[d1]-[d2]-f"
else
icon_state = "[d1]-[d2]"
icon_state = "[d1]-[d2]"
alpha = invisibility ? 127 : 255
// returns the powernet this cable belongs to
/obj/structure/cable/proc/get_powernet() //TODO: remove this as it is obsolete