From 684d4d12e6abe686d7ef962365cd973806577671 Mon Sep 17 00:00:00 2001 From: nevimer Date: Mon, 15 Dec 2025 18:16:03 -0500 Subject: [PATCH] Revert "Wardens can alt-click-reskin their gloves to match their formal attire (#94382)" This reverts commit c423d938d3e4c2252257f18f4e6474065f284cac. --- code/datums/components/reskinnable_atom.dm | 10 ++----- code/datums/martial/kaza_ruk.dm | 33 ---------------------- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/code/datums/components/reskinnable_atom.dm b/code/datums/components/reskinnable_atom.dm index 84566458593..a14563bd630 100644 --- a/code/datums/components/reskinnable_atom.dm +++ b/code/datums/components/reskinnable_atom.dm @@ -62,13 +62,6 @@ var/obj/item/item_clear_from = clear_from RESET_INITIAL_IF_SET(item_clear_from, inhand_icon_state, new_icon_state) -/// Gets a preview image for this skin based on the given atom's icon and icon_state -/datum/atom_skin/proc/get_preview_icon(atom/for_atom) - return image( - icon = new_icon || for_atom.icon, - icon_state = new_icon_state || for_atom.icon_state, - ) - /** * ### Reskinnable atoms * @@ -180,7 +173,8 @@ var/list/items = list() for(var/reskin_name, reskin_typepath in get_skins_by_name()) - items[reskin_name] = GLOB.atom_skins[reskin_typepath].get_preview_icon(atom_parent) + var/datum/atom_skin/reskin = GLOB.atom_skins[reskin_typepath] + items[reskin_name] = image(icon = reskin.new_icon || atom_parent.icon, icon_state = reskin.new_icon_state || atom_parent.icon_state) sort_list(items) diff --git a/code/datums/martial/kaza_ruk.dm b/code/datums/martial/kaza_ruk.dm index 1f7b0625dc0..576cd9f5088 100644 --- a/code/datums/martial/kaza_ruk.dm +++ b/code/datums/martial/kaza_ruk.dm @@ -270,35 +270,6 @@ . = ..() AddComponent(/datum/component/martial_art_giver, /datum/martial_art/kaza_ruk) -/datum/atom_skin/kaza_ruk - abstract_type = /datum/atom_skin/kaza_ruk - reset_missing = FALSE - /// Color (/matrix) applied with the skin. If null, no color is applied. - var/reskin_color - -/datum/atom_skin/kaza_ruk/apply(atom/apply_to) - . = ..() - if(reskin_color) - apply_to.add_atom_colour(color_matrix_filter(reskin_color), FIXED_COLOUR_PRIORITY) - -/datum/atom_skin/kaza_ruk/clear_skin(atom/clear_from) - . = ..() - if(reskin_color) - clear_from.remove_atom_colour(FIXED_COLOUR_PRIORITY, reskin_color) - -/datum/atom_skin/kaza_ruk/get_preview_icon(atom/for_atom) - var/image/generated = ..() - if(reskin_color) - generated.add_filter("preview_filter", 1, color_matrix_filter(reskin_color)) - return generated - -/datum/atom_skin/kaza_ruk/red - preview_name = "Red" - -/datum/atom_skin/kaza_ruk/blue - preview_name = "Blue" - reskin_color = list(0.33, 0.33, 0.33, 0, 0, 0, 0, 0, 1) - /obj/item/clothing/gloves/kaza_ruk/sec//more obviously named, given to sec name = "kaza ruk gloves" desc = "These gloves seem to guide you through a non-lizardperson friendly variant of the Tiziran martial art, Kaza Ruk. \ @@ -311,10 +282,6 @@ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE -/obj/item/clothing/gloves/kaza_ruk/sec/Initialize(mapload) - . = ..() - AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kaza_ruk, infinite = TRUE) - /obj/item/clothing/gloves/kaza_ruk/combatglovesplus name = "combat gloves plus" desc = "These tactical gloves are fireproof and electrically insulated. These gloves seem to guide you through a non-lizardperson friendly variant of the Tiziran martial art, Kaza Ruk."