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] Borg and Golem LayDown #906

Merged
merged 5 commits into from
Nov 22, 2024
Merged

[Fix] Borg and Golem LayDown #906

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ee059f
Update base_borg_chassis.yml
trest100 Nov 8, 2024
370987b
Update golem.yml
trest100 Nov 8, 2024
fd2d23e
fix borg layingdown
KayzelW Nov 22, 2024
7f7281a
Merge branch 'master' into BorgFix
KayzelW Nov 22, 2024
6bdfcc8
a few commands for borgs
KayzelW Nov 22, 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.Shared/Backmen/Standing/SharedLayingDownSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
using Content.Shared.Movement.Systems;
using Content.Shared.Physics;
using Content.Shared.Popups;
using Content.Shared.Silicons.Borgs.Components;
using Content.Shared.Standing;
using Content.Shared.Stunnable;
using Content.Shared.Tag;
Expand Down Expand Up @@ -83,7 +84,7 @@ private void OnCheckLegs(Entity<LayingDownComponent> ent, ref StandAttemptEvent
if(!TryComp<BodyComponent>(ent, out var body))
return;

if (body.LegEntities.Count < body.RequiredLegs || body.LegEntities.Count == 0)
if (!HasComp<BorgChassisComponent>(ent) && (body.LegEntities.Count < body.RequiredLegs || body.LegEntities.Count == 0))
args.Cancel(); // no legs bro
}

Expand Down
4 changes: 3 additions & 1 deletion Content.Shared/Body/Systems/SharedBodySystem.Body.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
using Content.Shared.Humanoid;
using Content.Shared.Humanoid.Events;
using Content.Shared.Inventory;
using Content.Shared.Rejuvenate;
using Content.Shared.Silicons.Borgs.Components;
using Content.Shared.Standing;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
Expand Down Expand Up @@ -139,7 +141,7 @@ private void OnBodyCanDrag(Entity<BodyComponent> ent, ref CanDragEvent args)

private void OnStandAttempt(Entity<BodyComponent> ent, ref StandAttemptEvent args)
{
if (ent.Comp.LegEntities.Count == 0)
if (!HasComp<BorgChassisComponent>(ent) && ent.Comp.LegEntities.Count == 0)
args.Cancel();
}

Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@
- type: Emoting
- type: TTS # Corvax-TTS
voice: Borgs
- type: LayingDown # backmen: LayingDown
- type: GuideHelp
guides:
- Cyborgs
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Backmen/Entities/Mobs/Species/golem.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
abstract: true
description: Искусственная конструкция, имитирующая жизнь. У этого еще не установлен кристалл души.
components:
- type: LayingDown # backmen: LayingDown
- type: ComplexInteraction
- type: ActionGrant
actions:
Expand Down
Loading