Merge branch 'master' into wound-port

2020-07-21 01:10:51 +01:00
parent 037cec508e b6f689b06d
commit 75a2035774
105 changed files with 695 additions and 263 deletions
@@ -14,6 +14,7 @@
 	max_amount = 5
 	resistance_flags = FLAMMABLE
 	splint_factor = 0.8
+	grind_results = list(/datum/reagent/cellulose = 5)

 	var/list/conferred_embed = EMBED_HARMLESS
 	var/overwrite_existing = FALSE