TGS Test Merge (#5392)

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)
 	..()

code/modules/cm_preds/yaut_hudprocs.dm

@@ -85,7 +85,7 @@
 	// List all possible preys
 	// We only target living humans and xenos
 	var/list/target_list = list()
-	for(var/mob/living/prey in view(7, usr.client))
+	for(var/mob/living/prey in view(7, usr.client.eye))
 		if((ishuman_strict(prey) || isxeno(prey)) && prey.stat != DEAD)
 			target_list += prey
 
@@ -149,7 +149,7 @@
 		return
 
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if(ishuman_strict(target) && (target.stat != DEAD))
 			target_list += target
 
@@ -186,7 +186,7 @@
 		return
 
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if(ishuman_strict(target) && (target.stat != DEAD))
 			if(target.hunter_data.honored)
 				target_list += target
@@ -223,7 +223,7 @@
 		return
 
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if((ishuman_strict(target) || isxeno(target)) && target.stat != DEAD)
 			target_list += target
 
@@ -263,7 +263,7 @@
 		return
 
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if((ishuman_strict(target) || isxeno(target)) && target.stat != DEAD)
 			if(target.job != "Predalien" && target.job != "Predalien Larva")
 				if(target.hunter_data.dishonored)
@@ -304,7 +304,7 @@
 		return
 
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if((ishuman_strict(target) && target.stat != DEAD))
 			target_list += target
 
@@ -335,7 +335,7 @@
 		return
 
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if((ishuman_strict(target) && target.stat != DEAD))
 			if(target.hunter_data.gear)
 				target_list += target
@@ -376,7 +376,7 @@
 	// List all possible targets
 	// We only target living humans
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if(ishuman_strict(target) && target.stat != DEAD)
 			target_list += target
 
@@ -415,7 +415,7 @@
 	// List all possible targets
 	// We only target living humans
 	var/list/target_list = list()
-	for(var/mob/living/carbon/target in view(7, usr.client))
+	for(var/mob/living/carbon/target in view(7, usr.client.eye))
 		if(ishuman_strict(target) && target.stat != DEAD)
 			if(target.hunter_data.thralled)
 				target_list += target