diff --git a/code/game/sound.dm b/code/game/sound.dm
index 0de31d170c0..903790d3a2b 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -211,7 +211,7 @@
 
 //Unlike TG, we use singletons here, so this is different, for now
 /proc/get_sfx(soundin)
-	if(isfile(soundin) || (istext(soundin) && !ispath(soundin)))
+	if(isfile(soundin) || (istext(soundin) && !ispath(soundin)) || istype(soundin, /sound))
 		return soundin
 
 	var/singleton/sound_category/SC = GET_SINGLETON(soundin)
diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm
index 26bfeaa6ca6..f8e5d17cfef 100644
--- a/code/modules/reagents/reagent_containers/food.dm
+++ b/code/modules/reagents/reagent_containers/food.dm
@@ -16,17 +16,6 @@
 	var/is_liquid = TRUE
 	var/empty_icon_state
 
-/obj/item/reagent_containers/food/update_icon()
-	..()
-	if(!reagents.total_volume)
-		if(("[initial(icon_state)]_empty") in icon_states(icon)) // if there's an empty icon state, use it
-			icon_state = "[initial(icon_state)]_empty"
-		else if (empty_icon_state)
-			icon_state = empty_icon_state
-	else
-		icon = initial(icon)	//Necessary for refilling empty drinks
-		icon_state = initial(icon_state)
-
 /obj/item/reagent_containers/food/self_feed_message(var/mob/user)
 	to_chat(user, "<span class='notice'>You [is_liquid ? "drink from" : "eat"] \the [src].</span>")
 
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 809dc39bdf4..a6d9b4462a4 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -28,6 +28,17 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
 	if(drink_flags & IS_GLASS)
 		unacidable = TRUE
 
+/obj/item/reagent_containers/food/drinks/update_icon()
+	..()
+	if(!reagents.total_volume)
+		if(("[initial(icon_state)]_empty") in icon_states(icon)) // if there's an empty icon state, use it
+			icon_state = "[initial(icon_state)]_empty"
+		else if (empty_icon_state)
+			icon_state = empty_icon_state
+	else
+		icon = initial(icon)	//Necessary for refilling empty drinks
+		icon_state = initial(icon_state)
+
 /obj/item/reagent_containers/food/drinks/on_reagent_change()
 	update_icon()
 
diff --git a/html/changelogs/fluffyghost-morebugfixes.yml b/html/changelogs/fluffyghost-morebugfixes.yml
new file mode 100644
index 00000000000..f277204a7df
--- /dev/null
+++ b/html/changelogs/fluffyghost-morebugfixes.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: FluffyGhost
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Get_sfx() now also returns /sound types back, preventing some runtimes without having to rewrite 300 lines."
+  - bugfix: "Food containers like frosted donuts and meat nuggets now maintain the proper icon."