Merge remote-tracking branch 'WD-core/master' into upstream-core

Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs

@@ -15,6 +15,7 @@ namespace Content.Client.VendingMachines
         [ViewVariables]
         private List<int> _cachedFilteredIndex = new();
 
+        private VendingMachineComponent component = new(); // WD edit
         public VendingMachineBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
         }
@@ -26,7 +27,7 @@ namespace Content.Client.VendingMachines
             var vendingMachineSys = EntMan.System<VendingMachineSystem>();
 
             // WD EDIT START
-            var component = EntMan.GetComponent<VendingMachineComponent>(Owner);
+            component = EntMan.GetComponent<VendingMachineComponent>(Owner);
             _cachedInventory = vendingMachineSys.GetAllInventory(Owner, component);
 
             _menu = new VendingMenu { Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName };
@@ -34,6 +35,7 @@ namespace Content.Client.VendingMachines
             _menu.OnClose += Close;
             _menu.OnItemSelected += OnItemSelected;
             _menu.OnWithdraw += SendMessage;
+            _menu.SearchBar.OnTextChanged += UpdateFilter;
             // WD EDIT END
 
             _menu.Populate(_cachedInventory, component.PriceMultiplier, component.Credits);
@@ -41,6 +43,17 @@ namespace Content.Client.VendingMachines
             _menu.OpenCenteredLeft();
         }
 
+        // WD EDIT START
+        private void UpdateFilter(Robust.Client.UserInterface.Controls.LineEdit.LineEditEventArgs obj)
+        {
+            if (_menu != null)
+            {
+                _menu.filter = obj.Text;
+                _menu.Populate(_cachedInventory, component.PriceMultiplier, component.Credits);
+            }
+        }
+        // WD EDIT END
+
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
@@ -84,7 +97,7 @@ namespace Content.Client.VendingMachines
 
         private void OnSearchChanged(string? filter)
         {
-            //_menu?.Populate(_cachedInventory, out _cachedFilteredIndex, filter);
+            //_menu?.filter = (filter ?? "");
         }
     }
 }

Content.Client/_White/Economy/Ui/VendingMenu.xaml

@@ -1,4 +1,7 @@
-<DefaultWindow xmlns="https://spacestation14.io">
+<DefaultWindow xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:style="clr-namespace:Content.Client.Stylesheets">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Horizontal">
             <Label Name="CreditsLabel" HorizontalExpand="True"/>
@@ -7,6 +10,9 @@
                 Text="{Loc 'store-ui-default-withdraw-text'}"
                 HorizontalAlignment="Right"/>
         </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <LineEdit Name="SearchBar"  PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True"  Margin ="4 4" Access="Public"/>
+        </BoxContainer>
         <PanelContainer StyleClasses="HighDivider" />
         <Label
             Name="OutOfStockLabel"

Content.Client/_White/Economy/Ui/VendingMenu.xaml.cs

@@ -16,12 +16,13 @@ public sealed partial class VendingMenu : DefaultWindow
 
     public event Action<int>? OnItemSelected;
     public Action<VendingMachineWithdrawMessage>? OnWithdraw;
-
+    public string filter = "";
     public VendingMenu()
     {
         MinSize = SetSize = new Vector2(250, 150);
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
+        // SearchBar.OnTextChanged += UpdateFilter;
     }
 
     /// <summary>
@@ -38,7 +39,7 @@ public sealed partial class VendingMenu : DefaultWindow
                 return;
             OnWithdraw?.Invoke(new VendingMachineWithdrawMessage());
         };
-        
+
         VendingContents.RemoveAllChildren();
         if (inventory.Count == 0)
         {
@@ -67,13 +68,15 @@ public sealed partial class VendingMenu : DefaultWindow
             if (itemName.Length > longestEntry.Length)
                 longestEntry = itemName;
 
-            var price = (int)(entry.Price * priceMultiplier);
+            var price = (int) (entry.Price * priceMultiplier);
             var vendingItem = new VendingItem($"{itemName} [{entry.Amount}]", price > 0 ? $"{price} \u00a2" : "выдать", icon);
 
             var j = i;
             vendingItem.VendingItemBuyButton.OnPressed += _ => { OnItemSelected?.Invoke(j); };
 
-            VendingContents.AddChild(vendingItem);
+
+            if (filter == "" || (prototype?.Name?.Contains(filter) == true))
+                VendingContents.AddChild(vendingItem);
         }
 
         SetSizeAfterUpdate(longestEntry.Length);
