(WIP) Yautja Weapon Gimmicks, Round Two

code/datums/keybinding/human_combat.dm

@@ -6,7 +6,7 @@
 	if(!.)
 		return
 	var/mob/user_mob = user.mob
-	return isgun(user_mob.get_held_item())
+	return isweapon(user_mob.get_held_item())
 
 /datum/keybinding/human/combat/field_strip_weapon
 	hotkey_keys = list("Unbound")
@@ -101,7 +101,7 @@
 	if(.)
 		return
 	var/mob/living/carbon/human/human = user.mob
-	var/obj/item/weapon/gun/held_item = human.get_held_item()
+	var/obj/item/weapon/held_item = human.get_held_item()
 	held_item.use_unique_action()
 	return TRUE
 

code/game/objects/items/weapons/weapon.dm

@@ -4,6 +4,12 @@
 	icon = 'icons/obj/items/weapons/weapons.dmi'
 	hitsound = "swing_hit"
 	flags_atom = FPRINT|QUICK_DRAWABLE
+	var/has_unique_action = FALSE
+
+/obj/item/weapon/Initialize(mapload, ...)
+	. = ..()
+	if(!has_unique_action)
+		verbs -= /obj/item/weapon/verb/use_unique_action
 
 /obj/item/get_examine_text(mob/user)
 	. = ..()

code/modules/cm_preds/smartdisc.dm

@@ -17,8 +17,8 @@
 	unacidable = TRUE
 	embeddable = FALSE
 
-	force = 15
-	throwforce = 25
+	force = MELEE_FORCE_WEAK
+	throwforce = MELEE_FORCE_NORMAL
 
 /obj/item/explosive/grenade/spawnergrenade/smartdisc/launch_towards(datum/launch_metadata/LM)
 	..()