Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update

2026-08-23 04:58:08 +01:00 · 2024-01-22 05:18:14 +01:00
parent 6b15dec0ca 62d30b2e37
commit 1c2d4da6bd
111 changed files with 2563 additions and 2522 deletions
@@ -213,6 +213,7 @@ var/list/name_to_material
 	var/luminescence
 	var/radiation_resistance = 0 // Radiation resistance, which is added on top of a material's weight for blocking radiation. Needed to make lead special without superrobust weapons.
 	var/supply_conversion_value  // Supply points per sheet that this material sells for.
+	var/can_sharpen = TRUE // Is this material compatible with a sharpening kit?

 	// Placeholder vars for the time being, todo properly integrate windows/light tiles/rods.
 	var/created_window
@@ -108,4 +108,5 @@
 	hardness = 1
 	weight = 1
 	protectiveness = 0 // 0%
-	conductive = 0
+	conductive = 0
+	can_sharpen = FALSE