@@ -84,4 +87,4 @@ public sealed partial class VendingMenu : DefaultWindow
         SetSize = new Vector2(Math.Clamp((longestEntryLength + 10) * 12, 250, 700),
             Math.Clamp(VendingContents.ChildCount * 50, 150, 400));
     }
-}
+}

Content.Server/Lathe/LatheSystem.cs

@@ -160,10 +160,10 @@ namespace Content.Server.Lathe
         {
             var ev = new LatheGetRecipesEvent(uid, getUnavailable)
             {
-                Recipes = new List<ProtoId<LatheRecipePrototype>>(component.StaticRecipes)
+                Recipes = new HashSet<ProtoId<LatheRecipePrototype>>(component.StaticRecipes) // WD Ahead of wizden
             };
             RaiseLocalEvent(uid, ev);
-            return ev.Recipes;
+            return ev.Recipes.ToList(); // WD Ahead of wizden
         }
 
         public static List<ProtoId<LatheRecipePrototype>> GetAllBaseRecipes(LatheComponent component)

Content.Shared/Lathe/LatheComponent.cs

@@ -70,7 +70,7 @@ namespace Content.Shared.Lathe
 
         public bool getUnavailable;
 
-        public List<ProtoId<LatheRecipePrototype>> Recipes = new();
+        public HashSet<ProtoId<LatheRecipePrototype>> Recipes = new(); // WD Ahead of wizden
 
         public LatheGetRecipesEvent(EntityUid lathe, bool forced)
         {

Content.Shared/Research/Components/BlueprintComponent.cs

@@ -0,0 +1,19 @@
+using Content.Shared.Research.Prototypes;
+using Content.Shared.Research.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Research.Components;
+
+/// <summary>
+/// This is used for an item that is inserted directly into a given lathe to provide it with a recipe.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(BlueprintSystem))]
+public sealed partial class BlueprintComponent : Component
+{
+    /// <summary>
+    /// The recipes that this blueprint provides.
+    /// </summary>
+    [DataField(required: true)]
+    public HashSet<ProtoId<LatheRecipePrototype>> ProvidedRecipes = new();
+}

Content.Shared/Research/Components/BlueprintReceiverComponent.cs

@@ -0,0 +1,18 @@
+using Content.Shared.Research.Systems;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Research.Components;
+
+/// <summary>
+/// This is used for a lathe that can utilize <see cref="BlueprintComponent"/>s to gain more recipes.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(BlueprintSystem))]
+public sealed partial class BlueprintReceiverComponent : Component
+{
+    [DataField]
+    public string ContainerId = "blueprint";
+
+    [DataField(required: true)]
+    public EntityWhitelist Whitelist = new();
+}

Content.Shared/Research/Systems/BlueprintSystem.cs

@@ -0,0 +1,114 @@
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Lathe;
+using Content.Shared.Popups;
+using Content.Shared.Research.Components;
+using Content.Shared.Research.Prototypes;
+using Content.Shared.Whitelist;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Research.Systems;
+
+public sealed class BlueprintSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<BlueprintReceiverComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<BlueprintReceiverComponent, AfterInteractUsingEvent>(OnAfterInteract);
+        SubscribeLocalEvent<BlueprintReceiverComponent, LatheGetRecipesEvent>(OnGetRecipes);
+    }
+
+    private void OnStartup(Entity<BlueprintReceiverComponent> ent, ref ComponentStartup args)
+    {
+        _container.EnsureContainer<Container>(ent, ent.Comp.ContainerId);
+    }
+
+    private void OnAfterInteract(Entity<BlueprintReceiverComponent> ent, ref AfterInteractUsingEvent args)
+    {
+        if (args.Handled || !args.CanReach || !TryComp<BlueprintComponent>(args.Used, out var blueprintComponent))
+            return;
+        args.Handled = TryInsertBlueprint(ent, (args.Used, blueprintComponent), args.User);
+    }
+
+    private void OnGetRecipes(Entity<BlueprintReceiverComponent> ent, ref LatheGetRecipesEvent args)
+    {
+        var recipes = GetBlueprintRecipes(ent);
+        foreach (var recipe in recipes)
+        {
+            args.Recipes.Add(recipe);
+        }
+    }
+
+    public bool TryInsertBlueprint(Entity<BlueprintReceiverComponent> ent, Entity<BlueprintComponent> blueprint, EntityUid? user)
+    {
+        if (!CanInsertBlueprint(ent, blueprint, user))
+            return false;
+
+        if (user is not null)
+        {
+            var userId = Identity.Entity(user.Value, EntityManager);
+            var bpId = Identity.Entity(blueprint, EntityManager);
+            var machineId = Identity.Entity(ent, EntityManager);
+            var msg = Loc.GetString("blueprint-receiver-popup-insert",
+                ("user", userId),
+                ("blueprint", bpId),
+                ("receiver", machineId));
+            _popup.PopupPredicted(msg, ent, user);
+        }
+
+        _container.Insert(blueprint.Owner, _container.GetContainer(ent, ent.Comp.ContainerId));
+
+        var ev = new TechnologyDatabaseModifiedEvent();
+        RaiseLocalEvent(ent, ref ev);
+        return true;
+    }
+
+    public bool CanInsertBlueprint(Entity<BlueprintReceiverComponent> ent, Entity<BlueprintComponent> blueprint, EntityUid? user)
+    {
+        if (_entityWhitelist.IsWhitelistFail(ent.Comp.Whitelist, blueprint))
+        {
+            return false;
+        }
+
+        if (blueprint.Comp.ProvidedRecipes.Count == 0)
+        {
+            Log.Error($"Attempted to insert blueprint {ToPrettyString(blueprint)} with no recipes.");
+            return false;
+        }
+
+        // Don't add new blueprints if there are no new recipes.
+        var currentRecipes = GetBlueprintRecipes(ent);
+        if (currentRecipes.Count != 0 && currentRecipes.IsSupersetOf(blueprint.Comp.ProvidedRecipes))
+        {
+            _popup.PopupPredicted(Loc.GetString("blueprint-receiver-popup-recipe-exists"), ent, user);
+            return false;
+        }
+
+        return _container.CanInsert(blueprint, _container.GetContainer(ent, ent.Comp.ContainerId));
+    }
+
+    public HashSet<ProtoId<LatheRecipePrototype>> GetBlueprintRecipes(Entity<BlueprintReceiverComponent> ent)
+    {
+        var contained = _container.GetContainer(ent, ent.Comp.ContainerId);
+
+        var recipes = new HashSet<ProtoId<LatheRecipePrototype>>();
+        foreach (var blueprint in contained.ContainedEntities)
+        {
+            if (!TryComp<BlueprintComponent>(blueprint, out var blueprintComponent))
+                continue;
+
+            foreach (var provided in blueprintComponent.ProvidedRecipes)
+            {
+                recipes.Add(provided);
+            }
+        }
+
+        return recipes;
+    }
+}

