Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2026-08-23 04:58:08 +01:00 · 2020-12-09 03:29:16 +01:00
parent 81f486c6ba b769996cf0
commit c59c794ecc
48 changed files with 24255 additions and 1228 deletions
@@ -1051,6 +1051,7 @@ var/list/name_to_material
 //TODO PLACEHOLDERS:
 /datum/material/leather
 	name = MAT_LEATHER
+	display_name = "plainleather"
 	icon_colour = "#5C4831"
 	stack_type = /obj/item/stack/material/leather
 	stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)