Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Fixes cable colors and computer overlays #20652

Merged
MajManatee merged 1 commit into from
Oct 19, 2023
Merged

Fixes cable colors and computer overlays #20652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions code/game/machinery/computer/_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@
icon_state = initial(icon_state)
update_appearance(UPDATE_ICON)

/obj/machinery/computer/update_overlays()
/obj/machinery/computer/update_appearance(updates)
. = ..()

SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
//Prevents fuckery with subtypes that are meant to be pixel shifted or map shifted shit
if(pixel_x == 0 && pixel_y == 0)
// this bit of code makes the computer hug the wall its next to
Expand All @@ -84,7 +82,10 @@
if(istype(T, /turf/closed/wall) || W)
pixel_x = offet_matrix[1]
pixel_y = offet_matrix[2]



Copy link
Contributor

@MajManatee MajManatee Oct 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grr whitespace...

/obj/machinery/computer/update_overlays()
. = ..()
if(stat & NOPOWER)
. += "[icon_keyboard]_off"
return
Expand All @@ -94,8 +95,8 @@
var/overlay_state = icon_screen
if(stat & BROKEN)
overlay_state = "[icon_state]_broken"
SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, plane, dir)
SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, EMISSIVE_PLANE, dir)
. += mutable_appearance(icon, overlay_state)
. += mutable_appearance(icon, overlay_state, layer, EMISSIVE_PLANE)

/obj/machinery/computer/power_change()
. = ..()
Expand Down
2 changes: 2 additions & 0 deletions code/modules/power/cable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,8 @@ By design, d1 is the smallest direction and d2 is the highest
return
icon_state = "[initial(item_state)][amount < 3 ? amount : ""]"
item_state = "coil_[cable_color]"
color = null
add_atom_colour(cable_color, FIXED_COLOUR_PRIORITY)

/obj/item/stack/cable_coil/update_name(updates=ALL)
. = ..()
Expand Down