Content.Shared/Whitelist/EntityWhitelistSystem.cs

@@ -81,4 +81,17 @@ public sealed class EntityWhitelistSystem : EntitySystem
             }
         }
     }
+
+    /// <summary>
+    /// WD Ahead of wizden.
+    /// Helper function to determine if Whitelist is not null and entity is not on the list
+    /// </summary>
+    public bool IsWhitelistFail(EntityWhitelist? whitelist, EntityUid uid)
+    {
+        if (whitelist == null)
+            return false;
+
+        return !IsValid(whitelist, uid);
+    }
+
 }

Resources/Changelog/ChangelogWhite.yml

@@ -1,41 +1,4 @@
 Entries:
-- author: HitPanda
-  changes:
-  - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0442\u0438\u043F\u043E\u0432\
-      \ \u0443\u0440\u043E\u043D\u0430 \u043F\u0440\u0438 \u043E\u0441\u043C\u043E\
-      \u0442\u0440\u0435 \u043E\u0440\u0443\u0436\u0438\u044F \u0438 \u043E\u0434\u0435\
-      \u0436\u0434\u044B."
-    type: Add
-  id: 129
-  time: '2023-04-08T12:57:11.0000000+00:00'
-- author: HitPanda
-  changes:
-  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0442\u0430\u0439\u043C\
-      \u0435\u0440 \u043F\u0440\u0438 \u043F\u043E\u043F\u044B\u0442\u043A\u0435 \u0432\
-      \u0441\u0442\u0430\u0442\u044C(\u0441\u043E \u0441\u0442\u0443\u043B\u0430 \u0438\
-      \u043B\u0438 \u043A\u0440\u043E\u0432\u0430\u0442\u0438), \u0435\u0441\u043B\
-      \u0438 \u043D\u0430 \u0432\u0430\u0441 \u043D\u0430\u0434\u0435\u0442\u044B\
-      \ \u043D\u0430\u0440\u0443\u0447\u043D\u0438\u043A\u0438."
-    type: Add
-  - message: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u0432\u0440\u0435\
-      \u043C\u044F \u0441\u043D\u044F\u0442\u0438\u0435 \u0432\u0441\u0435\u0445 \u043D\
-      \u0430\u0440\u0443\u0447\u043D\u0438\u043A\u043E\u0432."
-    type: Tweak
-  id: 130
-  time: '2023-04-09T01:43:49.0000000+00:00'
-- author: HitPanda
-  changes:
-  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D \u0431\u0430\u0433\
-      , \u043F\u0440\u0438 \u043A\u043E\u0442\u043E\u0440\u043E\u043C, \u0435\u0441\
-      \u043B\u0438 \u0432\u044B \u043D\u0430\u0447\u0438\u043D\u0430\u0435\u0442\u0435\
-      \ \u043E\u0442\u0441\u0442\u0451\u0433\u0438\u0432\u0430\u0442\u044C\u0441\u044F\
-      \ \u0432 \u043D\u0430\u0440\u0443\u0447\u043D\u0438\u043A\u0430\u0445, \u0442\
-      \u0430\u0439\u043C\u0435\u0440 \u043D\u0435 \u043E\u0442\u043C\u0435\u043D\u044F\
-      \u043B\u0441\u044F, \u0435\u0441\u043B\u0438 \u0441 \u0432\u0430\u0441 \u0438\
-      \u0445 \u0441\u043D\u044F\u043B\u0438."
-    type: Fix
-  id: 131
-  time: '2023-04-09T10:48:23.0000000+00:00'
 - author: HitPanda
   changes:
   - message: "\u0424\u0438\u043A\u0441 \u0431\u0430\u0433\u0430, \u043F\u0440\u0438\
@@ -8910,3 +8873,39 @@
   id: 628
   time: '2024-12-13T18:43:45.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/819
