cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #24998 (Statues spawned by wizards are invisible) - Correctly (#25638)

Browse Source 
* Fixes #24998 Correctly

* Fixes potential addition to non initialised overlays list
This commit is contained in:
Remie Richards
2017-03-31 13:33:44 +01:00
committed by Leo
parent 24d14441dd
commit d1b2be75ad
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystem/processing/overlays.dm
View File

@@ -171,7 +171,7 @@ var/datum/controller/subsystem/processing/overlays/SSoverlays
var/list/cached_other = other.our_overlays var/list/cached_other = other.our_overlays
if(cached_other) if(cached_other)
if(cut_old) if(cut_old || !LAZYLEN(our_overlays))
our_overlays = cached_other.Copy() our_overlays = cached_other.Copy()
else else
our_overlays |= cached_other our_overlays |= cached_other

4
code/game/objects/structures/crates_lockers/closets/statue.dm
View File

@@ -82,9 +82,7 @@
var/obj/structure/statue/petrified/S = new(loc, src, statue_timer) var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
S.name = "statue of [name]" S.name = "statue of [name]"
bleedsuppress = 1 bleedsuppress = 1
S.icon = icon S.copy_overlays(src)
S.icon_state = icon_state
S.copy_overlays(overlays)
var/newcolor = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)) 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) S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
return 1 return 1