Merge branch 'master' into upstream-merge-11432

code/game/objects/items/weapons/material/knives.dm

@@ -164,3 +164,29 @@
 	applies_material_colour = FALSE
 	default_material = "plasteel" //VOREStation Edit
 	toolspeed = 2 // Use a real axe if you want to chop logs.
+
+/obj/item/weapon/material/knife/stone
+	name = "stone blade"
+	desc = "A crude blade made by chipping away at a piece of flint."
+	icon = 'icons/obj/weapons_vr.dmi'
+	icon_state = "stone_blade"
+	applies_material_colour = FALSE
+	fragile = TRUE
+	dulled = TRUE
+	edge = TRUE
+	sharp = TRUE
+	default_material = MAT_FLINT
+
+/obj/item/weapon/material/knife/stone/wood
+	name = "stone knife"
+	desc = "A crude blade of flint with a wooden handle, secured with plant fibers twined into sturdy ropes. Useful for cutting, stabbing, slicing, and even shearing."
+	icon_state = "stone_wood_knife"
+	dulled = FALSE
+	fragile = FALSE
+
+/obj/item/weapon/material/knife/stone/bone
+	name = "stone knife"
+	desc = "A crude blade of flint with a bone handle, secured with plant fibers twined into sturdy ropes. Useful for cutting, stabbing, slicing, and even shearing."
+	icon_state = "stone_bone_knife"
+	dulled = FALSE
+	fragile = FALSE

code/game/objects/items/weapons/material/misc.dm

@@ -217,4 +217,4 @@
 	applies_material_colour = FALSE
 
 /obj/item/weapon/material/knife/machete/hatchet/stone/bone
-	icon_state = "stone_bone_axe"
+	icon_state = "stone_bone_axe"

code/game/objects/items/weapons/material/twohanded.dm

@@ -189,3 +189,6 @@
 	base_icon = "riding_crop"
 	icon_state = "riding_crop0"
 	attack_verb = list("cropped","spanked","swatted","smacked","peppered")
+
+/obj/item/weapon/material/twohanded/spear/flint
+	default_material = MAT_FLINT 

code/game/objects/items/weapons/material/whetstone.dm

@@ -13,7 +13,7 @@
 /obj/item/weapon/whetstone/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/stack/material))
 		var/obj/item/stack/material/M = I
-		if(M.amount >= 5)
+		if(M.get_amount() >= 5)
 			to_chat(user, "You begin to refine the [src] with [M]...")
 			if(do_after(user, 70))
 				M.use(5)