+- author: Ivangelion
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0441\u0435\u0440\u044B\
+      \u0439 \u0441\u043F\u043E\u0440\u0442\u0438\u0432\u043D\u044B\u0439 \u043A\u043E\
+      \u0441\u0442\u044E\u043C \u0410\u0434\u0438\u0434\u0430\u0441"
+    type: Add
+  - message: "\u0441\u0435\u0440\u044B\u0439 \u0441\u043F\u043E\u0440\u0442\u0438\u0432\
+      \u043D\u044B\u0439 \u043A\u043E\u0441\u0442\u044E\u043C \u0410\u0434\u0438\u0434\
+      \u0430\u0441 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\
+      \ \u043F\u0440\u0438\u043E\u0431\u0440\u0435\u0441\u0442\u0438 \u0432 \u041E\
+      \u0434\u0435\u0436\u0434\u043E\u043C\u0430\u0442\u0435 \u0437\u0430 140$"
+    type: Tweak
+  id: 629
+  time: '2024-12-14T08:50:08.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/820
+- author: Ivangelion
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0441\u0442\u0440\
+      \u043E\u043A\u0430 \u043F\u043E\u0438\u0441\u043A\u0430 \u0432 \u0430\u0432\u0442\
+      \u043E\u043C\u0430\u0442\u044B \u0440\u0430\u0437\u0434\u0430\u0442\u0447\u0438\
+      \u043A\u0438"
+    type: Tweak
+  id: 630
+  time: '2024-12-14T14:51:44.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/822
+- author: BIG_Zi_348
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0447\u0435\u0440\
+      \u0442\u0435\u0436\u0438, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043C\u043E\
+      \u0436\u043D\u043E \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043A\u0430\
+      \u043A \u043D\u0430\u0433\u0440\u0430\u0434\u0443 \u0441 \u044D\u043A\u0441\u043F\
+      \u0435\u0434\u0438\u0446\u0438\u0439."
+    type: Add
+  id: 631
+  time: '2024-12-14T19:11:00.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/821

