Merge branch 'master' into cleanupTwo

2026-08-29 15:08:34 +01:00 · 2016-04-21 11:41:32 +03:00
parent df5a0d7941 a1faf6e497
commit 98badae45f
386 changed files with 7149 additions and 4820 deletions
@@ -68,6 +68,12 @@
 /obj/item/weapon/material/twohanded/update_icon()
 	icon_state = "[base_icon][wielded]"
 	item_state = icon_state
+	
+/obj/item/weapon/material/twohanded/dropped()
+	..()
+	if(wielded)
+		spawn(0)
+			update_held_icon()

 /*
 * Fireaxe