whew

2020-07-07 20:48:54 -07:00
parent a738d52740
commit 6ee63f66aa
201 changed files with 309 additions and 325 deletions
@@ -9,7 +9,7 @@
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	//item_flags = NODROP //Tips their hat!

-/obj/item/clothing/head/hattip/attack_hand(mob/user)
+/obj/item/clothing/head/hattip/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(iscarbon(user))
 		var/mob/living/carbon/C = user
 		if(is_ninja(C))
@@ -9,7 +9,7 @@
 	w_class = WEIGHT_CLASS_TINY

 //A little janky with pockets
-/obj/item/fermichem/pHbooklet/attack_hand(mob/user)
+/obj/item/fermichem/pHbooklet/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(user.get_held_index_of_item(src))//Does this check pockets too..?
 		if(numberOfPages == 50)
 			icon_state = "pHbookletOpen"