From d1b2be75ad5c800e10b35a9a51c158d0398fb21c Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Fri, 31 Mar 2017 13:33:44 +0100 Subject: [PATCH] Fixes #24998 (Statues spawned by wizards are invisible) - Correctly (#25638) * Fixes #24998 Correctly * Fixes potential addition to non initialised overlays list --- code/controllers/subsystem/processing/overlays.dm | 2 +- code/game/objects/structures/crates_lockers/closets/statue.dm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/processing/overlays.dm b/code/controllers/subsystem/processing/overlays.dm index 5cb64909826d..f914bdca80c5 100644 --- a/code/controllers/subsystem/processing/overlays.dm +++ b/code/controllers/subsystem/processing/overlays.dm @@ -171,7 +171,7 @@ var/datum/controller/subsystem/processing/overlays/SSoverlays var/list/cached_other = other.our_overlays if(cached_other) - if(cut_old) + if(cut_old || !LAZYLEN(our_overlays)) our_overlays = cached_other.Copy() else our_overlays |= cached_other diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 016ed5a49701..421bc0d6996e 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -82,9 +82,7 @@ var/obj/structure/statue/petrified/S = new(loc, src, statue_timer) S.name = "statue of [name]" bleedsuppress = 1 - S.icon = icon - S.icon_state = icon_state - S.copy_overlays(overlays) + S.copy_overlays(src) var/newcolor = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)) S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) return 1