From 8cf68e7cae3711950ae5bd01d4d581244ef0f748 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 7 Apr 2019 07:37:02 -0400 Subject: [PATCH] Fixes Russian Revolver --- code/game/objects/items/toys.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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()