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

Fixbugs (#464)

Browse Source 
* - fix: Starting gear.

* - fix: Lockers.

* - tweak: Jani tweaks.

* - fix: Mindswap.

* - fix: Discounts.

* - fix: No nuke operative component on monkey and borg.

* - tweak: Ebow.

* - fix: Wizard teleport.

* - fix: Animals internals toggle.

* - fix: Thief icon.
This commit is contained in:
Aviu00
2024-07-19 12:52:40 +00:00
committed by GitHub
parent 742af4542f
commit a8002843a3
60 changed files with 330 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
View File

@@ -117,7 +117,7 @@ public sealed partial class AdminVerbSystem
{
Text = Loc.GetString("admin-verb-text-make-thief"),
Category = VerbCategory.Antag,
Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/ihscombat.rsi"), "icon"),
Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"), "icon"),
Act = () =>
{
_thief.AdminMakeThief(args.Target, false); //Midround add pacified is bad

5
Content.Server/Body/Systems/InternalsSystem.cs
View File

@@ -241,7 +241,7 @@ public sealed class InternalsSystem : EntitySystem
// 3. in-hand tanks
// 4. pocket/belt tanks
if (!Resolve(user, ref user.Comp1, ref user.Comp2, ref user.Comp3))
if (!Resolve(user, ref user.Comp2, ref user.Comp3, false)) // WD EDIT
return null;
if (_inventory.TryGetSlotEntity(user, "back", out var backEntity, user.Comp2, user.Comp3) &&
@@ -258,6 +258,9 @@ public sealed class InternalsSystem : EntitySystem
return (entity.Value, gasTank);
}
if (!Resolve(user, ref user.Comp1, false)) // WD EDIT
return null;
foreach (var item in _inventory.GetHandOrInventoryEntities((user.Owner, user.Comp1, user.Comp2)))
{
if (TryComp(item, out gasTank) && _gasTank.CanConnectToInternals(gasTank))

2
Content.Server/Store/Systems/StoreSystem.Ui.cs
View File

@@ -278,7 +278,7 @@ public sealed partial class StoreSystem
_audio.PlayEntity(component.BuySuccessSound, msg.Session, uid); //cha-ching!
//WD START
if (listing.SaleLimit != 0 && listing.SaleAmount > 0 && listing.PurchaseAmount >= listing.SaleLimit && listing.ProductAction.HasValue)
if (listing.SaleLimit != 0 && listing.SaleAmount > 0 && listing.PurchaseAmount >= listing.SaleLimit)
{
listing.SaleAmount = 0;
listing.Cost = listing.OldCost;

12
Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs
View File

@@ -179,6 +179,12 @@ public sealed class WizardSpellsSystem : EntitySystem
if (!userHasMind)
return;
SwapComponent<WizardComponent>(uid, target);
SwapComponent<RevolutionaryComponent>(uid, target);
SwapComponent<HeadRevolutionaryComponent>(uid, target);
SwapComponent<PentagramComponent>(uid, target);
SwapComponent<CultistComponent>(uid, target);
_mindSystem.TransferTo(mindId, target, mind: mind);
if (targetHasMind)
@@ -193,12 +199,6 @@ public sealed class WizardSpellsSystem : EntitySystem
_standing.TryLieDown(target);
Cast(msg);
SwapComponent<WizardComponent>(uid, target);
SwapComponent<RevolutionaryComponent>(uid, target);
SwapComponent<HeadRevolutionaryComponent>(uid, target);
SwapComponent<PentagramComponent>(uid, target);
SwapComponent<CultistComponent>(uid, target);
}
#endregion

9
Content.Server/_White/Wizard/WizardRuleSystem.cs
View File

@@ -159,7 +159,8 @@ public sealed class WizardRuleSystem : GameRuleSystem<WizardRuleComponent>
var query = QueryActiveRules();
while (query.MoveNext(out _, out _, out var wizardRule, out _))
{
AddRole(mindId, mind, wizardRule);
if (!AddRole(mindId, mind, wizardRule))
return;
if (mind.Session is not { } playerSession)
return;
@@ -171,10 +172,10 @@ public sealed class WizardRuleSystem : GameRuleSystem<WizardRuleComponent>
}
}
private void AddRole(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule)
private bool AddRole(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule)
{
if (_roles.MindHasRole<WizardRoleComponent>(mindId))
return;
return false;
wizardRule.WizardMinds.Add(mindId);
@@ -182,6 +183,8 @@ public sealed class WizardRuleSystem : GameRuleSystem<WizardRuleComponent>
_roles.MindAddRole(mindId, new WizardRoleComponent {PrototypeId = role});
GiveObjectives(mindId, mind, wizardRule);
return true;
}
private void GiveObjectives(EntityUid mindId, MindComponent mind, WizardRuleComponent wizardRule)