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

This commit is contained in:
silicons
2021-04-26 14:17:43 -07:00
480 changed files with 310849 additions and 306446 deletions
+1 -1
View File
@@ -50,7 +50,7 @@
custom_materials = list(/datum/material/iron=12000)
/obj/item/ingot/diamond
custom_materials = list(/datum/material/diamond=12000) //yeah ok
custom_materials = list(/datum/material/diamond=12000)
/obj/item/ingot/uranium
custom_materials = list(/datum/material/uranium=12000)