Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

2020-07-13 16:20:54 +03:00
parent d1b3990875 fbbb5f7ea8
commit 5f9364c5f8
177 changed files with 3628 additions and 2948 deletions
@@ -4,6 +4,7 @@
 	singular_name = "telecrystal"
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "telecrystal"
+	grind_results = list(/datum/reagent/telecrystal = 20)
 	w_class = WEIGHT_CLASS_TINY
 	max_amount = 50
 	item_flags = NOBLUDGEON