From ef230a92d0e3d428d868e084094e2d5ea6d80fa0 Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 29 Jul 2020 18:54:15 -0700 Subject: [PATCH 1/3] Stops force-feeding non-carbon mobs reagents --- code/modules/reagents/reagent_containers/glass_containers.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 1e42899111b..1ab6a1c2511 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -47,6 +47,11 @@ reagents.reaction(M, REAGENT_TOUCH) reagents.clear_reagents() else + if(!iscarbon(M)) + // This is a simple mob, or some other kind of mob that cannot process reagents. + // It makes no sense to inject reagents into mobs that don't even process them. + to_chat(user, "You cannot find a way to feed [M].") + return if(M != user) M.visible_message("[user] attempts to feed something to [M].", \ "[user] attempts to feed something to you.") From b2b42d10fd9b2d96b9dfcd8d5069a128bd0c1914 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 31 Jul 2020 14:08:30 -0700 Subject: [PATCH 2/3] updates comment --- code/modules/reagents/reagent_containers/glass_containers.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 1ab6a1c2511..b2a25f5f8c0 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -48,8 +48,7 @@ reagents.clear_reagents() else if(!iscarbon(M)) - // This is a simple mob, or some other kind of mob that cannot process reagents. - // It makes no sense to inject reagents into mobs that don't even process them. + // Non-carbons can't process reagents to_chat(user, "You cannot find a way to feed [M].") return if(M != user) From 4e676f30c7a94250441a46758fffa73aae4ec267 Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 31 Jul 2020 14:09:01 -0700 Subject: [PATCH 3/3] inline --- code/modules/reagents/reagent_containers/glass_containers.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index b2a25f5f8c0..175ae757df4 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -47,8 +47,7 @@ reagents.reaction(M, REAGENT_TOUCH) reagents.clear_reagents() else - if(!iscarbon(M)) - // Non-carbons can't process reagents + if(!iscarbon(M)) // Non-carbons can't process reagents to_chat(user, "You cannot find a way to feed [M].") return if(M != user)