Merge remote-tracking branch 'citadel/master' into clickcd_experimental

2020-07-23 10:26:03 -07:00
parent 4373e2b452 678a1d0a49
commit ffd44b78ba
291 changed files with 5170 additions and 1010 deletions
@@ -71,6 +71,7 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 50
 	dog_fashion = /datum/dog_fashion/head
+	grind_results = list(/datum/reagent/cellulose = 3)
 	color = "white"
 	/// What's actually written on the paper.
 	var/info = ""