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

Upstream core (#282)

Browse Source 
* yes

(cherry picked from commit a6b5e1c66dfe4241977bcde753af594392164eca)

* Is real, navernoe (#944)

* its real

* fix shield

* remove comments game preset

* maximum predicted

* fixes

* АААААААААААААААААААААААААААА ПОМОГИТЕ Я ЕБНУЛСЯ ПОКА ФИКСИЛ ЭТУ ЗАЛУПУ

* govnoedit

* secret

(cherry picked from commit 22c7b68048590b5098efbfff0d0f5205d3a64c48)

* [Feature/Tweaks] Raznoe (#934)

* make thruster great again

* make hardsuit hos great again

* new ficha for medical hud

* fix

* vrode da

* GOOOVNO REMIX REVERB EXTRA

* fix

* правки

---------

Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
(cherry picked from commit 141e61a0449873842f46d83eff9e9ce857147d60)

* Automatic changelog update

(cherry picked from commit d14fe5fb6c934ed522df0b5bc453e4c04707a6db)

* [Feature] Executions (#932)

* based

* cleanup

* cleanup + fixes

* fix

* fix

* fix ftl

* Update Resources/Locale/ru-RU/_white/executions/execution.ftl

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update execution.ftl

* правки

* vrode norm

* da

---------

Co-authored-by: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
(cherry picked from commit 83e164172f8e290acee7634f14ac51281be020ad)

* Automatic changelog update

(cherry picked from commit 71f907c563a30a1fc7ef5751a4d6f2c780a14f4c)

* hotfix (#946)

(cherry picked from commit f577caec41ab277ee8fc1c18fe64f7e26a6e50f5)

---------

Co-authored-by: RavmorganButOnCocaine <valtos@nextmail.ru>
This commit is contained in:
withoutcode333
2025-04-13 19:03:49 +05:00
committed by GitHub
parent a444b16d7d
commit 0e4e5b7805
38 changed files with 748 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
View File

@@ -42,8 +42,8 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
[Dependency] private readonly ContainerSystem _container = default!;
[Dependency] private readonly HandsSystem _hands = default!;
[Dependency] private readonly GulagSystem _gulag = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly AlertsSystem _alertsSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!;
public override void Initialize()
{
@@ -61,9 +61,6 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
protected override void Added(EntityUid uid, CultRuleComponent rule, GameRuleComponent gameRule, GameRuleAddedEvent args)
{
base.Added(uid, rule, gameRule, args);
var potentialTargets = FindPotentialTargets();
rule.CultTarget = _random.PickAndTake(potentialTargets).Mind;
}
private void OnClone(Entity<CultistComponent> ent, ref CloningEvent args)
@@ -266,6 +263,17 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
private void AfterEntitySelected(Entity<CultRuleComponent> ent, ref AfterAntagEntitySelectedEvent args)
{
if (ent.Comp.CultTarget == null)
{
var potentialTargets = FindPotentialTargets();
if (potentialTargets.Count == 0)
{
ent.Comp.CultTarget = null;
return;
}
ent.Comp.CultTarget = _random.PickAndTake(potentialTargets).Mind;
}
MakeCultist(args.EntityUid, ent);
}
@@ -335,12 +343,11 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
private List<MindContainerComponent> FindPotentialTargets()
{
var querry =
EntityManager.EntityQueryEnumerator<MindContainerComponent, HumanoidAppearanceComponent, ActorComponent>();
var query = EntityQueryEnumerator<MindContainerComponent, HumanoidAppearanceComponent, ActorComponent>();
var potentialTargets = new List<MindContainerComponent>();
while (querry.MoveNext(out var uid, out var mind, out _, out var actor))
while (query.MoveNext(out var uid, out var mind, out _, out var actor))
{
var entity = mind.Mind;
@@ -350,7 +357,7 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
if (_gulag.IsUserGulagged(actor.PlayerSession.UserId, out _))
continue;
if (HasComp<CultistComponent>(entity))
if (HasComp<CultistComponent>(uid))
continue;
potentialTargets.Add(mind);

5
Content.Server/_White/Cult/Items/Systems/ReturnItemOnThrowSystem.cs
View File

@@ -2,6 +2,7 @@
using Content.Server.Stunnable;
using Content.Server._White.Cult.Items.Components;
using Content.Shared._White.Chaplain;
using Content.Shared.Humanoid;
using Content.Shared.Mobs.Components;
using Content.Shared.Throwing;
using CultistComponent = Content.Shared._White.Cult.Components.CultistComponent;
@@ -25,12 +26,16 @@ public sealed class ReturnItemOnThrowSystem : EntitySystem
{
var isCultist = HasComp<CultistComponent>(args.Target);
var thrower = args.Component.Thrower;
var isHumanoid = HasComp<HumanoidAppearanceComponent>(args.Target);
if (!HasComp<CultistComponent>(thrower))
return;
if (!HasComp<MobStateComponent>(args.Target))
return;
if(!isHumanoid)
return;
if (!isCultist && !_holyWeapon.IsHoldingHolyWeapon(args.Target))
{
_stun.TryParalyze(args.Target, TimeSpan.FromSeconds(component.StunTime), true);

6
Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
View File

@@ -1327,13 +1327,15 @@ public sealed partial class CultSystem : EntitySystem
if (transform == null)
return false;
if (!mindComponent.Mind.HasValue)
if (mindComponent.Mind.HasValue == false)
return false;
var shard = _entityManager.SpawnEntity("SoulShard", transform.Value);
if (shard.Valid == false)
return false;
_mindSystem.TransferTo(mindComponent.Mind.Value, shard);
_mindSystem.UnVisit(mindComponent.Mind.Value);
_bodySystem.GibBody(target);

4
Content.Server/_White/Cult/Structures/CultStructureCraftSystem.cs
View File

@@ -24,7 +24,9 @@ public sealed class CultStructureCraftSystem : EntitySystem
if (!HasComp<CultistComponent>(args.User))
return;
_uiSystem.CloseUi(uid, component.UserInterfaceKey, args.User);
if(_uiSystem.HasUi(args.User, component.UserInterfaceKey))
_uiSystem.CloseUi(uid, component.UserInterfaceKey, args.User);
_uiSystem.OpenUi(uid, component.UserInterfaceKey, args.User);
}
}

27
Content.Server/_White/Cult/TimedProduction/CultistFactoryComponent.cs
View File

@@ -1,27 +0,0 @@
using Content.Server.UserInterface;
using Content.Shared._White.Cult;
using Content.Shared._White.Cult.UI;
using Robust.Server.GameObjects;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
namespace Content.Server._White.Cult.TimedProduction;
[RegisterComponent]
public sealed partial class CultistFactoryComponent : Component
{
[ViewVariables(VVAccess.ReadOnly)]
[DataField("cooldown")]
public int Cooldown = 240;
[ViewVariables(VVAccess.ReadOnly)]
public TimeSpan? NextTimeUse;
[ViewVariables(VVAccess.ReadOnly)]
[DataField("products", customTypeSerializer: typeof(PrototypeIdListSerializer<CultistFactoryProductionPrototype>))]
public IReadOnlyCollection<string> Products = ArraySegment<string>.Empty;
public Enum UserInterfaceKey = CultistAltarUiKey.Key;
[ViewVariables(VVAccess.ReadOnly)]
public bool Active = true;
}

45
Content.Server/_White/Cult/TimedProduction/CultistFactorySystem.cs
View File

@@ -4,9 +4,11 @@ using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Content.Shared._White.Cult;
using Content.Shared._White.Cult.Components;
using Content.Shared._White.Cult.Structures;
using Content.Shared._White.Cult.Systems;
using Content.Shared._White.Cult.UI;
using Content.Shared.UserInterface;
using Robust.Server.GameObjects;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Player;
@@ -37,11 +39,12 @@ public sealed class CultistFactorySystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<CultistFactoryComponent, InteractHandEvent>(OnInteract);
SubscribeLocalEvent<CultistFactoryComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<CultistFactoryComponent, CultistFactoryItemSelectedMessage>(OnSelected);
SubscribeLocalEvent<CultistFactoryComponent, InteractUsingEvent>(TryToggleAnchor);
SubscribeLocalEvent<CultistFactoryComponent, BeforeActivatableUIOpenEvent>((u, c, args) => UpdateUserInterfaceState(u, args, c));
SubscribeLocalEvent<CultistFactoryComponent, ActivatableUIOpenAttemptEvent>((u, c, args) => OnActivatableUI(u, args, c));
SubscribeLocalEvent<CultistFactoryComponent, CultAnchorDoAfterEvent>(OnAnchorDoAfter);
SubscribeLocalEvent<CultistFactoryComponent, ExaminedEvent>(OnExamine);
SubscribeLocalEvent<CultistFactoryComponent, ConcealEvent>(OnConceal);
@@ -70,28 +73,32 @@ public sealed class CultistFactorySystem : EntitySystem
}
}
private void OnInit(EntityUid uid, CultistFactoryComponent component, ComponentInit args)
public void UpdateUserInterfaceState(EntityUid uid, BeforeActivatableUIOpenEvent args, CultistFactoryComponent? component = null)
{
UpdateAppearance(uid, component);
}
private void OnInteract(EntityUid uid, CultistFactoryComponent component, InteractHandEvent args)
{
if (!HasComp<ActorComponent>(args.User))
return;
if (!HasComp<CultistComponent>(args.User))
return;
if (!CanCraft(uid, component, args.User))
return;
var xform = Transform(uid);
if (!xform.Anchored)
if (!Resolve(uid, ref component))
return;
_ui.SetUiState(uid, CultistAltarUiKey.Key, new CultistFactoryBUIState(component.Products));
_ui.OpenUi(uid, CultistAltarUiKey.Key, uid);
Dirty(uid, component);
}
private void OnActivatableUI(EntityUid uid, ActivatableUIOpenAttemptEvent args, CultistFactoryComponent? component = null)
{
if (!Resolve(uid, ref component))
return;
var user = args.User;
if (!HasComp<CultistComponent>(user))
args.Cancel();
Dirty(uid, component);
}
private void OnInit(EntityUid uid, CultistFactoryComponent component, ComponentInit args)
{
UpdateAppearance(uid, component);
}
private void OnSelected(EntityUid uid, CultistFactoryComponent component, CultistFactoryItemSelectedMessage args)