Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -103,6 +103,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \
 	)
 
 /obj/item/stack/sheet/wood

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

@@ -23,4 +23,5 @@
 		new /obj/item/clothing/head/greenbandana(src)
 		new /obj/item/weapon/minihoe(src)
 		new /obj/item/weapon/hatchet(src)
+		new /obj/item/weapon/bee_net(src)
 		return

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

@@ -169,11 +169,21 @@
 	name = "large crate"
 	desc = "A hefty metal crate with an electronic locking system."
 	icon = 'icons/obj/storage.dmi'
-	icon_state = "largecrate"
-	icon_opened = "largecrateopen"
-	icon_closed = "largecrate"
-	redlight = "largecrater"
-	greenlight = "largecrateg"
+	icon_state = "largemetal"
+	icon_opened = "largemetalopen"
+	icon_closed = "largemetal"
+	redlight = "largemetalr"
+	greenlight = "largemetalg"
+
+/obj/structure/closet/crate/secure/large_reinforced
+	name = "large crate"
+	desc = "A hefty, reinforced metal crate with an electronic locking system."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "largermetal"
+	icon_opened = "largermetalopen"
+	icon_closed = "largermetal"
+	redlight = "largemetalr"
+	greenlight = "largemetalg"
 
 /obj/structure/closet/crate/secure
 	desc = "A secure crate."
@@ -192,10 +202,9 @@
 	name = "large crate"
 	desc = "A hefty metal crate."
 	icon = 'icons/obj/storage.dmi'
-	icon_state = "largecrate"
-	icon_opened = "largecrateopen"
-	icon_closed = "largecrate"
-	density = 1
+	icon_state = "largemetal"
+	icon_opened = "largemetalopen"
+	icon_closed = "largemetal"
 
 /obj/structure/closet/crate/hydroponics
 	name = "Hydroponics crate"

code/game/objects/structures/window.dm

@@ -104,9 +104,17 @@
 		new /obj/item/weapon/shard(loc)
 		if(reinf) new /obj/item/stack/rods(loc)
 		del(src)
+	else if (usr.a_intent == "hurt")
+		playsound(src.loc, 'Glassknock.ogg', 80, 1)
+		usr.visible_message("\red [usr.name] bangs against the [src.name]!", \
+							"\red You bang against the [src.name]!", \
+							"You hear a banging sound.")
 	else
-		user.visible_message("<span class='notice'>[user] knocks on [src].</span>")
-		playsound(loc, 'sound/effects/Glasshit.ogg', 50, 1)
+		playsound(src.loc, 'Glassknock.ogg', 80, 1)
+		usr.visible_message("[usr.name] knocks on the [src.name].", \
+							"You knock on the [src.name].", \
+							"You hear a knocking sound.")
+	return
 
 
 /obj/structure/window/attack_paw(mob/user as mob)