From 542f9c63c7cca95980a1e1ed2f234ca6c1aa4c5f Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 13 Mar 2018 15:48:26 +0300 Subject: [PATCH] Adds check if item is sharp So you won't get false negative mood for playing with plushes. --- modular_citadel/code/datums/mood_events/moodular.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/datums/mood_events/moodular.dm b/modular_citadel/code/datums/mood_events/moodular.dm index bf32b9561c..b764c0027e 100644 --- a/modular_citadel/code/datums/mood_events/moodular.dm +++ b/modular_citadel/code/datums/mood_events/moodular.dm @@ -29,10 +29,11 @@ // Jack the Ripper starring plush /obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params) . = ..() - if(!grenade) - GET_COMPONENT_FROM(mood, /datum/component/mood, user) - if(mood) - mood.add_event("plushjack", /datum/mood_event/plushjack) + if(I.is_sharp()) + if(!grenade) + GET_COMPONENT_FROM(mood, /datum/component/mood, user) + if(mood) + mood.add_event("plushjack", /datum/mood_event/plushjack) // plush playing (plush-on-plush action) if(istype(I, /obj/item/toy/plush))