Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Апстрим изменений боргов (#549)

Browse Source 
* New borg sounds (#27205)

* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor

* Make borgs shown in logprobe (#27788)

* Players can no longer see that emagged cyborgs' internals have been tampered with. (#27816)

* Add emag-detection funtionality to diag huds

* Add component to the omniHUD

* Fix namespace

* Adress discord review, just axe the message.

* Medical borg add chem glasses (#27843)

* Update borg_chassis.yml

* Update borg_chassis.yml

* fix

* Removing unnecessary components and adapting changes (#28391) for the syndicate

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Create Consistency in the Syndicate Borgs (#27875)

* Gives Mediborg the Medical Hud (#28391)

* Shifts borgs hats to the right a bit (#28600)

* Gives Insulation and NoSlip to all bots (#28621)

* Gives Insulation and NoSlip to all bots

* remove NoSlip from children

* Prevent borgs from getting duplicate modules (#28943)

* Prevent borgs from getting duplicate modules

* outta the loop

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* fix borgs getting deleted by salvage magnets (#29006)

* Borgs can no longer be freely locked/unlocked when emagged (#29605)

Co-authored-by: plykiya <plykiya@protonmail.com>

* Added Health Analyzer to basic treatment module. (#29696)

Removed dropped, added Health Analyzer to Basic Treatment Module

Co-authored-by: JIP <jipdawg93@gmail.com>

* Add petting cyborgs (#30037)

added petting borgs, adjusted interactions

* Fix: Syndie borg can now wield DEsword (#30229)

* Syndie borg can now wield DEsword

* Made child of EnergySwordDouble for borgs
* Made ESword borg module use this new borg DESword

* Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu

* Revert "fix borgs getting deleted by salvage magnets (#29006)"

This reverts commit c6a2d3dc0d15b1f5535ad9fe2a481ec9cfd4f111.

* borgs sound change

---------

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com>
Co-authored-by: marbow <152051971+marboww@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com>
Co-authored-by: JIP <jipdawg93@gmail.com>
Co-authored-by: CookieMasterT <124045269+CookieMasterT@users.noreply.github.com>
Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com>
This commit is contained in:
ThereDrD0
2024-08-03 18:53:54 +03:00
committed by GitHub
parent 242d831ca5
commit 48d6d8bab8
28 changed files with 267 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
View File

@@ -274,6 +274,25 @@ public sealed partial class BorgSystem
return false;
}
if (TryComp<ItemBorgModuleComponent>(module, out var itemModuleComp))
{
foreach (var containedModuleUid in component.ModuleContainer.ContainedEntities)
{
if (!TryComp<ItemBorgModuleComponent>(containedModuleUid, out var containedItemModuleComp))
continue;
for (int i = 0; i < itemModuleComp.Items.Count; i++)
{
if (itemModuleComp.Items[i] != containedItemModuleComp.Items[i])
continue;
}
if (user != null)
Popup.PopupEntity(Loc.GetString("borg-module-duplicate"), uid, user.Value);
return false;
}
}
return true;
}

12
Content.Server/Silicons/Laws/SiliconLawSystem.cs
View File

@@ -55,7 +55,6 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
SubscribeLocalEvent<SiliconLawProviderComponent, GotEmaggedEvent>(OnEmagLawsAdded);
SubscribeLocalEvent<EmagSiliconLawComponent, MindAddedMessage>(OnEmagMindAdded);
SubscribeLocalEvent<EmagSiliconLawComponent, MindRemovedMessage>(OnEmagMindRemoved);
SubscribeLocalEvent<EmagSiliconLawComponent, ExaminedEvent>(OnExamined);
}
private void OnComponentShutdown(EntityUid uid, SiliconLawBoundComponent component, ComponentShutdown args)
@@ -155,17 +154,6 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
});
}
private void OnExamined(EntityUid uid, EmagSiliconLawComponent component, ExaminedEvent args)
{
if (!args.IsInDetailsRange || !HasComp<EmaggedComponent>(uid))
return;
if (component.RequireOpenPanel && TryComp<WiresPanelComponent>(uid, out var panel) && !panel.Open)
return;
args.PushMarkup(Loc.GetString("laws-compromised-examine"));
}
protected override void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent component, ref GotEmaggedEvent args)
{
if (component.RequireOpenPanel && TryComp<WiresPanelComponent>(uid, out var panel) && !panel.Open)