Made mousetraps an assembly.

The path has changed from /obj/item/weapon/mousetrap to /obj/item/device/assembly/mousetrap
Deleted mousetraps.dm, and removed the original define from weapon.dm

Added a new /obj/item proc, on_found(). It's called when pockets are emptied, and whenever someone looks in a storage item. Currently used only by mousetraps and facehuggers~

Updated the map with path changes.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4969 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/items.dm

@@ -341,6 +341,10 @@
 /obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj)
 	return
 
+// called when "found" in pockets and storage items. Returns 1 if the search should end.
+/obj/item/proc/on_found(mob/finder as mob)
+	return
+
 // called after an item is placed in an equipment slot
 // user is mob that equipped it
 // slot uses the slot_X defines found in setup.dm

code/game/objects/items/weapons/mousetraps.dm

@@ -1,94 +0,0 @@
-/obj/item/weapon/mousetrap/examine()
-	set src in oview(12)
-	..()
-	if(armed)
-		usr << "\red It looks like it's armed."
-
-/obj/item/weapon/mousetrap/proc/triggered(mob/target as mob, var/type = "feet")
-	if(!armed)
-		return
-	var/datum/organ/external/affecting = null
-	if(ishuman(target))
-		var/mob/living/carbon/human/H = target
-		switch(type)
-			if("feet")
-				if(!H.shoes)
-					affecting = H.get_organ(pick("l_leg", "r_leg"))
-					H.Weaken(3)
-			if("l_hand", "r_hand")
-				if(!H.gloves)
-					affecting = H.get_organ(type)
-					H.Stun(3)
-		if(affecting)
-			if(affecting.take_damage(1, 0))
-				H.UpdateDamageIcon()
-			H.updatehealth()
-	else if(ismouse(target))
-		var/mob/living/simple_animal/mouse/M = target
-		src.visible_message("\red <b>SPLAT!</b>")
-		M.splat()
-	playsound(target.loc, 'sound/effects/snap.ogg', 50, 1)
-	icon_state = "mousetrap"
-	armed = 0
-/*
-	else if (ismouse(target))
-		target.adjustBruteLoss(100)
-*/
-
-/obj/item/weapon/mousetrap/attack_self(mob/living/user as mob)
-	if(!armed)
-		icon_state = "mousetraparmed"
-		user << "\blue You arm the mousetrap."
-	else
-		icon_state = "mousetrap"
-		if(( (user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50)))
-			var/which_hand = "l_hand"
-			if(!user.hand)
-				which_hand = "r_hand"
-			src.triggered(user, which_hand)
-			user << "\red <B>You accidentally trigger the mousetrap!</B>"
-			for(var/mob/O in viewers(user, null))
-				if(O == user)
-					continue
-				O.show_message("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>", 1)
-			return
-		user << "\blue You disarm the mousetrap."
-	armed = !armed
-	playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
-
-/obj/item/weapon/mousetrap/attack_hand(mob/living/user as mob)
-	if(armed)
-		if(( (user.getBrainLoss() >= 60 || CLUMSY in user.mutations)) && prob(50))
-			var/which_hand = "l_hand"
-			if(!user.hand)
-				which_hand = "r_hand"
-			src.triggered(user, which_hand)
-			user << "\red <B>You accidentally trigger the mousetrap!</B>"
-			for(var/mob/O in viewers(user, null))
-				if(O == user)
-					continue
-				O.show_message("\red <B>[user] accidentally sets off the mousetrap, breaking their fingers.</B>", 1)
-			return
-	..()
-
-/obj/item/weapon/mousetrap/HasEntered(AM as mob|obj)
-	if(armed)
-		if(ishuman(AM))
-			var/mob/living/carbon/H = AM
-			if(H.m_intent == "run")
-				src.triggered(H)
-				H << "\red <B>You accidentally step on the mousetrap!</B>"
-				for(var/mob/O in viewers(H, null))
-					if(O == H)
-						continue
-					O.show_message("\red <B>[H] accidentally steps on the mousetrap.</B>", 1)
-		if(ismouse(AM))
-			triggered(AM)
-	..()
-
-/obj/item/weapon/mousetrap/hitby(A as mob|obj)
-	if(!armed)
-		return ..()
-	for(var/mob/O in viewers(src, null))
-		O.show_message("\red <B>The mousetrap is triggered by [A].</B>", 1)
-	src.triggered(null)

code/game/objects/items/weapons/storage/storage.dm

@@ -31,18 +31,12 @@
 	return L
 
 /obj/item/weapon/storage/proc/show_to(mob/user as mob)
+	if(user.s_active != src)
+		for(var/obj/item/I in src)
+			if(I.on_found(user))
+				return
 	if(user.s_active)
 		user.s_active.hide_from(user)
-	for(var/obj/item/weapon/mousetrap/MT in src)
-		if(MT.armed)
-			for(var/mob/O in viewers(user, null))
-				if(O == user)
-					user.show_message(text("\red <B>You reach into the [src.name], but there was a live mousetrap in there!</B>"), 1)
-				else
-					user.show_message(text("\red <B>[user] reaches into the [src.name] and sets off a hidden mousetrap!</B>"), 1)
-			user.drop_from_inventory(MT)
-			MT.triggered(user, user.hand ? "l_hand" : "r_hand")
-			return
 	user.client.screen -= src.boxes
 	user.client.screen -= src.closer
 	user.client.screen -= src.contents
@@ -499,12 +493,12 @@
 	return
 
 /obj/item/weapon/storage/mousetraps/New()
-	new /obj/item/weapon/mousetrap( src )
-	new /obj/item/weapon/mousetrap( src )
-	new /obj/item/weapon/mousetrap( src )
-	new /obj/item/weapon/mousetrap( src )
-	new /obj/item/weapon/mousetrap( src )
-	new /obj/item/weapon/mousetrap( src )
+	new /obj/item/device/assembly/mousetrap( src )
+	new /obj/item/device/assembly/mousetrap( src )
+	new /obj/item/device/assembly/mousetrap( src )
+	new /obj/item/device/assembly/mousetrap( src )
+	new /obj/item/device/assembly/mousetrap( src )
+	new /obj/item/device/assembly/mousetrap( src )
 	..()
 	return