From 894f1c195e99cc894b1ff2e9851c778b053dbc5a Mon Sep 17 00:00:00 2001 From: FaDeOkno Date: Thu, 2 Jan 2025 20:10:35 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9D=D1=91=D1=80=D1=84=D1=8B=20=D1=81?= =?UTF-8?q?=D0=BD=D0=B0=D1=80=D1=8F=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=88?= =?UTF-8?q?=D0=B0=D1=85=D1=82=D1=91=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Weapons/Melee/crushers.yml | 8 ++++---- .../Entities/Objects/Weapons/Guns/Basic/base_pka.yml | 1 + .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml | 2 +- .../Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml index 7813b518be3..e9fdecb60ed 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/crushers.yml @@ -139,7 +139,7 @@ wideAnimationRotation: -135 damage: types: - Slash: 20 + Slash: 15 soundHit: collection: MetalThud angle: 0 @@ -154,7 +154,7 @@ - type: BackstabDamageMultipilier bonusDamage: types: - Slash: 40 + Slash: 20 - type: GunRequiresWield - type: Wieldable - type: Item @@ -176,7 +176,7 @@ attackRate: 1.5 damage: types: - Slash: 25 + Slash: 20 soundHit: collection: MetalThud angle: 0 @@ -188,4 +188,4 @@ - type: BackstabDamageMultipilier bonusDamage: types: - Slash: 15 + Slash: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index 48fa3df524f..c4eba109385 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -74,4 +74,5 @@ soundHit: collection: GenericHit - type: AltFireMelee #ADT_Tweak + attackType: Heavy diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index b2a2018b6a8..672835b23e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -123,7 +123,7 @@ fireRate: 1 useKey: false - type: RechargeBasicEntityAmmo - rechargeCooldown: 2 # ADT tweak 0.5 -> 2 + rechargeCooldown: 1 # ADT tweak 0.5 -> 1 rechargeSound: path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg - type: BasicEntityAmmoProvider diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index c4574f26d40..5fcefc9bd9a 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,6 +3,7 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist + canBeAntag: false requirements: - !type:DepartmentTimeRequirement department: Cargo From 360779637a0f08ba256a4ecf9f50a5b2f9548c05 Mon Sep 17 00:00:00 2001 From: FaDeOkno Date: Thu, 2 Jan 2025 21:38:59 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D1=91=D0=BB?= =?UTF-8?q?=20=D0=A8=D0=B0=D1=85=D1=82=D1=91=D1=80=D0=9C=D0=B0=D0=B3=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D1=82=D0=B8=D0=BF?= =?UTF-8?q?=D1=8B,=20=D0=B8=D0=B1=D0=BE=20=D0=B1=D1=8B=D0=BB=20=D0=BA?= =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=B9-=D1=82=D0=BE=20=D1=83=D0=B6=D0=B0?= =?UTF-8?q?=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/MiningShop/MiningShopBui.cs | 111 +++++++++--------- .../ADT/MiningShop/MiningShopComponent.cs | 3 - .../ADT/MiningShop/MiningShopSection.cs | 15 +-- .../ADT/MiningShop/MiningShopVendorUI.cs | 5 +- .../ADT/MiningShop/SharedMiningShopSystem.cs | 22 +--- .../ADTMaps/Nonstation/lavaland_outpost.yml | 82 ------------- .../Structures/Machines/miningshop.yml | 57 --------- Resources/Prototypes/ADT/mining_shop.yml | 74 ++++++++++++ .../Entities/Structures/Machines/lathe.yml | 2 +- Resources/Prototypes/Recipes/Lathes/misc.yml | 13 +- .../Prototypes/Research/experimental.yml | 2 +- 11 files changed, 149 insertions(+), 237 deletions(-) create mode 100644 Resources/Prototypes/ADT/mining_shop.yml diff --git a/Content.Client/ADT/MiningShop/MiningShopBui.cs b/Content.Client/ADT/MiningShop/MiningShopBui.cs index 4aa80d6cd6c..79545b11dfa 100644 --- a/Content.Client/ADT/MiningShop/MiningShopBui.cs +++ b/Content.Client/ADT/MiningShop/MiningShopBui.cs @@ -23,6 +23,7 @@ public sealed class MiningShopBui : BoundUserInterface [Dependency] private readonly IResourceCache _resource = default!; private readonly MiningPointsSystem _miningPoints; private MiningShopWindow? _window; + private List _sections = new(); public MiningShopBui(EntityUid owner, Enum uiKey) : base(owner, uiKey) { _miningPoints = EntMan.System(); @@ -34,63 +35,61 @@ protected override void Open() _window.OnClose += Close; _window.Title = EntMan.GetComponentOrNull(Owner)?.EntityName ?? "MiningShop"; - if (EntMan.TryGetComponent(Owner, out MiningShopComponent? vendor)) + if (!EntMan.TryGetComponent(Owner, out MiningShopComponent? vendor)) + return; + var sections = _prototype.EnumeratePrototypes().ToList(); + sections.Sort((x, y) => x.Name[0].CompareTo(x.Name[0])); + + foreach (var section in sections) { - for (var sectionIndex = 0; sectionIndex < vendor.Sections.Count; sectionIndex++) + var uiSection = new MiningShopSection(); + uiSection.Label.SetMessage(GetSectionName(section)); + _sections.Add(section); + + foreach (var entry in section.Entries) { - var section = vendor.Sections[sectionIndex]; + var uiEntry = new MiningShopEntry(); + + if (_prototype.TryIndex(entry.Id, out var entity)) + { + uiEntry.Texture.Textures = SpriteComponent.GetPrototypeTextures(entity, _resource) + .Select(o => o.Default) + .ToList(); + uiEntry.Panel.Button.Label.Text = entry.Name?.Replace("\\n", "\n") ?? entity.Name; - var uiSection = new MiningShopSection(); - uiSection.Label.SetMessage(GetSectionName(section)); + var name = entity.Name; + var color = MiningShopPanel.DefaultColor; + var borderColor = MiningShopPanel.DefaultBorderColor; + var hoverColor = MiningShopPanel.DefaultBorderColor; + uiEntry.Panel.Color = color; + uiEntry.Panel.BorderColor = borderColor; + uiEntry.Panel.HoveredColor = hoverColor; - for (var entryIndex = 0; entryIndex < section.Entries.Count; entryIndex++) - { - var entry = section.Entries[entryIndex]; - var uiEntry = new MiningShopEntry(); - - if (_prototype.TryIndex(entry.Id, out var entity)) - { - uiEntry.Texture.Textures = SpriteComponent.GetPrototypeTextures(entity, _resource) - .Select(o => o.Default) - .ToList(); - uiEntry.Panel.Button.Label.Text = entry.Name?.Replace("\\n", "\n") ?? entity.Name; - - var name = entity.Name; - var color = MiningShopPanel.DefaultColor; - var borderColor = MiningShopPanel.DefaultBorderColor; - var hoverColor = MiningShopPanel.DefaultBorderColor; - - uiEntry.Panel.Color = color; - uiEntry.Panel.BorderColor = borderColor; - uiEntry.Panel.HoveredColor = hoverColor; - - var msg = new FormattedMessage(); - msg.AddText(name); - msg.PushNewline(); - - if (!string.IsNullOrWhiteSpace(entity.Description)) - msg.AddText(entity.Description); - - var tooltip = new Tooltip(); - tooltip.SetMessage(msg); - tooltip.MaxWidth = 250f; - - uiEntry.TooltipLabel.ToolTip = entity.Description; - uiEntry.TooltipLabel.TooltipDelay = 0; - uiEntry.TooltipLabel.TooltipSupplier = _ => tooltip; - - var sectionI = sectionIndex; - var entryI = entryIndex; - uiEntry.Panel.Button.OnPressed += _ => OnButtonPressed(sectionI, entryI); - } - - uiSection.Entries.AddChild(uiEntry); + var msg = new FormattedMessage(); + msg.AddText(name); + msg.PushNewline(); + + if (!string.IsNullOrWhiteSpace(entity.Description)) + msg.AddText(entity.Description); + + var tooltip = new Tooltip(); + tooltip.SetMessage(msg); + tooltip.MaxWidth = 250f; + + uiEntry.TooltipLabel.ToolTip = entity.Description; + uiEntry.TooltipLabel.TooltipDelay = 0; + uiEntry.TooltipLabel.TooltipSupplier = _ => tooltip; + + uiEntry.Panel.Button.OnPressed += _ => OnButtonPressed(entry); } - _window.Sections.AddChild(uiSection); + uiSection.Entries.AddChild(uiEntry); } + + _window.Sections.AddChild(uiSection); } + _window.Express.OnPressed += _ => OnExpressDeliveryButtonPressed(); _window.Search.OnTextChanged += OnSearchChanged; @@ -99,9 +98,9 @@ protected override void Open() _window.OpenCentered(); } - private void OnButtonPressed(int sectionIndex, int entryIndex) + private void OnButtonPressed(Content.Shared.ADT.MiningShop.MiningShopEntry entry) { - var msg = new MiningShopBuiMsg(sectionIndex, entryIndex); + var msg = new MiningShopBuiMsg(entry); SendMessage(msg); Refresh(); } @@ -168,10 +167,12 @@ public void Refresh() _window.PointsLabel.Text = $"Осталось очков: {userpoints}"; - for (var sectionIndex = 0; sectionIndex < vendor.Sections.Count; sectionIndex++) + var sections = _prototype.EnumeratePrototypes(); + + for (var sectionIndex = 0; sectionIndex < _sections.Count; sectionIndex++) { - var section = vendor.Sections[sectionIndex]; - var uiSection = (MiningShopSection) _window.Sections.GetChild(sectionIndex); + var section = _sections[sectionIndex]; + var uiSection = (MiningShopSection)_window.Sections.GetChild(sectionIndex); uiSection.Label.SetMessage(GetSectionName(section)); var sectionDisabled = false; @@ -179,7 +180,7 @@ public void Refresh() for (var entryIndex = 0; entryIndex < section.Entries.Count; entryIndex++) { var entry = section.Entries[entryIndex]; - var uiEntry = (MiningShopEntry) uiSection.Entries.GetChild(entryIndex); + var uiEntry = (MiningShopEntry)uiSection.Entries.GetChild(entryIndex); var disabled = sectionDisabled; if (userpoints < entry.Price) @@ -210,7 +211,7 @@ protected override void ReceiveMessage(BoundUserInterfaceMessage message) } } - private FormattedMessage GetSectionName(SharedMiningShopSection section) + private FormattedMessage GetSectionName(SharedMiningShopSectionPrototype section) { var name = new FormattedMessage(); name.PushTag(new MarkupNode("bold", new MarkupParameter(section.Name.ToUpperInvariant()), null)); diff --git a/Content.Shared/ADT/MiningShop/MiningShopComponent.cs b/Content.Shared/ADT/MiningShop/MiningShopComponent.cs index 3f03ed74088..701b8a372e2 100644 --- a/Content.Shared/ADT/MiningShop/MiningShopComponent.cs +++ b/Content.Shared/ADT/MiningShop/MiningShopComponent.cs @@ -9,9 +9,6 @@ namespace Content.Shared.ADT.MiningShop; [Access(typeof(SharedMiningShopSystem))] public sealed partial class MiningShopComponent : Component { - - [DataField, AutoNetworkedField] - public List Sections = new(); [DataField, AutoNetworkedField] public List OrderList = new(); diff --git a/Content.Shared/ADT/MiningShop/MiningShopSection.cs b/Content.Shared/ADT/MiningShop/MiningShopSection.cs index 832d40119ad..e825f27822e 100644 --- a/Content.Shared/ADT/MiningShop/MiningShopSection.cs +++ b/Content.Shared/ADT/MiningShop/MiningShopSection.cs @@ -4,22 +4,17 @@ namespace Content.Shared.ADT.MiningShop; -[DataDefinition] -[Serializable, NetSerializable] -public sealed partial class SharedMiningShopSection +[Prototype("miningShopSection")] +public sealed partial class SharedMiningShopSectionPrototype : IPrototype { + [IdDataField] + public string ID { get; private set; } = default!; + [DataField(required: true)] public string Name = string.Empty; [DataField(required: true)] public List Entries = new(); - - // Only used by Spec Vendors to mark the kit section for RMCVendorSpecialistComponent logic. - [DataField] - public int? SharedSpecLimit; - - [DataField] - public List> Jobs = new(); } [DataDefinition] diff --git a/Content.Shared/ADT/MiningShop/MiningShopVendorUI.cs b/Content.Shared/ADT/MiningShop/MiningShopVendorUI.cs index 28fd444237e..f839be241d8 100644 --- a/Content.Shared/ADT/MiningShop/MiningShopVendorUI.cs +++ b/Content.Shared/ADT/MiningShop/MiningShopVendorUI.cs @@ -9,10 +9,9 @@ public enum MiningShopUI : byte } [Serializable, NetSerializable] -public sealed class MiningShopBuiMsg(int section, int entry) : BoundUserInterfaceMessage +public sealed class MiningShopBuiMsg(MiningShopEntry entry) : BoundUserInterfaceMessage { - public readonly int Section = section; - public readonly int Entry = entry; + public readonly MiningShopEntry Entry = entry; } [Serializable, NetSerializable] diff --git a/Content.Shared/ADT/MiningShop/SharedMiningShopSystem.cs b/Content.Shared/ADT/MiningShop/SharedMiningShopSystem.cs index eab7bbc3af6..aed579c0e77 100644 --- a/Content.Shared/ADT/MiningShop/SharedMiningShopSystem.cs +++ b/Content.Shared/ADT/MiningShop/SharedMiningShopSystem.cs @@ -23,27 +23,11 @@ public override void Initialize() protected virtual void OnVendBui(Entity vendor, ref MiningShopBuiMsg args) { var comp = vendor.Comp; - var sections = comp.Sections.Count; var actor = args.Actor; - if (args.Section < 0 || args.Section >= sections) - { - Log.Error($"{ToPrettyString(actor)} sent an invalid vend section: {args.Section}. Max: {sections}"); - return; - } - - var section = comp.Sections[args.Section]; - var entries = section.Entries.Count; - if (args.Entry < 0 || args.Entry >= entries) - { - Log.Error($"{ToPrettyString(actor)} sent an invalid vend entry: {args.Entry}. Max: {entries}"); - return; - } - - var entry = section.Entries[args.Entry]; - if (entry.Price != null) + if (args.Entry.Price != null) { - if (_miningPoints.TryFindIdCard(actor) is {} idCard && _miningPoints.RemovePoints(idCard, entry.Price.Value)) + if (_miningPoints.TryFindIdCard(actor) is {} idCard && _miningPoints.RemovePoints(idCard, args.Entry.Price.Value)) { Dirty(vendor); } @@ -52,7 +36,7 @@ protected virtual void OnVendBui(Entity vendor, ref MiningS if (_net.IsClient) return; - vendor.Comp.OrderList.Add(entry); + vendor.Comp.OrderList.Add(args.Entry); } diff --git a/Resources/Maps/ADTMaps/Nonstation/lavaland_outpost.yml b/Resources/Maps/ADTMaps/Nonstation/lavaland_outpost.yml index 88aa22a4193..67618d5aa20 100644 --- a/Resources/Maps/ADTMaps/Nonstation/lavaland_outpost.yml +++ b/Resources/Maps/ADTMaps/Nonstation/lavaland_outpost.yml @@ -1462,88 +1462,6 @@ entities: pos: 22.5,5.5 parent: 1 - type: MiningShop - sections: - - jobs: [] - sharedSpecLimit: null - entries: - - price: 750 - name: null - id: WeaponCrusher - - price: 1050 - name: null - id: WeaponKineticSpear - - price: 1050 - name: null - id: WeaponKineticHammer - - price: 1050 - name: null - id: WeaponKineticClaws - - price: 1050 - name: null - id: WeaponKineticMachete - name: Крашеры - - jobs: [] - sharedSpecLimit: null - entries: - - price: 550 - name: null - id: WeaponProtoKineticAccelerator - name: ПКА - - jobs: [] - sharedSpecLimit: null - entries: - - price: 600 - name: null - id: FultonBeacon - - price: 1150 - name: null - id: Fulton - name: фултоны - - jobs: [] - sharedSpecLimit: null - entries: - - price: 700 - name: null - id: MedkitBruteFilled - - price: 600 - name: null - id: MedkitBurnFilled - name: медицина - - jobs: [] - sharedSpecLimit: null - entries: - - price: 500 - name: null - id: ClothingBeltSalvageWebbing - - price: 3000 - name: null - id: ClothingOuterHardsuitSalvage - - price: 1000 - name: null - id: ADTClothingOuterArmorMiner - - price: 3600 - name: null - id: ADTClothingOuterArmorMinerHeavy - - price: 4000 - name: null - id: ClothingOuterArmorMinerLight - name: снаряжение - - jobs: [] - sharedSpecLimit: null - entries: - - price: 500 - name: null - id: PKAUpgradeDamage - - price: 500 - name: null - id: PKAUpgradeRange - - price: 500 - name: null - id: PKAUpgradeFireRate - - price: 500 - name: null - id: PKAUpgradeLight - name: улучшения - uid: 1835 components: - type: Transform diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/miningshop.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/miningshop.yml index daac5aedb68..6a858c2ffb1 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Machines/miningshop.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/miningshop.yml @@ -5,63 +5,6 @@ description: A dwarf's best friend! components: - type: MiningShop - sections: - - name: Крашеры - entries: - - id: WeaponCrusher - price: 750 - - id: WeaponKineticSpear - price: 1050 - - id: WeaponKineticHammer - price: 1050 - - id: WeaponKineticClaws - price: 1050 - - id: WeaponKineticMachete - price: 1050 - - name: ПКА - entries: - - id: WeaponProtoKineticAccelerator - price: 550 - - name: Фултоны - entries: - - id: FultonBeacon - price: 600 - - id: Fulton - price: 1150 - - name: Медицина - entries: - - id: MedkitBruteFilled - price: 700 - - id: MedkitBurnFilled - price: 600 - - name: Снаряжение - entries: - - id: ClothingBeltSalvageWebbing - price: 500 - - id: ClothingOuterHardsuitSalvage - price: 3000 - - id: ADTClothingOuterArmorMiner - price: 1000 - - id: ADTClothingOuterArmorMinerHeavy - price: 3600 - - id: ClothingOuterArmorMinerLight - price: 4000 - - id: ADTWeaponCutter - price: 500 - - id: ADTClothingJumpBoots - price: 2500 - - id: ADTJaunter - price: 900 - - name: Улучшения - entries: - - id: PKAUpgradeDamage - price: 500 - - id: PKAUpgradeRange - price: 500 - - id: PKAUpgradeFireRate - price: 500 - - id: PKAUpgradeLight - price: 500 - type: Sprite sprite: Structures/Machines/VendingMachines/mining.rsi layers: diff --git a/Resources/Prototypes/ADT/mining_shop.yml b/Resources/Prototypes/ADT/mining_shop.yml new file mode 100644 index 00000000000..0b3b3b6d7ea --- /dev/null +++ b/Resources/Prototypes/ADT/mining_shop.yml @@ -0,0 +1,74 @@ +- type: miningShopSection + id: Crushers + name: Крашеры + entries: + - id: WeaponCrusher + price: 750 + - id: WeaponKineticSpear + price: 1050 + - id: WeaponKineticHammer + price: 1050 + - id: WeaponKineticClaws + price: 1050 + - id: WeaponKineticMachete + price: 1050 + +- type: miningShopSection + id: KA + name: ПКА + entries: + - id: WeaponProtoKineticAccelerator + price: 550 + +- type: miningShopSection + id: Fulton + name: Фултоны + entries: + - id: FultonBeacon + price: 600 + - id: Fulton + price: 1150 + +- type: miningShopSection + id: Medicine + name: Медицина + entries: + - id: MedkitBruteFilled + price: 700 + - id: MedkitBurnFilled + price: 600 + +- type: miningShopSection + id: Equipment + name: Снаряжение + entries: + - id: ClothingBeltSalvageWebbing + price: 500 + - id: ClothingOuterHardsuitSalvage + price: 3000 + - id: ADTClothingOuterArmorMiner + price: 1000 + - id: ADTClothingOuterArmorMinerHeavy + price: 3600 + - id: ClothingOuterArmorMinerLight + price: 4000 + - id: ADTWeaponCutter + price: 500 + - id: ADTClothingJumpBoots + price: 2500 + - id: ADTJaunter + price: 900 + +- type: miningShopSection + id: Upgrades + name: Улучшения + entries: + - id: PKAUpgradeDamage + price: 500 + - id: PKAUpgradeRange + price: 500 + - id: PKAUpgradeFireRate + price: 500 + - id: PKAUpgradeLight + price: 500 + diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2ee0e2fbd3b..1e24745999a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -340,7 +340,7 @@ - WeaponGauntletGorilla - SynthesizerInstrument - ClothingShoesBootsMagSci - - ClothingShoesBootsMoon + # - ClothingShoesBootsMoon # ADT tweak - убираем луноходы - ClothingShoesBootsSpeed - NodeScanner - HolofanProjector diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 7dc77997839..bd2d4f608e7 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -135,12 +135,13 @@ Steel: 1000 Plastic: 500 -- type: latheRecipe - id: ClothingShoesBootsMoon - result: ClothingShoesBootsMoon - completetime: 2 - materials: - Steel: 600 +# ADT tweak - убираем луноходы +# - type: latheRecipe +# id: ClothingShoesBootsMoon +# result: ClothingShoesBootsMoon +# completetime: 2 +# materials: +# Steel: 600 - type: latheRecipe id: ClothingShoesBootsSpeed diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index 34443e78f00..842e4b8b8f0 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -68,7 +68,7 @@ cost: 7500 recipeUnlocks: - ClothingShoesBootsMagSci - - ClothingShoesBootsMoon + #- ClothingShoesBootsMoon # ADT tweak - убираем луноходы - type: technology id: AnomalyCoreHarnessing From f2b4fbde74373cf7568b2567551bdb0baa9b4829 Mon Sep 17 00:00:00 2001 From: FaDeOkno Date: Thu, 2 Jan 2025 22:20:43 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 5fcefc9bd9a..17869184dbc 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,7 +3,7 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist - canBeAntag: false + canBeAntag: false # ADT tweak requirements: - !type:DepartmentTimeRequirement department: Cargo