From 668115019dbb42015f6fb40b89d85ee2ac86b62d Mon Sep 17 00:00:00 2001 From: possiblepossibility <200366925+possiblepossibility@users.noreply.github.com> Date: Tue, 25 Feb 2025 12:49:25 +0100 Subject: [PATCH] wizard statues are gray (#89639) ## About The Pull Request petrified people are gray (could be more gray but i dont know how a color matrix works) ![image](https://github.com/user-attachments/assets/e66aa91b-1d7b-48ac-b35b-47c87d609183) also fixes this sort of thing but mob height is still ignored idk im no filter genie ![image](https://github.com/user-attachments/assets/686a9f10-455e-42f5-b83e-dde0afd4c416) ## Why It's Good For The Game fix ## Changelog :cl: fix: wizard statues are gray /:cl: --- .../objects/structures/petrified_statue.dm | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index 895602bb017..0b917ef12a6 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -94,10 +94,12 @@ new_statue.name = "statue of [petrified_mob.name]" if(owner) new_statue.befriend(owner) - new_statue.icon = icon - new_statue.icon_state = icon_state - new_statue.copy_overlays(src, TRUE) + new_statue.icon = 'icons/blanks/32x32.dmi' + new_statue.icon_state = "nothing" + new_statue.appearance_flags |= KEEP_TOGETHER + new_statue.copy_overlays(src, cut_old = TRUE) new_statue.atom_colours = atom_colours.Copy() + new_statue.update_atom_colour() petrified_mob.mind?.transfer_to(new_statue) to_chat(new_statue, span_userdanger("You are an animate statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved! [owner ? "Do not harm [owner], your creator" : ""].")) forceMove(new_statue) @@ -109,20 +111,20 @@ /mob/living/carbon/human/petrify(statue_timer, save_brain, colorlist) if(!isturf(loc)) return FALSE - var/obj/structure/statue/petrified/S = new(loc, src, statue_timer, save_brain) - S.name = "statue of [name]" - S.copy_overlays(src) - var/newcolor = list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)) - if(colorlist) - newcolor = colorlist - S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) + var/obj/structure/statue/petrified/new_statue = new(loc, src, statue_timer, save_brain) + new_statue.name = "statue of [name]" + new_statue.icon = 'icons/blanks/32x32.dmi' + new_statue.icon_state = "nothing" + new_statue.appearance_flags |= KEEP_TOGETHER + new_statue.copy_overlays(src, cut_old = TRUE) + new_statue.add_atom_colour(colorlist || list(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0)), FIXED_COLOUR_PRIORITY) return TRUE /mob/living/basic/pet/dog/corgi/petrify(statue_timer) if(!isturf(loc)) return FALSE - var/obj/structure/statue/petrified/S = new (loc, src, statue_timer) - S.name = "statue of a corgi" - S.icon_state = "corgi" - S.desc = "If it takes forever, I will wait for you..." + var/obj/structure/statue/petrified/new_statue = new (loc, src, statue_timer) + new_statue.name = "statue of a corgi" + new_statue.icon_state = "corgi" + new_statue.desc = "If it takes forever, I will wait for you..." return TRUE