Merge remote-tracking branch 'upstream/master' into crusher-trophies

code/game/objects/items/devices/scanners.dm

@@ -273,6 +273,8 @@ REAGENT SCANNER
 		user.show_message("<span class='notice'>Subject's genes are stable.</span>")
 	add_fingerprint(user)
 
+/obj/item/healthanalyzer/attack_self(mob/user)
+	toggle_mode()
 
 /obj/item/healthanalyzer/verb/toggle_mode()
 	set name = "Switch Verbosity"

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

@@ -178,8 +178,12 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40),
 	new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
 	new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),
+	new /datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wooden, 3, time = 10),
+	new /datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 10),
+	new /datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),
 	new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),
-	new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50)
+	new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50),
+	new /datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100)
 )
 
 /obj/item/stack/sheet/wood

code/game/objects/items/weapons/kitchen.dm

@@ -115,7 +115,8 @@
 	throw_range = 6
 	materials = list(MAT_METAL=12000)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	sharp = 1
+	sharp = TRUE
+	var/bayonet = FALSE	//Can this be attached to a gun?
 
 /obj/item/kitchen/knife/suicide_act(mob/user)
 	user.visible_message(pick("<span class='suicide'>[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>", \
@@ -164,6 +165,7 @@
 	throwforce = 20
 	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
+	bayonet = TRUE
 
 /obj/item/kitchen/knife/combat/survival
 	name = "survival knife"

code/game/objects/items/weapons/lighters.dm

@@ -224,3 +224,13 @@
 	var/mask_item = M.get_item_by_slot(slot_wear_mask)
 	if(istype(mask_item, /obj/item/clothing/mask/cigarette))
 		return mask_item
+
+
+/obj/item/match/firebrand
+	name = "firebrand"
+	desc = "An unlit firebrand. It makes you wonder why it's not just called a stick."
+	smoketime = 20 //40 seconds
+
+/obj/item/match/firebrand/New()
+	..()
+	matchignite()

code/game/objects/structures/false_walls.dm

@@ -97,12 +97,9 @@
 	else
 		icon_state = "fwall_open"
 
-/obj/structure/falsewall/proc/ChangeToWall(delete = 1)
+/obj/structure/falsewall/proc/ChangeToWall(delete = TRUE)
 	var/turf/T = get_turf(src)
-	if(!walltype || walltype == "metal")
-		T.ChangeTurf(/turf/simulated/wall)
-	else
-		T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[walltype]"))
+	T.ChangeTurf(walltype)
 	if(delete)
 		qdel(src)
 	return T