Replaces /image with /mutable_appearance (#556)

* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -14,7 +14,7 @@
 	var/amount = 30
 	var/recharged = 0
 	var/recharge_delay = 5
-	var/image/icon_beaker = null
+	var/mutable_appearance/beaker_overlay
 	var/obj/item/weapon/reagent_containers/beaker = null
 	var/list/dispensable_reagents = list(
 		"hydrogen",
@@ -184,10 +184,9 @@
 		beaker.loc = src
 		to_chat(user, "<span class='notice'>You add \the [B] to the machine.</span>")
 
-		if(!icon_beaker)
-			icon_beaker = image('icons/obj/chemical.dmi', src, "disp_beaker") //randomize beaker overlay position.
-		icon_beaker.pixel_x = rand(-10,5)
-		add_overlay(icon_beaker)
+		beaker_overlay = beaker_overlay ||  mutable_appearance(icon, "disp_beaker") 
+		beaker_overlay.pixel_x = rand(-10, 5)//randomize beaker overlay position.
+		add_overlay(beaker_overlay)
 	else if(user.a_intent != INTENT_HARM && !istype(I, /obj/item/weapon/card/emag))
 		to_chat(user, "<span class='warning'>You can't load \the [I] into the machine!</span>")
 	else

code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm

@@ -15,7 +15,7 @@
 		else
 			Wall.thermite = Wall.thermite+(reac_volume*10)
 		Wall.overlays = list()
-		Wall.add_overlay(image('icons/effects/effects.dmi',"thermite"))
+		Wall.add_overlay(mutable_appearance('icons/effects/effects.dmi', "thermite"))
 
 /datum/reagent/thermite/on_mob_life(mob/living/M)
 	M.adjustFireLoss(1, 0)

code/modules/reagents/reagent_containers/bottle.dm

@@ -21,7 +21,7 @@
 /obj/item/weapon/reagent_containers/glass/bottle/update_icon()
 	cut_overlays()
 	if(reagents.total_volume)
-		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]-10")
+		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[icon_state]-10")
 
 		var/percent = round((reagents.total_volume / volume) * 100)
 		switch(percent)

code/modules/reagents/reagent_containers/dropper.dm

@@ -91,6 +91,6 @@
 /obj/item/weapon/reagent_containers/dropper/update_icon()
 	cut_overlays()
 	if(reagents.total_volume)
-		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "dropper")
+		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "dropper")
 		filling.color = mix_color_from_reagents(reagents.reagent_list)
 		add_overlay(filling)

code/modules/reagents/reagent_containers/glass.dm

@@ -133,7 +133,7 @@
 	cut_overlays()
 
 	if(reagents.total_volume)
-		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
+		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[icon_state]10")
 
 		var/percent = round((reagents.total_volume / volume) * 100)
 		switch(percent)

code/modules/reagents/reagent_containers/syringes.dm

@@ -167,10 +167,9 @@
 	item_state = "syringe_[rounded_vol]"
 
 	if(reagents.total_volume)
-		var/image/filling = image('icons/obj/reagentfillings.dmi', src, "syringe10")
-		filling.icon_state = "syringe[rounded_vol]"
-		filling.color = mix_color_from_reagents(reagents.reagent_list)
-		add_overlay(filling)
+		var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]")
+		filling_overlay.color = mix_color_from_reagents(reagents.reagent_list)
+		add_overlay(filling_overlay)
 
 /obj/item/weapon/reagent_containers/syringe/epinephrine
 	name = "syringe (epinephrine)"