Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java

src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java

@@ -33,8 +33,7 @@ public class ConfusionGas extends Blob {
         Char ch;
         for (int i=0; i < LENGTH; i++) {
             if (cur[i] > 0 && (ch = Actor.findChar( i )) != null) {
-                if (!ch.immunities().contains(this.getClass()))
-                    Buff.prolong( ch, Vertigo.class, 1 );
+                Buff.prolong( ch, Vertigo.class, 2 );
             }
         }
     }

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Drowsy.java

@@ -29,7 +29,7 @@ public class Drowsy extends Buff {
     }
 
     public boolean attachTo( Char target ) {
-        if (super.attachTo(target)) {
+        if (super.attachTo(target) && !target.immunities().contains(Sleep.class)) {
             if (cooldown() == 0)
                 spend(Random.Int(3, 6));
             return true;

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java

@@ -30,7 +30,7 @@ public class MagicalSleep extends Buff {
 
     @Override
     public boolean attachTo( Char target ) {
-        if (super.attachTo( target )) {
+        if (super.attachTo( target ) && !target.immunities().contains(Sleep.class)) {
 
             if (target instanceof Hero)
                 if (target.HP == target.HT) {

src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -658,6 +658,7 @@ public class Hero extends Char {
 					Camera.main.shake( 1, 0.5f );
 					break;
 				case SKELETON:
+                case REMAINS:
 					break;
 				default:
 					Sample.INSTANCE.play( Assets.SND_UNLOCK );
@@ -1318,7 +1319,7 @@ public class Hero extends Char {
 			}
 			
 			Heap heap = Dungeon.level.heaps.get( ((HeroAction.OpenChest)curAction).dst ); 
-			if (heap.type == Type.SKELETON) {
+			if (heap.type == Type.SKELETON || heap.type == Type.REMAINS) {
 				Sample.INSTANCE.play( Assets.SND_BONES );
 			}
 			heap.open( this );