Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.

Triggered mousetraps and dead mice will be moved back to the top layer.

Monkeys will no longer move randomly while being pulled.

code/modules/assembly/mousetrap.dm

@@ -45,6 +45,7 @@
 			visible_message("\red <b>SPLAT!</b>")
 			M.splat()
 		playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
+		layer = MOB_LAYER - 0.2
 		armed = 0
 		update_icon()
 		pulse(0)
@@ -112,4 +113,16 @@
 
 /obj/item/device/assembly/mousetrap/armed
 	icon_state = "mousetraparmed"
-	armed = 1
+	armed = 1
+
+
+/obj/item/device/assembly/mousetrap/verb/hide_under()
+	set src in oview(1)
+	set name = "Hide"
+	set category = "Object"
+
+	if(usr.stat)
+		return
+
+	layer = TURF_LAYER+0.2
+	usr << "<span class='notice'>You hide [src].</span>"

code/modules/mob/living/carbon/monkey/life.dm

@@ -67,8 +67,18 @@
 		G.process()
 
 	if(!client && stat == CONSCIOUS)
+
 		if(prob(33) && canmove && isturf(loc))
-			step(src, pick(cardinal))
+
+			var/isBeingPulled = 0
+
+			for(var/mob/M in range(src, 1)) //won't move if being pulled
+				if(M.pulling == src)
+					isBeingPulled = 1
+
+			if(isBeingPulled == 0)
+				step(src, pick(cardinal))
+
 		if(prob(1))
 			emote(pick("scratch","jump","roll","tail"))
 

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -63,6 +63,7 @@
 	src.stat = DEAD
 	src.icon_dead = "mouse_[body_color]_splat"
 	src.icon_state = "mouse_[body_color]_splat"
+	layer = MOB_LAYER
 	if(client)
 		client.time_died_as_mouse = world.time
 
@@ -179,6 +180,7 @@
 	..()
 
 /mob/living/simple_animal/mouse/Die()
+	layer = MOB_LAYER
 	if(client)
 		client.time_died_as_mouse = world.time
 	..()

html/changelog.html

@@ -56,6 +56,15 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
+
+<div class='commit sansserif'>
+	<h2 class='date'>18 December 2013</h2>
+	<h3 class='author'>RavingManiac updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>Mousetraps can now be "hidden" through the right-click menu. This makes them go under tables, clutter and the like. The filthy rodents will never see it coming!</li>
+		<li class='tweak'>Monkeys will no longer move randomly while being pulled.</li>
+	</ul>
+</div>
 
 <div class='commit sansserif'>
 	<h2 class='date'>24 November 2013</h2>