Merge branch 'master' into familyport

2021-10-28 14:34:20 -04:00
parent 46e5372f10 e469f74dac
commit c80d65df73
31 changed files with 165 additions and 114 deletions
@@ -235,6 +235,9 @@
 	icon_state = "crusher-bone"
 	item_state = "crusher0-bone"

+/obj/item/kinetic_crusher/glaive/bone/update_icon_state()
+	item_state = "crusher[wielded]-bone"
+
 //destablizing force
 /obj/item/projectile/destabilizer
 	name = "destabilizing force"