diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index c719dfe6ad4..19864e0ba18 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1395,7 +1395,12 @@ obj/item/toy/cards/deck/syndicate/black
 /obj/item/toy/russian_revolver/attack(mob/M, mob/living/user)
 	return
 
-/obj/item/toy/russian_revolver/afterattack(atom/target, mob/user, proximity)
+/obj/item/toy/russian_revolver/afterattack(atom/target, mob/user, flag, params)
+	if(flag)
+		if(target in user.contents)
+			return
+		if(!ismob(target))
+			return
 	shoot_gun(user)
 
 /obj/item/toy/russian_revolver/proc/spin_cylinder()