Merge branch 'shiptest-ss13:master' into beta-dev

CeladonSS13 · Mar 25, 2024 · 35955ca · 35955ca
2 parents 85f8520 + 1570ccf
commit 35955ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
@@ -65,7 +65,7 @@
 
 
 /obj/item/dualsaber/update_icon_state()
-	icon_state = wielded ? "dualsaber[saber_color][wielded]" : "dualsaber0"
+	icon_state = wielded ? "dualsaber[saber_color]" : "dualsaber"
 	return ..()
 
 /obj/item/dualsaber/Initialize()

diff --git a/html/changelogs/AutoChangeLog-pr-2855.yml b/html/changelogs/AutoChangeLog-pr-2855.yml
@@ -0,0 +1,4 @@
+author: meemofcourse
+changes:
+  - {bugfix: Dual sabers should no longer be invisible}
+delete-after: true