From d5f7d12405831ab40bd5541d3b3a8da97c844659 Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Sun, 25 Jan 2026 23:38:33 -0600
Subject: [PATCH] Fix alt stunsword skin (#94979)

## About The Pull Request

The actual icon state had the incorrect name

It also changed the worn icon state when it shouldn't

## Changelog

:cl: Melbert
fix: Fix alt stunsword skin
/:cl:
---
 code/datums/components/reskinnable_atom.dm    |   5 ++++-
 .../objects/items/weaponry/melee/baton.dm     |   1 +
 icons/obj/weapons/baton.dmi                   | Bin 7384 -> 7380 bytes
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/datums/components/reskinnable_atom.dm b/code/datums/components/reskinnable_atom.dm
index 5f4847eafcb..ab46ec0c329 100644
--- a/code/datums/components/reskinnable_atom.dm
+++ b/code/datums/components/reskinnable_atom.dm
@@ -13,6 +13,8 @@
 	var/change_base_icon_state = FALSE
 	/// If true, changing the reskin also changes the inhand_icon_state of the atom
 	var/change_inhand_icon_state = FALSE
+	/// If true, changing the reskin also changes the worn_icon_state of the atom
+	var/change_worn_icon_state = TRUE
 	/// If true, unset vars are reset to their original values when applying this skin
 	var/reset_missing = TRUE
 
@@ -86,7 +88,8 @@
 		if(!item_apply_to.greyscale_config_inhand_left)
 			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, lefthand_file, new_lefthand_file, reset_missing)
 			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, righthand_file, new_righthand_file, reset_missing)
-		APPLY_VAR_OR_RESET_INITIAL(item_apply_to, worn_icon_state, new_icon_state, reset_missing)
+		if(change_worn_icon_state)
+			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, worn_icon_state, new_icon_state, reset_missing)
 		if(change_inhand_icon_state || new_inhand_icon_state)
 			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, inhand_icon_state, new_inhand_icon_state || new_icon_state, reset_missing)
 
diff --git a/code/game/objects/items/weaponry/melee/baton.dm b/code/game/objects/items/weaponry/melee/baton.dm
index 639e3d2f020..07a40afabdc 100644
--- a/code/game/objects/items/weaponry/melee/baton.dm
+++ b/code/game/objects/items/weaponry/melee/baton.dm
@@ -758,6 +758,7 @@
 	abstract_type = /datum/atom_skin/stunsword
 	change_inhand_icon_state = TRUE
 	change_base_icon_state = TRUE
+	change_worn_icon_state = FALSE
 
 /datum/atom_skin/stunsword/default
 	preview_name = "Default"
diff --git a/icons/obj/weapons/baton.dmi b/icons/obj/weapons/baton.dmi
index c9dc238a651bb00747b893c65fe6c9847c26b148..181c635c72f5c2897e9e5536190150b2435921fb 100644
GIT binary patch
delta 295
zcmV+?0oeZ7In+6jB!3WkR9JLGWpiV4X>fFDZ*Bkpc$}4y!EVDK5Jb=L6|3Zms^VJh
ziA&`u@*(*Ji{Pz|N<jkb#QpjnT%~E#I3O+{&CDBi*YLX8)_bUSH676h?JNi=A08<=
z>NfTu;HjXbN8R;teuO9^f`C;-g9jO%T~X3%A3y-7<ju<uoPY1v$|g&E@Xmf>wjmD^
zv>DN78}cBXGi|0k1)!XbUaIJPleUPzhMSO*k`|4eKmcc)adsJEWC&U%B10VP%#teV
z@y0q|E_fv?&gZ|N45W1mjk#;EgH^qJACiU5lrBBpl_q^C9G!0$XZZYUhMZk3?i`Z=
tOq}440WJD&${Q$JEEN4t%f~O*Uc+WzLA9&t7j(sd;|=VB_On3&mmAhYi|7CV

delta 299
zcmV+`0o4A~IoLUnB!3ioR9JLGWpiV4X>fFDZ*Bkpc$}4y!EVDK5Jb=BD^|&sRwcF4
z6PL<S<wNod7J;peN<jkb)cyJ%T%~DJ*B~w+&CFYN*6_T0sSi-?Ycik@+F9UG-anAy
zq*d&I!{de&9qP7=(<4L?5jd<O8a#^V?1~gh`v4pmDPFyJ$A9U5t8B8wNAK(>W*hP#
zL7M@6wjmGFI-@e>DFEqg^g>4Go3tXX4YQDv6bg+PfdiwAGI|+eL<m|YB17!$#1b;<
zVW!Tf3tmY#=kr%k2GTl-#w;3aZ)GRm`eb1<rb|B-rAZ$OC+F3_JKX--A)`0Nontb9
xi5vVephe$~cOP>#ZLf-+AM!gX8@({{8g_>Ys(nqq011nK5}NaX^Rqnxmm6P`i825H