From b44db8f6fe2b9cb5998ca325668fff1b155d7b45 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sun, 15 Nov 2020 21:44:56 +0100
Subject: [PATCH] [MIRROR] Mice, Rats, and Regal Rats all trigger mousetrap
 effects properly. (#1699)

* Mousetrap the movie (#54965)

I forgot to check more than ismouse() on the mousetrap side, because I am blind.
This adds the extra checks for israt() and isregalrat() to the trap triggering.

* Mice, Rats, and Regal Rats all trigger mousetrap effects properly.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
---
 code/modules/assembly/mousetrap.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index c05dbded620..e2981610769 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -118,7 +118,7 @@
 						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))
+				else if(ismouse(MM) || israt(MM) || isregalrat(MM))
 					triggered(MM)
 		else if(AM.density) // For mousetrap grenades, set off by anything heavy
 			triggered(AM)