Resources/Locale/ru-RU/research/components/blueprint.ftl

@@ -0,0 +1,2 @@
+blueprint-receiver-popup-insert = { CAPITALIZE($user) } помещает { $blueprint } в { $receiver }.
+blueprint-receiver-popup-recipe-exists = Такой чертёж уже был добавлен!

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/blueprint.ftl

@@ -0,0 +1,6 @@
+ent-BaseBlueprint = чертёж
+    .desc = Чертёж какого-то устройства. Его можно поместить в автолат.
+ent-BlueprintFulton = чертёж фултона
+    .desc = Чертёж со схемой фултона. Его можно поместить в автолат.
+ent-BlueprintSeismicCharge = чертёж сейсмического заряда
+    .desc = Чертеж со схемой сейсмического заряда. Его можно поместить в автолат.

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/lathe.ftl

@@ -1,5 +1,5 @@
 ent-Autolathe = автолат
-    .desc = Он производит изделия из металла и стекла.
+    .desc = Производит базовые изделия из металла и стекла. Имеет возможность обрабатывать чертежи для печати по новым рецептам.
 ent-Protolathe = протолат
     .desc = Преобразует сырье в полезные предметы.
 ent-CircuitImprinter = принтер схем

Resources/Locale/ru-RU/vending-machines/vending-machine-component.ftl

@@ -3,6 +3,7 @@
 vending-machine-component-try-eject-invalid-item = Несуществующий предмет
 vending-machine-component-try-eject-out-of-stock = Нет в наличии
 vending-machine-component-try-eject-access-denied = Доступ запрещён
+vending-machine-component-search-filter = Поиск...
 vending-machine-action-name = Выдать предмет
 vending-machine-action-description = Выдаёт случайный предмет из вашего инвентаря.
 vending-machine-insert-fromStorage-success = Перемещено предметов: { $count }

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -66,6 +66,7 @@
     ClothingUniformJumpsuitFlannel: 2
     #WD edit start
     ClothingUniformJumpsuitCossack: 1
+    ClothingOuterCoatAdidasCostumeSemki: 1
     ClothingOuterCoatBomber: 1
     ClothingOuterWinterCoat: 1
     ClothingOuterCoatGentle: 1

Resources/Prototypes/Entities/Objects/Tools/blueprint.yml

@@ -0,0 +1,39 @@
+- type: entity
+  parent: BaseItem
+  id: BaseBlueprint
+  name: blueprint
+  description: A blueprint for some machine. It can be inserted into an autolathe.
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/blueprint.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Tools/blueprint.rsi
+    size: Normal
+  - type: Blueprint
+  - type: StaticPrice
+    price: 1000
+  - type: Tag
+    tags:
+    - BlueprintAutolathe
+
+- type: entity
+  parent: BaseBlueprint
+  id: BlueprintFulton
+  name: fulton blueprint
+  description: A blueprint with a schematic of a fulton. It can be inserted into an autolathe.
+  components:
+  - type: Blueprint
+    providedRecipes:
+    - Fulton
+
+- type: entity
+  parent: BaseBlueprint
+  id: BlueprintSeismicCharge
+  name: seismic charge blueprint
+  description: A blueprint with a schematic of a seismic charge. It can be inserted into an autolathe.
+  components:
+  - type: Blueprint
+    providedRecipes:
+    - SeismicCharge

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -99,7 +99,7 @@
   id: Autolathe
   parent: BaseLatheLube
   name: autolathe
