13 lines
879 B
Plaintext
13 lines
879 B
Plaintext
diff a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm (rejected hunks)
|
|
@@ -244,8 +244,8 @@
|
|
// Copied from /obj/item/melee/transforming/energy/sword/attackby
|
|
/obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params)
|
|
if(istype(W, /obj/item/toy/sword))
|
|
- if((W.flags & NODROP) || (flags & NODROP))
|
|
- to_chat(user, "<span class='warning'>\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!</span>")
|
|
+ if((W.flags_1 & NODROP_1) || (flags_1 & NODROP_1))
|
|
+ to_chat(user, "<span class='warning'>\the [flags_1 & NODROP_1 ? src : W] is stuck to your hand, you can't attach it to \the [flags_1 & NODROP_1 ? W : src]!</span>")
|
|
return
|
|
else
|
|
to_chat(user, "<span class='notice'>You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.</span>")
|