Merge pull request #46 from ARF-SS13/drink-transfer-amount-reflavor-&…

…-pillows Let the touching begin
ARF-SS13 · Jul 21, 2024 · 7a86108 · 7a86108
2 parents dadf10b + 8a8d951
commit 7a86108
Show file tree

Hide file tree

Showing 8 changed files with 1,211 additions and 30 deletions.
diff --git a/code/_onclick/hud/screen_objects/character_actions.dm b/code/_onclick/hud/screen_objects/character_actions.dm
@@ -89,7 +89,7 @@
 			I = H.get_active_held_item()
 			I?.melee_attack_chain(H, H, params)
 
-		else if(istype(I, /obj/item/hand_item/healable/))
+		else if(istype(I, /obj/item/hand_item/tactile/))
 			I = H.get_active_held_item()
 			I?.melee_attack_chain(H, H, params)