Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion __DEFINES/global.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ var/list/voxstart = list() //Vox raider spawn points
var/list/voxlocker = list() //Vox locker spawn points
// list/traitors = list() //traitor list
var/list/cardinal = list( NORTH, SOUTH, EAST, WEST )

var/list/diagonal = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)

Expand Down
6 changes: 3 additions & 3 deletions __DEFINES/subsystem.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#define SS_INIT_HUMANS 21
#define SS_INIT_MAP 20
#define SS_INIT_COMPONENT 19.5
#define SS_INIT_PERSISTENCE_MISC 19 // Because Tetris needs to read from previous rounds. It inits in 0 seconds anyway.
#define SS_INIT_OBJECT 18.5
#define SS_INIT_POWER 18
#define SS_INIT_POWER 19
#define SS_INIT_PERSISTENCE_MISC 18.5 // Because Tetris needs to read from previous rounds. It inits in 0 seconds anyway.
#define SS_INIT_OBJECT 18
#define SS_INIT_PIPENET 17.5
#define SS_INIT_XENOARCH 17
#define SS_INIT_MORE_INIT 16
Expand Down
77 changes: 4 additions & 73 deletions code/modules/power/cable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,10 @@ By design, d1 is the smallest direction and d2 is the highest
update_icon()

/obj/structure/cable/update_icon()
alpha = invisibility ? 128 : 255
icon_state = "[d1]-[d2]"
if(invisibility)
icon_state = "[d1]-[d2]-f"
else
icon_state = "[d1]-[d2]"

/obj/structure/cable/t_scanner_expose()
if (level != LEVEL_BELOW_FLOOR)
Expand Down Expand Up @@ -554,74 +556,3 @@ By design, d1 is the smallest direction and d2 is the highest

/obj/structure/cable/proc/hasDir(var/dir)
return (d1 == dir || d2 == dir)

/obj/structure/cable/mapping
icon_state = "auto"

/obj/structure/cable/mapping/canSmoothWith()
var/static/list/smoothables = list(/obj/structure/cable)
return smoothables

/obj/structure/cable/mapping/isSmoothableNeighbor(atom/A)
if(istype(A,/obj/structure/cable))
if(istype(A,/obj/structure/cable/mapping))
return TRUE
var/obj/structure/cable/C = A
return C.hasDir(get_dir(C,src))

/obj/structure/cable/mapping/relativewall()
. = ..()
var/list/found_dirs = list()
for(var/subdir in cardinal)
if(junction & subdir)
found_dirs += list(subdir)
var/dir_in_found = (dir in found_dirs) ? TRUE : FALSE
if(found_dirs.len > 1 && dir_in_found)
found_dirs.Remove(dir)
unshift(found_dirs,dir)
if(found_dirs.len > 2)
for(var/i in 3 to found_dirs.len)
var/list/subfound = dir_in_found ? list(dir,found_dirs[i]) : list(found_dirs[i-1],found_dirs[i])
sortTim(subfound)
var/obj/structure/cable/C = new(loc)
C.d1 = subfound[1]
C.d2 = subfound[2]
C.color = src.color
C.update_icon()
if(found_dirs.len >= 2)
var/list/subfound = list(found_dirs[1],found_dirs[2])
sortTim(subfound)
d1 = subfound[1]
d2 = subfound[2]
if((locate(/obj/machinery/power) in loc) || (locate(/obj/structure/grille) in loc))
var/obj/structure/cable/C = new(loc)
C.d1 = 0
C.d2 = found_dirs[1]
C.color = src.color
C.update_icon()
else if(found_dirs.len == 1)
d1 = 0
d2 = found_dirs[1]
update_icon()
dir = SOUTH

/obj/structure/cable/mapping/yellow
color = "#FFED00"

/obj/structure/cable/mapping/green
color = "#0B8400"

/obj/structure/cable/mapping/blue
color = "#005C84"

/obj/structure/cable/mapping/pink
color = "#CA00B6"

/obj/structure/cable/mapping/orange
color = "#CA6900"

/obj/structure/cable/mapping/cyan
color = "#00B5CA"

/obj/structure/cable/mapping/white
color = "#D0D0D0"
Binary file modified icons/obj/power_cond_white.dmi
Binary file not shown.
Loading
Loading