Skip to content

Commit

Permalink
Merge pull request #3744 from out-of-phaze/fix/copy-lighting-mutablea…
Browse files Browse the repository at this point in the history
…ppearance

Fix copy_lighting checking the wrong icon state
  • Loading branch information
MistakeNot4892 authored Feb 25, 2024
2 parents 432b993 + a6575df commit 7b5ca0b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/modules/multiz/zmimic/mimic_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@
MA.blend_mode = BLEND_MULTIPLY

if (use_shadower_mult)
if (icon_state == LIGHTING_BASE_ICON_STATE)
if (MA.icon_state == LIGHTING_BASE_ICON_STATE)
// We're using a color matrix, so just darken the colors across the board.
var/list/c_list = color
var/list/c_list = MA.color
c_list[CL_MATRIX_RR] *= SHADOWER_DARKENING_FACTOR
c_list[CL_MATRIX_RG] *= SHADOWER_DARKENING_FACTOR
c_list[CL_MATRIX_RB] *= SHADOWER_DARKENING_FACTOR
Expand All @@ -106,8 +106,8 @@
else
// Not a color matrix, so we can just use the color var ourselves.
MA.color = SHADOWER_DARKENING_COLOR
set_invisibility(INVISIBILITY_NONE)
appearance = MA
set_invisibility(INVISIBILITY_NONE)

if (our_overlays || priority_overlays)
compile_overlays()
Expand Down

0 comments on commit 7b5ca0b

Please sign in to comment.