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

Всякое (#116)

Browse Source 
* - fix: Fix clown font again.

* - tweak: Better melee sound for axe and halberd.

* - fix: Fix cult item equip.

* - fix: Extraction doesn't count as absorbing.

* - tweak: No mindshield for seniors.

* - fix: Salary for seniors.

* - add: Guardians can fly.

* - add: Nukie NV goggles

* - tweak: Buff spear again.

* - tweak: Less cost for ling abilities.

* - tweak: MindShield is not permanent.

* - fix: Fix exception spam.

* - tweak: Cheaper stings.

* Revert "- tweak: No mindshield for seniors."

This reverts commit fff625b8b83d296293644f62fe11cc4a916c4ab2.
This commit is contained in:
Aviu00
2024-02-24 23:18:25 +09:00
committed by GitHub
parent 3515e87f74
commit bb97d04184
16 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Changeling/ChangelingSystem.Abilities.cs
View File

@@ -595,6 +595,8 @@ public sealed partial class ChangelingSystem
if (!_mindSystem.TryGetMind(uid, out var mindId, out _))
return;
component.AbsorbedCount++;
if (TryComp(uid, out SharedPullerComponent? puller) && puller.Pulling is { } pulled &&
TryComp(pulled, out SharedPullableComponent? pullable))
{

6
Content.Server/Changeling/Objectives/ChangelingConditionsSystem.cs
View File

@@ -66,7 +66,7 @@ public sealed class ChangelingConditionsSystem : EntitySystem
if (!TryComp<ChangelingComponent>(mind.CurrentEntity, out var changelingComponent))
return 0f;
var absorbed = changelingComponent.AbsorbedEntities.Count - 1; // Because first - it's the owner
var absorbed = changelingComponent.AbsorbedCount; // Because first - it's the owner
if (requiredDna == absorbed)
return 1f;
@@ -90,7 +90,7 @@ public sealed class ChangelingConditionsSystem : EntitySystem
if (!TryComp<ChangelingComponent>(mind.CurrentEntity, out var changelingComponent))
return 0f;
var selfAbsorbed = changelingComponent.AbsorbedEntities.Count - 1; // Because first - it's the owner
var selfAbsorbed = changelingComponent.AbsorbedCount; // Because first - it's the owner
var query = EntityQueryEnumerator<ChangelingComponent>();
@@ -100,7 +100,7 @@ public sealed class ChangelingConditionsSystem : EntitySystem
if (uid == mind.CurrentEntity)
continue; //don't include self
var absorbed = comp.AbsorbedEntities.Count - 1;
var absorbed = comp.AbsorbedCount;
otherAbsorbed.Add(absorbed);
}

2
Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
View File

@@ -187,7 +187,7 @@ public sealed class RadioDeviceSystem : EntitySystem
return; // no feedback loops please.
if (_recentlySent.Add((args.Message, args.Source)))
_radio.SendRadioMessage(args.Source, args.Message, _protoMan.Index<RadioChannelPrototype>(component.BroadcastChannel), uid);
_radio.SendRadioMessage(args.Source, args.Message, _protoMan.Index<RadioChannelPrototype>(component.BroadcastChannel), uid, false); // WD EDIT
}
private void OnAttemptListen(EntityUid uid, RadioMicrophoneComponent component, ListenAttemptEvent args)