Merge remote-tracking branch 'upstream/master' into barber-update

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

@@ -142,12 +142,14 @@
 				for (var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					A.ex_act(severity++)
+				new /obj/item/stack/sheet/metal(loc)
 				qdel(src)
 		if(3)
 			if(prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.forceMove(loc)
 					A.ex_act(severity++)
+				new /obj/item/stack/sheet/metal(loc)
 				qdel(src)
 
 /obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)

code/game/objects/structures/girders.dm

@@ -184,7 +184,7 @@
 				qdel(src)
 			return
 		if(3.0)
-			if (prob(30))
+			if (prob(40))
 				var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
 				new remains(loc)
 				qdel(src)

code/game/objects/structures/signs.dm

@@ -77,7 +77,7 @@
 
 /obj/structure/sign/securearea
 	name = "\improper SECURE AREA"
-	desc = "A warning sign which reads 'SECURE AREA'."
+	desc = "A warning sign which reads 'SECURE AREA'"
 	icon_state = "securearea"
 
 /obj/structure/sign/biohazard
@@ -142,7 +142,7 @@
 
 /obj/structure/sign/kiddieplaque
 	name = "AI developers plaque"
-	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\""
+	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"."
 	icon_state = "kiddieplaque"
 
 /obj/structure/sign/atmosplaque
@@ -197,27 +197,27 @@
 
 /obj/structure/sign/chinese
 	name = "\improper chinese restaurant sign"
-	desc = "A glowing dragon invites you in"
+	desc = "A glowing dragon invites you in."
 	icon_state = "chinese"
 
 /obj/structure/sign/directions/science
 	name = "\improper Science department"
-	desc = "A direction sign, pointing out which way Science department is."
+	desc = "A direction sign, pointing out which way the Science department is."
 	icon_state = "direction_sci"
 
 /obj/structure/sign/directions/engineering
 	name = "\improper Engineering department"
-	desc = "A direction sign, pointing out which way Engineering department is."
+	desc = "A direction sign, pointing out which way the Engineering department is."
 	icon_state = "direction_eng"
 
 /obj/structure/sign/directions/security
 	name = "\improper Security department"
-	desc = "A direction sign, pointing out which way Security department is."
+	desc = "A direction sign, pointing out which way the Security department is."
 	icon_state = "direction_sec"
 
 /obj/structure/sign/directions/medical
 	name = "\improper Medical Bay"
-	desc = "A direction sign, pointing out which way Meducal Bay is."
+	desc = "A direction sign, pointing out which way Medical Bay is."
 	icon_state = "direction_med"
 
 /obj/structure/sign/directions/evac

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

@@ -11,11 +11,13 @@
 			qdel(src)
 			return
 		if(2.0)
-			if (prob(50))
+			if (prob(70))
+				new /obj/item/stack/sheet/metal(src.loc)
 				qdel(src)
 				return
 		if(3.0)
-			if (prob(5))
+			if (prob(50))
+				new /obj/item/stack/sheet/metal(src.loc)
 				qdel(src)
 				return
 	return

code/game/objects/structures/window.dm

@@ -153,7 +153,8 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 /obj/structure/window/attack_animal(mob/living/user as mob)
 	if(!isanimal(user)) return
 	var/mob/living/simple_animal/M = user
-	if(M.melee_damage_upper <= 0) return
+	if(M.melee_damage_upper <= 0 || (M.melee_damage_type != BRUTE && M.melee_damage_type != BURN))
+		return
 	attack_generic(M, M.melee_damage_upper)