Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics

2020-02-22 19:54:10 +08:00
parent 88ae429720 d4e1c30597
commit c3ec44b0d0
701 changed files with 12663 additions and 5550 deletions
@@ -122,7 +122,7 @@
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "rupee"
 	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_GLASS = 500)
+	custom_materials = list(/datum/material/glass = 500)

 /obj/item/rupee/New()
 	var/newcolor = color2hex(pick(10;"green", 5;"blue", 3;"red", 1;"purple"))