Merge pull request #1571 from caelaislinn/master

compile fixes

code/game/objects/contraband.dm

@@ -242,6 +242,9 @@ obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	user << "<span class='notice'>You start placing the poster on the wall...</span>" //Looks like it's uncluttered enough. Place the poster.
 
 	//declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster
+	if(P.resulting_poster.serial_number !=  P.serial_number)
+		del P.resulting_poster
+		P.resulting_poster = new /obj/effect/decal/poster(P, P.serial_number)
 	var/obj/effect/decal/poster/D = P.resulting_poster
 
 	var/temp_loc = user.loc

code/game/objects/stool.dm

@@ -106,6 +106,9 @@
 
 /obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
 	if(!istype(M)) return
+	if(issimpleanimal(user))
+		user << "\red You are unable to work the complex mechanisms of a buckle!"
+		return
 	buckle_mob(M, user)
 	M.lying = 1
 	return