Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE

code/game/objects/structures/crates_lockers/closets.dm

@@ -180,11 +180,11 @@
 		if(istype(W, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/WT = W
 			user << "<span class='notice'>You begin cutting the [src] apart...</span>"
-			playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
+			playsound(loc, 'sound/items/Welder.ogg', 40, 1)
 			if(do_after(user,40,5,1))
 				if(src.opened)
 					if(WT.remove_fuel(0,user))
-						playsound(loc, 'sound/items/welder.ogg', 50, 1)
+						playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
 						new /obj/item/stack/sheet/metal(src.loc)
 						for(var/mob/M in viewers(src))
 							M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)

code/game/objects/structures/door_assembly.dm

@@ -457,7 +457,6 @@ obj/structure/door_assembly/New()
 						new M(get_turf(src))
 				qdel(src)
 		else
-			user << "<span class='warning'> You need more welding fuel to dissassemble the airlock assembly.</span>"
 			return
 
 	else if(istype(W, /obj/item/weapon/wrench) && !anchored )

code/game/objects/structures/false_walls.dm

@@ -118,7 +118,7 @@
 		user << "<span class='warning'>You can't reach, close it first!</span>"
 
 	if(istype(W, /obj/item/weapon/pickaxe/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/diamonddrill) || istype(W, /obj/item/weapon/melee/energy/blade))
-		dismantle()
+		dismantle(user)
 
 /obj/structure/falsewall/proc/dismantle(mob/user)
 	user.visible_message("<span class='notice'>[user] dismantles the false wall.</span>", "<span class='warning'>You dismantle the false wall.</span>")

code/game/objects/structures/lattice.dm

@@ -59,9 +59,8 @@
 		var/obj/item/weapon/weldingtool/WT = C
 		if(WT.remove_fuel(0, user))
 			user << "<span class='notice'>Slicing lattice joints ...</span>"
-		new /obj/item/stack/rods(src.loc)
-		qdel(src)
-
+			new /obj/item/stack/rods(src.loc)
+			qdel(src)
 	return
 
 /obj/structure/lattice/proc/updateOverlays()

code/game/objects/structures/mineral_doors.dm

@@ -249,25 +249,3 @@
 		for(var/i = 1, i <= oreAmount, i++)
 			new/obj/item/stack/sheet/mineral/wood(get_turf(src))
 	qdel(src)
-
-/obj/structure/mineral_door/resin
-	mineralType = "resin"
-	hardness = 1
-	close_delay = 100
-	openSound = 'sound/effects/attackblob.ogg'
-	closeSound = 'sound/effects/attackblob.ogg'
-
-/obj/structure/mineral_door/resin/TryToSwitchState(atom/user)
-	if(isalien(user))
-		return ..()
-
-/obj/structure/mineral_door/resin/Dismantle(devastated = 0)
-	qdel(src)
-
-/obj/structure/mineral_door/resin/CheckHardness()
-	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
-	..()
-
-/obj/structure/mineral_door/resin/BlockSuperconductivity()
-	if(opacity)
-		return 1

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -13,6 +13,7 @@
 		"[user.name] pulls you free from the gelatinous resin.",\
 		"You hear squelching...")
 	buckled_mob.pixel_y = 0
+	buckled_mob.pixel_x = 0
 	unbuckle()
 
 /obj/structure/stool/bed/nest/unbuckle_myself(mob/user as mob)
@@ -23,6 +24,7 @@
 	spawn(600)
 		if(user && buckled_mob && user.buckled == src)
 			buckled_mob.pixel_y = 0
+			buckled_mob.pixel_x = 0
 			unbuckle()
 
 /obj/structure/stool/bed/nest/buckle_mob(mob/M as mob, mob/user as mob)
@@ -47,11 +49,17 @@
 	M.loc = src.loc
 	M.dir = src.dir
 	M.update_canmove()
-	M.pixel_y = 6
+	M.pixel_y = 1
+	M.pixel_x = 2
 	src.buckled_mob = M
 	src.add_fingerprint(user)
+	src.overlays += image('icons/mob/alien.dmi', "nestoverlay", layer=6)
 	return
 
+/obj/structure/stool/bed/nest/unbuckle()
+	overlays.Cut()
+	..()
+
 /obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	var/aforce = W.force
 	health = max(0, health - aforce)

code/game/objects/structures/windoor_assembly.dm

@@ -89,7 +89,6 @@ obj/structure/windoor_assembly/Destroy()
 							R.add_fingerprint(user)
 						qdel(src)
 				else
-					user << "<span class='notice'>You need more welding fuel to dissassemble the windoor assembly.</span>"
 					return
 
 			//Wrenching an unsecure assembly anchors it in place. Step 4 complete