cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Mice, Rats, and Regal Rats all trigger mousetrap effects properly. (#1699)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2020-11-15 20:44:56 +00:00
committed by GitHub
co-authored by ArcaneMusic
parent c5aa13338a
commit b44db8f6fe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/mousetrap.dm
+1 -1
View File
@@ -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)