Merge remote-tracking branch 'origin/master' into bay_examine

# Conflicts:
#	code/game/objects/structures/displaycase.dm

code/modules/reagents/Chemistry-Holder.dm

@@ -628,6 +628,7 @@ atom/proc/create_reagents(var/max_vol)
 	reagents.my_atom = src
 
 /datum/reagents/Destroy()
+	..()
 	processing_objects.Remove(src)
 	for(var/datum/reagent/R in reagent_list)
 		qdel(R)
@@ -635,4 +636,4 @@ atom/proc/create_reagents(var/max_vol)
 	reagent_list = null
 	if(my_atom && my_atom.reagents == src)
 		my_atom.reagents = null
-	return ..()
+	return QDEL_HINT_QUEUE

code/modules/reagents/grenade_launcher.dm

@@ -69,7 +69,6 @@
 /obj/item/weapon/gun/grenadelauncher/piecannon
 	name = "pie cannon"
 	icon = 'icons/obj/gun.dmi'
-	icon_override = 'icons/mob/in-hand/guns.dmi'
 	icon_state = "piecannon1"
 	item_state = "piecannon1"
 	w_class = 4.0

code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm

@@ -214,11 +214,12 @@
 		on_reaction(var/datum/reagents/holder)
 			for(var/mob/O in viewers(get_turf(holder.my_atom), null))
 				O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
-			sleep(50)
-			playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-			for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
-				M.bodytemperature -= 140
-				M << "\blue You feel a chill!"
+			spawn(50)
+				if(holder && holder.my_atom)
+					playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+					for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
+						M.bodytemperature -= 140
+						M << "\blue You feel a chill!"
 
 //Orange
 	slimecasp
@@ -242,10 +243,11 @@
 			feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
 			for(var/mob/O in viewers(get_turf(holder.my_atom), null))
 				O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
-			sleep(50)
-			var/turf/simulated/T = get_turf(holder.my_atom)
-			if(istype(T))
-				T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 50)
+			spawn(50)
+				if(holder && holder.my_atom)
+					var/turf/simulated/T = get_turf(holder.my_atom)
+					if(istype(T))
+						T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 50)
 
 //Yellow
 	slimeoverload
@@ -387,8 +389,9 @@
 		on_reaction(var/datum/reagents/holder)
 			for(var/mob/O in viewers(get_turf(holder.my_atom), null))
 				O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
-			sleep(50)
-			explosion(get_turf(holder.my_atom), 1 ,3, 6)
+			spawn(50)
+				if(holder && holder.my_atom)
+					explosion(get_turf(holder.my_atom), 1 ,3, 6)
 //Light Pink
 	slimepotion2
 		name = "Slime Potion 2"

code/modules/reagents/oldchem/reagents/_reagent_base.dm

@@ -78,5 +78,6 @@
 	return
 
 /datum/reagent/Destroy()
+	..()
 	holder = null
-	return ..()
+	return QDEL_HINT_QUEUE

code/modules/reagents/reagent_containers/hypospray.dm

@@ -8,7 +8,6 @@
 	icon = 'icons/obj/syringe.dmi'
 	item_state = "hypo"
 	icon_state = "hypo"
-	icon_override = 'icons/mob/in-hand/tools.dmi'
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)