From fc7b9663cebea65ea6d33025693d915c7d61acaa Mon Sep 17 00:00:00 2001 From: Fira Date: Thu, 21 Dec 2023 02:10:28 +0000 Subject: [PATCH 1/2] Fix Santa Hats breaking due to map camouflage --- code/modules/decorators/christmas.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/decorators/christmas.dm b/code/modules/decorators/christmas.dm index 5c4126510056..89b094318d23 100644 --- a/code/modules/decorators/christmas.dm +++ b/code/modules/decorators/christmas.dm @@ -51,6 +51,7 @@ helmet.icon_override = 'icons/mob/humans/onmob/head_0.dmi' helmet.flags_inv_hide = HIDEEARS|HIDEALLHAIR helmet.flags_marine_helmet = NO_FLAGS + helmet.flags_atom |= NO_SNOW_TYPE if(prob(50)) helmet.icon_state = "santa_hat_red" else From 7d1923336da40f72e5b8f7510afaa2a6348b4c53 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:29:02 -0800 Subject: [PATCH 2/2] NO_NAME_OVERRIDE too --- code/modules/decorators/christmas.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/decorators/christmas.dm b/code/modules/decorators/christmas.dm index 89b094318d23..6d3f52ffc0f6 100644 --- a/code/modules/decorators/christmas.dm +++ b/code/modules/decorators/christmas.dm @@ -51,7 +51,7 @@ helmet.icon_override = 'icons/mob/humans/onmob/head_0.dmi' helmet.flags_inv_hide = HIDEEARS|HIDEALLHAIR helmet.flags_marine_helmet = NO_FLAGS - helmet.flags_atom |= NO_SNOW_TYPE + helmet.flags_atom |= NO_SNOW_TYPE|NO_NAME_OVERRIDE if(prob(50)) helmet.icon_state = "santa_hat_red" else