From 09bb9cbcb9ce7a76944133540c4cc305a8d04ebf Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Mon, 6 Jun 2016 15:02:34 -0700 Subject: [PATCH] fixes up some toy sword checks (#18252) removes broken check. Fixes https://github.com/tgstation/tgstation/issues/18248 adds a missing return to account for nodrop items. --- code/game/objects/items/toys.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 24f20ce70c5..773dbe7c4e4 100755 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -239,12 +239,9 @@ // Copied from /obj/item/weapon/melee/energy/sword/attackby /obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user, params) if(istype(W, /obj/item/toy/sword)) - if(W == src) - user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?" - if(ishuman(user)) - user.adjustBrainLoss(10) - else if((W.flags & NODROP) || (flags & NODROP)) + if((W.flags & NODROP) || (flags & NODROP)) user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!" + return else user << "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool." var/obj/item/weapon/twohanded/dualsaber/toy/newSaber = new /obj/item/weapon/twohanded/dualsaber/toy(user.loc)