Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5

CallMaterialName reagent fix
2020-02-10 20:27:38 +00:00
parent 4f546c90e3 bcbaea4a7b
commit f1f8123e5a
1 changed files with 3 additions and 4 deletions
@@ -52,13 +52,12 @@ Nothing else in the console has ID requirements.
 	research_control = FALSE

 /proc/CallMaterialName(ID)
+	if(GLOB.chemical_reagents_list[ID])
+		var/datum/reagent/reagent = GLOB.chemical_reagents_list[ID]
+		return reagent.name
 	if (ID[1] == "$" && GLOB.materials_list[ID])
 		var/datum/material/material = GLOB.materials_list[ID]
 		return material.name
-
-	else if(GLOB.chemical_reagents_list[ID])
-		var/datum/reagent/reagent = GLOB.chemical_reagents_list[ID]
-		return reagent.name
 	return "ERROR: Report This"

 /obj/machinery/computer/rdconsole/proc/SyncRDevices() //Makes sure it is properly sync'ed up with the devices attached to it (if any).