From 16db38a08f15ec77cbf39572769689f0c1413153 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 11 Jan 2020 20:51:15 +0100
Subject: [PATCH] Travis man good

---
 code/game/objects/items/extinguisher.dm              |  2 +-
 code/modules/food_and_drinks/food/snacks_other.dm    |  2 +-
 .../reagents/chemistry/machinery/chem_dispenser.dm   | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index 4585685cde..81317b6eab 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -65,7 +65,7 @@
 	icon_state = "foam_extinguisher0"
 	//item_state = "foam_extinguisher" needs sprite
 	dog_fashion = null
-	chem = "firefighting_foam"
+	chem = /datum/reagent/firefighting_foam
 	tanktype = /obj/structure/reagent_dispensers/foamtank
 	sprite_name = "foam_extinguisher"
 	precision = TRUE
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index a85623cabd..0c17814c98 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -615,7 +615,7 @@
 	name = "marshmallow"
 	desc = "A marshmallow filled with fluffy marshmallow fluff."
 	icon_state = "marshmallow"
-	list_reagents = list("sugar" = 5, "nutriment" = 2)
+	list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/nutriment = 2)
 	filling_color = "#fafafa"
 	w_class = WEIGHT_CLASS_TINY
 	tastes = list("marshmallow" = 2)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 4580a51a1f..424f2bce30 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -92,10 +92,14 @@
 
 /obj/machinery/chem_dispenser/Initialize()
 	. = ..()
-	emagged_reagents = sortList(emagged_reagents, /proc/cmp_reagents_asc)
-	upgrade_reagents = sortList(upgrade_reagents, /proc/cmp_reagents_asc)
-	upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc)
-	upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
+	if(emagged_reagents)
+		emagged_reagents = sortList(emagged_reagents, /proc/cmp_reagents_asc)
+	if(upgrade_reagents)
+		upgrade_reagents = sortList(upgrade_reagents, /proc/cmp_reagents_asc)
+	if(upgrade_reagents2)
+		upgrade_reagents2 = sortList(upgrade_reagents2, /proc/cmp_reagents_asc)
+	if(upgrade_reagents3)
+		upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
 	dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc)
 	update_icon()