Merge pull request #11323 from Ghommie/Ghommie-cit600

Porting a couple material datums code updates and fixes.
This commit is contained in:
kevinz000
2020-03-06 00:17:21 -07:00
committed by GitHub
31 changed files with 84 additions and 91 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ other types of metals and chemistry for reagents).
for(var/i in materials) //Go through all of our materials, get the subsystem instance, and then replace the list.
var/amount = materials[i]
if(!istext(i)) //Not a category, so get the ref the normal way
var/datum/material/M = getmaterialref(i)
var/datum/material/M = SSmaterials.GetMaterialRef(i)
temp_list[M] = amount
else
temp_list[i] = amount