From 4590d7da08ad20c4822806960b2e19757661e97e Mon Sep 17 00:00:00 2001 From: Geeves <22774890+Geevies@users.noreply.github.com> Date: Sat, 22 Aug 2026 13:36:26 +0000 Subject: [PATCH] Emissive LED Collar Fix (#23125) * Turned LED collars into an emissive, it no longer renders above everything. image --- .../modules/clothing/under/accessories/accessory.dm | 13 ++++++++++--- html/changelogs/geeves-emissive_led_collar.yml | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-emissive_led_collar.yml diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index b448ddfc86c..bd08ad13ad0 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -1397,16 +1397,24 @@ icon = 'icons/obj/item/clothing/accessory/led_collar.dmi' icon_state = "led_collar" item_state = "led_collar" - plane = ABOVE_LIGHTING_PLANE contained_sprite = TRUE slot = ACCESSORY_SLOT_UTILITY_MINOR + var/mutable_appearance/inventory_emissive /obj/item/clothing/accessory/led_collar/Initialize() . = ..() color = pick("#00FFFF", "#FF0000", "#FF00FF", "#FF6600", "#CC00CC") + AddOverlays(emissive_appearance(icon, icon_state)) set_light_range_power_color(0.5, 0.4, color) set_light_on(TRUE) +/obj/item/clothing/accessory/led_collar/get_inv_overlay(mob/M, force = FALSE) + var/image/I = ..() + if(!inventory_emissive) + inventory_emissive = emissive_appearance(I.icon, I.icon_state) + I.AddOverlays(inventory_emissive) + return I + /// Update the light mode to one used by accessories when it gets attached. /obj/item/clothing/accessory/led_collar/on_attached(obj/item/clothing/S, mob/user) . = ..() @@ -1426,8 +1434,7 @@ /obj/item/clothing/accessory/led_collar/get_accessory_mob_overlay(var/mob/living/carbon/human/H, var/force = FALSE) var/image/I = ..() - I.plane = ABOVE_LIGHTING_PLANE - I.appearance_flags |= KEEP_APART + I.AddOverlays(emissive_appearance(I.icon, I.icon_state)) return I /obj/item/clothing/accessory/newgibson_uraniumglass_necklace diff --git a/html/changelogs/geeves-emissive_led_collar.yml b/html/changelogs/geeves-emissive_led_collar.yml new file mode 100644 index 00000000000..855c6522e96 --- /dev/null +++ b/html/changelogs/geeves-emissive_led_collar.yml @@ -0,0 +1,4 @@ +author: Geeves +delete-after: True +changes: + - bugfix: "Turned LED collars into an emissive, it no longer renders above everything."