diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java
new file mode 100644
index 000000000..d3ff9c578
--- /dev/null
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java
@@ -0,0 +1,96 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015  Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2015 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.levels.traps;
+
+import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
+import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
+import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
+import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
+import com.shatteredpixel.shatteredpixeldungeon.items.Item;
+import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon;
+import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Knuckles;
+import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.TrapSprite;
+import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
+import com.watabou.noosa.audio.Sample;
+
+public class DisarmingTrap extends Trap{
+
+	{
+		name = "Disarming trap";
+		color = TrapSprite.RED;
+		shape = TrapSprite.LARGE_DOT;
+	}
+
+	@Override
+	public void activate() {
+		Heap heap = Dungeon.level.heaps.get( pos );
+
+		if (heap != null){
+			int cell = Dungeon.level.randomRespawnCell();
+
+			if (cell != -1) {
+				Item item = heap.pickUp();
+				Dungeon.level.drop( item, cell ).seen = true;
+				for (int i : Level.NEIGHBOURS9)
+					Dungeon.level.visited[cell+i] = true;
+				Dungeon.observe();
+
+				Sample.INSTANCE.play(Assets.SND_TELEPORT);
+				CellEmitter.get(pos).burst(Speck.factory(Speck.LIGHT), 4);
+			}
+		}
+
+		if (Dungeon.hero.pos == pos){
+			Hero hero = Dungeon.hero;
+			KindOfWeapon weapon = hero.belongings.weapon;
+
+			if (weapon != null && !(weapon instanceof Knuckles) && !weapon.cursed) {
+
+				int cell = Dungeon.level.randomRespawnCell();
+				if (cell != -1) {
+					hero.belongings.weapon = null;
+					Dungeon.quickslot.clearItem(weapon);
+					weapon.updateQuickslot();
+
+					Dungeon.level.drop(weapon, cell).seen = true;
+					for (int i : Level.NEIGHBOURS9)
+						Dungeon.level.visited[cell+i] = true;
+					Dungeon.observe();
+
+					GLog.w("Your weapon is teleported away!");
+
+					Sample.INSTANCE.play(Assets.SND_TELEPORT);
+					CellEmitter.get(pos).burst(Speck.factory(Speck.LIGHT), 4);
+
+				}
+
+			}
+		}
+	}
+
+	@Override
+	public String desc() {
+		return "This trap contains very specific teleportation magic, which will warp the weapon of its victim to some other location.";
+	}
+}