Merge pull request #10212 from Ghommie/Ghommie-cit471

Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
parent 1fdce63b00 395457f7ef
commit d562a5ba27
56 changed files with 423 additions and 264 deletions
@@ -185,9 +185,8 @@
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 	block_chance = 50

-/obj/item/twohanded/bostaff/update_icon()
+/obj/item/twohanded/bostaff/update_icon_state()
 	icon_state = "bostaff[wielded]"
-	return

 /obj/item/twohanded/bostaff/attack(mob/target, mob/living/user)
 	add_fingerprint(user)