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

Борги #703

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Борги #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Content.Server/_Sunrise/Execution/ExecutionSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Containers;
using Content.Shared.Silicons.Borgs.Components;

namespace Content.Server._Sunrise.Execution;

Expand Down Expand Up @@ -131,6 +132,10 @@ private bool CanExecuteWithAny(EntityUid weapon, EntityUid victim, EntityUid att
if (!TryComp<MobStateComponent>(victim, out var mobState))
return false;

// You can't execute borgs
if (TryComp<BorgChassisComponent>(victim, out var borgChassis))
return false;

// You're not allowed to execute dead people (no fun allowed)
if (_mobStateSystem.IsDead(victim, mobState))
return false;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Catalog/sponsor_uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3094,7 +3094,7 @@
- type: listing
id: UplinkSunrisePlayerBorgGeneric
name: uplink-sunrise-player-borg-generic-name
productEntity: BorgChassisGeneric
productEntity: PlayerBorgBattery
cost:
Suntick: 100
categories:
Expand Down
Loading