-  description: It produces basic items using metal and glass.
+  description: It produces basic items using metal and glass. Has the ability to process blueprints to print new recipes.
   components:
   - type: Sprite
     sprite: Structures/Machines/autolathe.rsi
@@ -277,6 +277,18 @@
       - HolographicSightModule
       - TelescopicSightModule
   - type: BluespaceStorage
+  - type: BlueprintReceiver
+    whitelist:
+      tags:
+      - BlueprintAutolathe
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+      blueprint: !type:Container
+  - type: EmptyOnMachineDeconstruct
+    containers:
+    - blueprint
 
 - type: entity
   id: AutolatheHyperConvection

Resources/Prototypes/Procedural/salvage_rewards.yml

@@ -50,6 +50,8 @@
     SpaceCash500: 1.0
     SpaceCash1000: 0.75
     SpaceCash2500: 0.5
+    # blueprints WD
+    BlueprintFulton: 1.0
 
 - type: weightedRandomEntity
   id: SalvageRewardEpic
@@ -74,3 +76,5 @@
     SpaceCash2500: 1.0
     SpaceCash5000: 0.75
     SpaceCash10000: 0.5
+    # blueprints WD
+    BlueprintSeismicCharge: 1.0

Resources/Prototypes/Recipes/Lathes/salvage.yml

@@ -1,16 +1,28 @@
 - type: latheRecipe
   id: Fulton
   result: Fulton1
+  category: Tools
   completetime: 1
   materials:
     Steel: 200
-    Cloth: 100
+    Cloth: 500
 
 - type: latheRecipe
   id: FultonBeacon
   result: FultonBeacon
+  category: Tools
   completetime: 5
   materials:
     Steel: 1000
     Glass: 500
     # If they get spammed make it cost silver.
+
+- type: latheRecipe
+  id: SeismicCharge
+  result: SeismicCharge
+  category: Tools
+  completetime: 5 # WD Edit from 1 to 5
+  materials:
+    Plastic: 1500
+    Steel: 100
+    Silver: 100

Resources/Prototypes/_White/Entities/Clothing/OuterClothing/adidascostume.yml

@@ -0,0 +1,19 @@
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatAdidasCostume
+  name: серый спортивный костюм
+  description: Когда-то костюмы Абибаса были очень популярны. Сейчас же это больше культурное наследие. Странно, почему так хочется семечек?
+  components:
+  - type: Sprite
+    sprite: White/Clothing/OuterClothing/Coats/adidascostume.rsi
+  - type: Clothing
+    sprite: White/Clothing/OuterClothing/Coats/adidascostume.rsi
+
+- type: entity
+  parent: ClothingOuterCoatAdidasCostume
+  id: ClothingOuterCoatAdidasCostumeSemki
+  suffix: Семки
+  components:
+  - type: StorageFill
+    contents:
+    - id: FoodSnackSemki

Resources/Prototypes/tags.yml

@@ -63,6 +63,9 @@
 - type: Tag
   id: Bloodpack
 
+- type: Tag
+  id: BlueprintAutolathe
+
 - type: Tag
   id: BodyBag
 
@@ -263,7 +266,7 @@
 
 - type: Tag
   id: CannonBall
-  
+
 - type: Tag
   id: CannotSuicide
 

Resources/Textures/Objects/Tools/blueprint.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/dd749c36c416a6960782732cecf25e5ebac326e8",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        }
+    ]
+}

Resources/Textures/White/Clothing/OuterClothing/Coats/adidascostume.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "-",
+    "copyright": "sprite by dosharus",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}