From d818e4a232e4038c7d7b68463c242152f68113eb Mon Sep 17 00:00:00 2001
From: Mervill <mervills.email@gmail.com>
Date: Tue, 17 Jan 2017 11:57:36 -0800
Subject: [PATCH] Mousetrap will kill mice again, mousetraps description is a
 bit clearer (#23022)

* mousetrap will kill mice again, mousetraps description is a bit clearer

* readds the assembly examine text, now explicitly indicates the "not armed" state
---
 code/modules/assembly/mousetrap.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 70612872db3..b5d5e339433 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -11,7 +11,9 @@
 /obj/item/device/assembly/mousetrap/examine(mob/user)
 	..()
 	if(armed)
-		user << "It looks like it's armed."
+		user << "The mousetrap is armed!"
+	else
+		user << "The mousetrap is not armed."
 
 /obj/item/device/assembly/mousetrap/activate()
 	if(..())
@@ -113,6 +115,8 @@
 						triggered(H)
 						H.visible_message("<span class='warning'>[H] accidentally steps on [src].</span>", \
 										  "<span class='warning'>You accidentally step on [src]</span>")
+				else if(ismouse(MM))
+					triggered(MM)
 		else if(AM.density) // For mousetrap grenades, set off by anything heavy
 			triggered(AM)
 	..()