TGS Test Merge (#5392)

cmss13-devs · Feb 18, 2024 · d76e37f · d76e37f
2 parents 2f43216 + f164a72
commit d76e37f
Show file tree

Hide file tree

Showing 9 changed files with 181 additions and 113 deletions.
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
@@ -254,7 +254,7 @@
 			return 1
 
 		if("Use unique action")
-			var/obj/item/weapon/gun/held_item = user.get_held_item()
+			var/obj/item/weapon/held_item = user.get_held_item()
 			if(istype(held_item))
 				held_item.use_unique_action()
 			return 1

diff --git a/code/datums/keybinding/human_combat.dm b/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
 

diff --git a/code/game/objects/items/weapons/weapon.dm b/code/game/objects/items/weapons/weapon.dm
@@ -3,6 +3,12 @@
 	name = "weapon"
 	icon = 'icons/obj/items/weapons/weapons.dmi'
 	hitsound = "swing_hit"
+	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)
 	. = ..()

diff --git a/code/modules/cm_preds/smartdisc.dm b/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)
 	..()