Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix borgs being able to drink from buckets and spray bottles. #32964

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+3 −0
Open

Fix borgs being able to drink from buckets and spray bottles. #32964

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aad8318
Added a check for if the entity trying to drink is a borg.
amatwiedle Oct 23, 2024
a59fffc
Fixed missing namespace issue.
amatwiedle Oct 23, 2024
df33980
Improved code conciseness.
amatwiedle Oct 23, 2024
40a7f1a
Removed borg chassis check, added stomach check.
dankeaj Dec 5, 2024
9d77c7a
Removed unused namespace
amatwiedle Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using Content.Shared.Nutrition;
using Content.Shared.Nutrition.Components;
using Content.Shared.Nutrition.EntitySystems;
using Content.Shared.Silicons.Borgs.Components;
using Content.Shared.Verbs;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
Expand Down Expand Up @@ -162,7 +163,7 @@ public void UpdateAppearance(EntityUid uid, DrinkComponent component)
/// </summary>
private bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, EntityUid item)
{
if (!HasComp<BodyComponent>(target))
if (!HasComp<BodyComponent>(target) || HasComp<BorgChassisComponent>(target))
amatwiedle marked this conversation as resolved.
Show resolved Hide resolved
return false;

if (_openable.IsClosed(item, user))
Expand Down
Loading