Merge branch 'master' into Plasmaispogtake2

2021-03-25 10:44:12 -04:00
parent 3efce37fd9 362fb9a848
commit dd295d20c2
32 changed files with 284 additions and 733 deletions
@@ -52,7 +52,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
 	name = "diamond"
 	desc = "Highly pressurized carbon"
 	color = list(48/255, 272/255, 301/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
-	strength_modifier = 1.1
+	strength_modifier = 1.2
 	alpha = 132
 	categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
 	sheet_type = /obj/item/stack/sheet/mineral/diamond