Merge remote-tracking branch 'origin/master' into mining

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

@@ -155,7 +155,7 @@
 
 
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(src.opened)
+	if(opened)
 		if(istype(W, /obj/item/weapon/grab))
 			if(src.large)
 				var/obj/item/weapon/grab/G = W
@@ -173,13 +173,13 @@
 				user << "<span class='notice'>You begin cutting \the [src] apart...</span>"
 				playsound(loc, 'sound/items/Welder.ogg', 40, 1)
 				if(do_after(user,40,5,1))
-					if( !src.opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
+					if( !opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
 						return
 					playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
 					new /obj/item/stack/sheet/metal(src.loc)
 					visible_message("<span class='notice'>[user] has cut \the [src] apart with \the [WT].</span>", "You hear welding.")
 					qdel(src)
-			return
+				return
 
 		if(isrobot(user))
 			return
@@ -187,25 +187,25 @@
 		if(user.drop_item())
 			W.Move(loc)
 
-	else if(istype(W, /obj/item/stack/packageWrap))
-		return
-	else if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
-		if(WT.remove_fuel(0,user))
-			user << "<span class='notice'>You begin [welded ? "unwelding":"welding"] \the [src]...</span>"
-			playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
-			if(do_after(user,40,5,1))
-				if(src.opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
-					return
-				playsound(loc, 'sound/items/welder.ogg', 50, 1)
-				welded = !welded
-				user << "<span class='notice'>You [welded ? "welded [src] shut":"unwelded [src]"].</span>"
-				update_icon()
-				user.visible_message("<span class='warning'>[user.name] has [welded ? "welded [src] shut":"unwelded [src]"].</span>")
-		return
-	else if(!place(user, W))
-		src.attack_hand(user)
-	return
+	else
+		if(istype(W, /obj/item/stack/packageWrap))
+			return
+		if(istype(W, /obj/item/weapon/weldingtool))
+			var/obj/item/weapon/weldingtool/WT = W
+			if(WT.remove_fuel(0,user))
+				user << "<span class='notice'>You begin [welded ? "unwelding":"welding"] \the [src]...</span>"
+				playsound(loc, 'sound/items/Welder2.ogg', 40, 1)
+				if(do_after(user,40,5,1))
+					if(opened || !istype(src, /obj/structure/closet) || !user || !WT || !WT.isOn() || !user.loc )
+						return
+					playsound(loc, 'sound/items/welder.ogg', 50, 1)
+					welded = !welded
+					user << "<span class='notice'>You [welded ? "welded [src] shut":"unwelded [src]"].</span>"
+					update_icon()
+					user.visible_message("<span class='warning'>[user.name] has [welded ? "welded [src] shut":"unwelded [src]"].</span>")
+				return
+		if(!place(user, W))
+			src.attack_hand(user)
 
 /obj/structure/closet/proc/place(var/mob/user, var/obj/item/I)
 	return 0

code/game/objects/structures/grille.dm

@@ -63,7 +63,7 @@
 		healthcheck()
 		return
 
-/obj/structure/grille/attack_slime(mob/living/carbon/slime/user as mob)
+/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user as mob)
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src)
 	if(!user.is_adult)	return

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

@@ -7,23 +7,32 @@
 	icon_state = "nest"
 	var/health = 100
 
-/*
-/obj/structure/stool/bed/nest/unbuckle_other(mob/user as mob)
-	buckled_mob.visible_message(\
-		"<span class='notice'>[user.name] pulls [buckled_mob.name] free from the sticky nest!</span>",\
-		"[user.name] pulls you free from the gelatinous resin.",\
-		"You hear squelching...")
-	unbuckle()
+/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user as mob)
+	if(buckled_mob && buckled_mob.buckled == src)
+		var/mob/living/M = buckled_mob
+		if(M != user)
+			M.visible_message(\
+				"<span class='notice'>[user.name] pulls [M.name] free from the sticky nest!</span>",\
+				"<span class='notice'>[user.name] pulls you free from the gelatinous resin.</span>",\
+				"You hear squelching...")
+		else
+			M.visible_message(\
+				"<span class='warning'>[M.name] struggles to break free from the gelatinous resin!</span>",\
+				"<span class='warning'>You struggle to break free from the gelatinous resin. (Stay still for two minutes.)</span>",\
+				"You hear squelching...")
+			if(!do_after(M, 1200))
+				if(M && M.buckled)
+					M << "<span class='warning'>You fail to unbuckle yourself!</span>"
+				return
+			if(!M.buckled)
+				return
+			M.visible_message(\
+				"<span class='warning'>[M.name] breaks free from the gelatinous resin!</span>",\
+				"<span class='warning'>You break free from the gelatinous resin!</span>",\
+				"You hear squelching...")
 
-/obj/structure/stool/bed/nest/unbuckle_myself(mob/user as mob)
-	buckled_mob.visible_message(\
-		"<span class='warning'>[buckled_mob.name] struggles to break free of the gelatinous resin...</span>",\
-		"<span class='warning'>You struggle to break free from the gelatinous resin...</span>",\
-		"You hear squelching...")
-	spawn(600)
-		if(user && buckled_mob && user.buckled == src)
-			unbuckle()
-*/
+		unbuckle_mob()
+		add_fingerprint(user)
 
 /obj/structure/stool/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
 	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
@@ -44,12 +53,15 @@
 
 /obj/structure/stool/bed/nest/post_buckle_mob(mob/living/M)
 	if(M == buckled_mob)
-		M.pixel_y += 6
-		M.pixel_x += 2
+		M.pixel_y = 0
+		M.pixel_x = initial(M.pixel_x) + 2
 		overlays += image('icons/mob/alien.dmi', "nestoverlay", layer=6)
 	else
-		M.pixel_x -= 2
+		M.pixel_x = initial(M.pixel_x)
 		M.pixel_y = initial(M.pixel_y)
+		if(M.lying)
+			var/lying_pixel_y_offset = -6
+			M.pixel_y += lying_pixel_y_offset
 		overlays.Cut()
 
 /obj/structure/stool/bed/nest/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

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

@@ -59,7 +59,6 @@
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "down"
 	anchored = 0
-	var/const/buckled_pixel_y_offset = 6 //Mobs buckled will have their pixel_y offset by this much
 
 
 /obj/structure/stool/bed/roller/post_buckle_mob(mob/M)
@@ -72,7 +71,8 @@
 		icon_state = "down"
 		M.pixel_y = initial(M.pixel_y)
 		if(M.lying)
-			M.pixel_y -= buckled_pixel_y_offset
+			var/lying_pixel_y_offset = -6
+			M.pixel_y += lying_pixel_y_offset
 
 
 /obj/item/roller

code/game/objects/structures/window.dm

@@ -172,7 +172,7 @@
 	attack_generic(M, M.melee_damage_upper)
 	update_nearby_icons()
 
-/obj/structure/window/attack_slime(mob/living/carbon/slime/user as mob)
+/obj/structure/window/attack_slime(mob/living/simple_animal/slime/user as mob)
 	user.do_attack_animation(src)
 	if(!user.is_adult)
 		return