diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 379533af19a..b22a86ac548 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -454,7 +454,7 @@ its easier to just keep the beam vertical.
if(desc)
to_chat(user, desc)
- if(reagents && is_open_container() && !ismob(src) && !hide_own_reagents()) //is_open_container() isn't really the right proc for this, but w/e
+ if(reagents && is_open_container() && !hide_own_reagents()) //is_open_container() isn't really the right proc for this, but w/e
if(get_dist(user,src) > 3)
to_chat(user, "You can't make out the contents.")
else
diff --git a/code/game/objects/items/incense.dm b/code/game/objects/items/incense.dm
index eda9f82772c..1a8c3e9e52b 100644
--- a/code/game/objects/items/incense.dm
+++ b/code/game/objects/items/incense.dm
@@ -130,7 +130,7 @@
/obj/item/incense_stick/afterattack(var/obj/reagentholder, var/mob/user)
..()
- if(reagentholder.is_open_container() && !ismob(reagentholder) && reagentholder.reagents)
+ if(reagentholder.is_open_container() && reagentholder.reagents)
if(reagentholder.reagents.has_reagent(WATER) && lit)
to_chat(user, "\The [src] fizzles as you dip it into \the [reagentholder].")
exting()
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index a2b769dc3e6..a1fcaa9cdb9 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -314,7 +314,7 @@ MATCHBOXES ARE ALSO IN FANCY.DM
/obj/item/clothing/mask/cigarette/afterattack(obj/reagentholder, mob/user as mob)
..()
- if(reagentholder.is_open_container() && !ismob(reagentholder) && reagentholder.reagents)
+ if(reagentholder.is_open_container() && reagentholder.reagents)
if(reagentholder.reagents.has_reagent(SACID) || reagentholder.reagents.has_reagent(PACID)) //Dumping into acid, a dumb idea
var/atom/new_butt = new type_butt(get_turf(reagentholder))
transfer_fingerprints_to(new_butt)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 978574d7eb7..4686cf34a42 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1380,9 +1380,6 @@ Thanks.
return
return
-/mob/living/is_open_container()
- return 1
-
/mob/living/proc/scoop_up(mob/M) //M = mob who scoops us up!
if(!holder_type)
return 0
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index a0c6d06ebf7..d8260bea79b 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -10316,7 +10316,7 @@ var/global/list/tonio_doesnt_remove=list("tonio", "blood")
if(!data["stored_phrase"])
set_phrase(sanitize(speech.message))
var/atom/container = holder.my_atom
- if(container.is_open_container())
+ if(container.is_open_container() || ismob(container))
container.visible_message("[bicon(container)] The solution fizzles for a moment.", "You hear something fizzling for a moment.", "[bicon(container)] \The [container] replies something, but you can't hear them.")
if(!(container.flags & SILENTCONTAINER))
playsound(container, 'sound/effects/bubbles.ogg', 20, -3)
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 7ab64161b76..51e5071918c 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -587,7 +587,7 @@
var/power = 0
/datum/chemical_reaction/fuelbomb/on_reaction(var/datum/reagents/holder, var/created_volume)
- if(holder.my_atom.is_open_container())
+ if(holder.my_atom.is_open_container() || ismob(holder.my_atom))
if(!is_in_airtight_object(holder.my_atom)) //Don't pop while ventcrawling.
var/turf/location = get_turf(holder.my_atom.loc)
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 7ffd23bc39b..e5d804754a6 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -23,7 +23,7 @@
icon_state = "dropper[(reagents.total_volume ? 1 : 0)]"
/obj/item/weapon/reagent_containers/dropper/attack(var/mob/M, var/mob/user)
- if(!reagents.total_volume && M.is_open_container())
+ if(!reagents.total_volume)
to_chat(user, "That doesn't make much sense.")
return
M.attack_log += text("\[[time_stamp()]\] Squirt attempt with [src.name] by [user.name] ([user.ckey]). Reagents: [reagents.get_reagent_ids(1)]")