From 8d58bb50bc37179314831bc5f343dcdec4d192bf Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 7 Nov 2020 01:31:17 +0100 Subject: [PATCH] [MIRROR] Fixes gondolas turning invisible when given a pet collar. (#1587) * Fixes gondolas turning invisible when given a pet collar. (#54791) Gondolas exist as a composite of overlays with a null icon_state. When you put a pet collar on a gondola, it deletes all the existing overlays, rendering the gondola invisible. I just overrode the regenerate_icons proc to do nothing for gondolas, because the parent proc is utterly useless to us and we don't need its functionality. * Fixes gondolas turning invisible when given a pet collar. Co-authored-by: Timberpoes --- code/modules/mob/living/simple_animal/friendly/gondola.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm index ef5512964da..949ee998baf 100644 --- a/code/modules/mob/living/simple_animal/friendly/gondola.dm +++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm @@ -64,6 +64,9 @@ /mob/living/simple_animal/pet/gondola/IsVocal() //Gondolas are the silent walker. return FALSE +/// Special handling for gondolas, as they don't use icon_states and instead rely on overlays. The parent of this proc deletes all our overlays, so we're overriding it. +/mob/living/simple_animal/pet/gondola/regenerate_icons() + return #undef GONDOLA_HEIGHT #undef GONDOLA_COLOR