Merge pull request #5366 from Superlagg/mew-mew-kissy-booty

Ports the grope kiss MERP
ARF-SS13 · Sep 24, 2024 · b7b9510 · b7b9510
2 parents 9165d44 + 0e12e4f
commit b7b9510
Show file tree

Hide file tree

Showing 8 changed files with 3,182 additions and 26 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)