diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs index 9e3430915d..f8cbc8b593 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchComponent.cs @@ -4,6 +4,7 @@ */ using Content.Shared._CP14.Workbench.Prototypes; +using Content.Shared.Tag; using Robust.Shared.Audio; using Robust.Shared.Prototypes; @@ -22,12 +23,21 @@ public sealed partial class CP14WorkbenchComponent : Component [DataField] public float CraftSpeed = 1f; + [DataField] + public float WorkbenchRadius = 0.5f; + /// /// List of recipes available for crafting on this type of workbench /// [DataField] public List> Recipes = new(); + /// + /// Auto recipe list fill based on tags + /// + [DataField] + public List> RecipeTags = new(); + /// /// Played during crafting. Can be overwritten by the crafting sound of a specific recipe. /// diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.UI.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.UI.cs index 2c771790f1..d80137754b 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.UI.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.UI.cs @@ -22,7 +22,7 @@ public sealed partial class CP14WorkbenchSystem private void UpdateUIRecipes(Entity entity) { - var placedEntities = _lookup.GetEntitiesInRange(Transform(entity).Coordinates, WorkbenchRadius); + var placedEntities = _lookup.GetEntitiesInRange(Transform(entity).Coordinates, entity.Comp.WorkbenchRadius); var recipes = new List(); foreach (var recipeId in entity.Comp.Recipes) diff --git a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs index d87443ac1a..a060a178ec 100644 --- a/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs +++ b/Content.Server/_CP14/Workbench/CP14WorkbenchSystem.cs @@ -3,12 +3,12 @@ * https://github.com/space-wizards/space-station-14/blob/master/LICENSE.TXT */ -using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.DoAfter; using Content.Server.Popups; using Content.Server.Stack; using Content.Shared._CP14.Workbench; using Content.Shared._CP14.Workbench.Prototypes; +using Content.Shared.Chemistry.EntitySystems; using Content.Shared.DoAfter; using Content.Shared.Stacks; using Content.Shared.UserInterface; @@ -27,16 +27,13 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; private EntityQuery _metaQuery; private EntityQuery _stackQuery; - // Why not in component? Why? - private const float WorkbenchRadius = 0.5f; - public override void Initialize() { base.Initialize(); @@ -44,12 +41,28 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem _metaQuery = GetEntityQuery(); _stackQuery = GetEntityQuery(); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnBeforeUIOpen); SubscribeLocalEvent(OnCraft); SubscribeLocalEvent(OnCraftFinished); } + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + foreach (var recipe in _proto.EnumeratePrototypes()) + { + if (ent.Comp.Recipes.Contains(recipe)) + continue; + + if (!ent.Comp.RecipeTags.Contains(recipe.Tag)) + continue; + + ent.Comp.Recipes.Add(recipe); + } + } + private void OnBeforeUIOpen(Entity ent, ref BeforeActivatableUIOpenEvent args) { UpdateUIRecipes(ent); @@ -64,7 +77,7 @@ public sealed partial class CP14WorkbenchSystem : SharedCP14WorkbenchSystem if (!_proto.TryIndex(args.Recipe, out var recipe)) return; - var placedEntities = _lookup.GetEntitiesInRange(Transform(ent).Coordinates, WorkbenchRadius, LookupFlags.Uncontained); + var placedEntities = _lookup.GetEntitiesInRange(Transform(ent).Coordinates, ent.Comp.WorkbenchRadius, LookupFlags.Uncontained); if (!CanCraftRecipe(recipe, placedEntities)) { diff --git a/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs b/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs index 9d1f7d7131..614031e3f5 100644 --- a/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs +++ b/Content.Shared/_CP14/Workbench/Prototypes/CP14WorkbenchRecipePrototype.cs @@ -4,6 +4,7 @@ */ using Content.Shared.Stacks; +using Content.Shared.Tag; using Robust.Shared.Audio; using Robust.Shared.Prototypes; @@ -15,6 +16,9 @@ public sealed class CP14WorkbenchRecipePrototype : IPrototype [IdDataField] public string ID { get; private set; } = default!; + [DataField(required: true)] + public ProtoId Tag = default!; + [DataField] public TimeSpan CraftTime = TimeSpan.FromSeconds(1f); diff --git a/Resources/Locale/en-US/_CP14/tips/tip.ftl b/Resources/Locale/en-US/_CP14/tips/tip.ftl index cd1f0e4570..6fe43ef2fc 100644 --- a/Resources/Locale/en-US/_CP14/tips/tip.ftl +++ b/Resources/Locale/en-US/_CP14/tips/tip.ftl @@ -4,9 +4,11 @@ cp14-tips-3 = Some light weapons, such as daggers or sickles, are effective for cp14-tips-4 = Some magic items can only work after being attuned. To customize the binding, press the RMB and select the desired action. cp14-tips-5 = As an alchemist, if you mix some reagents together, you can no longer separate them! Look for the right alchemical reactions that will allow you to edit your solution. cp14-tips-6 = As an alchemist, remember to keep your cauldron off the stove or fire. Your potion may boil over, releasing a reagent cloud. -cp14-tips-7 = DEBUG: To see all crafting recipes available on workbenches - look for them in the context menu on the RMB. +cp14-tips-7 = You can use shields to parry enemy attacks! Hit the enemy with a shield strike immediately after his attack and you can knock the weapon out of his hands. cp14-tips-8 = If you run out of magic energy, you can still use spells and spend mana, but it will damage you and potentially render you unconscious! cp14-tips-9 = There are places in the world with positive or negative magical polarity. In these places, mana regenerates faster, or conversely, can be passively spent. To find such places, use the Aura Scanner. cp14-tips-10 = Tall bushes are good for hiding your character! But they slow you down a lot and make a lot of noise if you move in them. cp14-tips-11 = Don't forget to lock your doors if you don't want anyone to get in! -cp14-tips-12 = DEBUG: Be careful with fire! Until we add ways to comfortably put out fires! \ No newline at end of file +cp14-tips-12 = DEBUG: Be careful with fire! Until we add ways to comfortably put out fires! +cp14-tips-13 = As a farmer, don't forget to water your vegetable garden! Plants die without watering. +cp14-tips-14 = To pierce the dish, try combining different ingredients on a plate. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/tips/tip.ftl b/Resources/Locale/ru-RU/_CP14/tips/tip.ftl index a542761de9..485d23143b 100644 --- a/Resources/Locale/ru-RU/_CP14/tips/tip.ftl +++ b/Resources/Locale/ru-RU/_CP14/tips/tip.ftl @@ -4,9 +4,11 @@ cp14-tips-3 = Некоторое легкое оружие, такое как к cp14-tips-4 = Некоторые магические предметы могут работать только после привязки. Чтобы настроить привязку, нажмите ПКМ и выберите нужное действие. cp14-tips-5 = Будучи алхимиком, если вы смешали какие-то реагенты вместе, вы больше не сможете их разделить! Ищите нужные алхемические реакции, которые позволят вам редактировать ваш раствор. cp14-tips-6 = Будучи алхимиком, не забывайте убрать ваш котелок с печки или костра. Ваше зелье может выкипеть, выпустив реагентное облако. -cp14-tips-7 = DEBUG: Чтобы увидеть все рецепты крафта, доступные на верстаках - ищите из в контекстном меню на ПКМ. +cp14-tips-7 = Вы можете использовать щиты, чтобы парировать вражеские атаки! Попадите по противнику ударом щита сразу же после его атаки, и вы сможете выбить оружие из его рук. cp14-tips-8 = Если у вас кончилась магическая энергия, вы все еще можете использовать заклинания и тратить ману, но это будет наносить вам урон, и потенциально может лишить вас сознания! cp14-tips-9 = В мире существуют места, с положительной или отрицательной магической полярностью. В этих местах мана регенерирует быстрее, или наоборот, может пассивно тратиться. Чтобы найти такие места, используйте сканер ауры. cp14-tips-10 = Высокие кусты неплохо прячут вашего персонажа! Но сильно замедляют передвижение и шумят, если вы двигаетесь в них. cp14-tips-11 = Не забывайте закрывать двери на ключ, если не хотите чтобы туда заходил кто попало! -cp14-tips-12 = DEBUG: Будьте осторожны с огнем! Пока мы не добавили способов комфортно тушить пожары! \ No newline at end of file +cp14-tips-12 = DEBUG: Будьте осторожны с огнем! Пока мы не добавили способов комфортно тушить пожары! +cp14-tips-13 = Будучи фермером, не забывайте поливать свой огород! Растения умирают без полива. +cp14-tips-14 = Чтобы пирготовить блюдо, попробуйте скомбинировать на тарелке разные игредиенты. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Datasets/tips.yml b/Resources/Prototypes/_CP14/Datasets/tips.yml index 8fcbf508c9..af9a122b69 100644 --- a/Resources/Prototypes/_CP14/Datasets/tips.yml +++ b/Resources/Prototypes/_CP14/Datasets/tips.yml @@ -2,4 +2,4 @@ id: CP14Tips values: prefix: cp14-tips- - count: 12 \ No newline at end of file + count: 14 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index bf4ae76bfc..fc47da6627 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -94,6 +94,7 @@ species: CP14Goblin - type: Inventory templateId: CP14Human + speciesId: goblin displacements: belt: sizeMaps: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Blacksmith/melting_molds.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Blacksmith/melting_molds.yml deleted file mode 100644 index 690558cae4..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Blacksmith/melting_molds.yml +++ /dev/null @@ -1,101 +0,0 @@ -- type: entity - id: CP14MeltingMoldBase - abstract: true - parent: BaseItem - name: melting mold - description: Wooden board for casting the metal into the required molds. - components: - - type: Item - size: Normal - - type: Sprite - sprite: _CP14/Objects/Specific/Blacksmith/melting_molds.rsi - -- type: entity - id: CP14MeltingMoldBlank - parent: CP14MeltingMoldBase - name: blank melting mold - description: An empty mold for casting metal. You can cut any shape you need in it on the pattern cutting table. - components: - - type: Sprite - layers: - - state: blank - -- type: entity - id: CP14MeltingMoldDaggers - parent: CP14MeltingMoldBase - name: dagger blade mold - components: - - type: Sprite - layers: - - state: blank - - state: dagger - -- type: entity - id: CP14MeltingMoldNails - parent: CP14MeltingMoldBase - name: mails mold - components: - - type: Sprite - layers: - - state: blank - - state: nails - -- type: entity - id: CP14MeltingMoldPickaxe - parent: CP14MeltingMoldBase - name: pickaxe head mold - components: - - type: Sprite - layers: - - state: blank - - state: pickaxe - -- type: entity - id: CP14MeltingMoldShovel - parent: CP14MeltingMoldBase - name: shovel head mold - components: - - type: Sprite - layers: - - state: blank - - state: shovel - -- type: entity - id: CP14MeltingMoldSickle - parent: CP14MeltingMoldBase - name: sickle blade mold - components: - - type: Sprite - layers: - - state: blank - - state: sickle - -- type: entity - id: CP14MeltingMoldSword - parent: CP14MeltingMoldBase - name: sword blade mold - components: - - type: Sprite - layers: - - state: blank - - state: sword - -- type: entity - id: CP14MeltingMoldThrowableSpear - parent: CP14MeltingMoldBase - name: throwable spearhead mold - components: - - type: Sprite - layers: - - state: blank - - state: throwable_spear - -- type: entity - id: CP14MeltingMoldTwoHandedSword - parent: CP14MeltingMoldBase - name: two-handed sword blade mold - components: - - type: Sprite - layers: - - state: blank - - state: two_handed_sword \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 80a52d02f3..f6ab96a6f9 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -4,6 +4,13 @@ id: CP14BaseWorkbench abstract: true components: + - type: Sprite + snapCardinals: true + sprite: _CP14/Structures/Furniture/workbench.rsi + state: filler + - type: Icon + sprite: _CP14/Structures/Furniture/workbench.rsi + state: filler - type: ActivatableUI key: enum.CP14WorkbenchUiKey.Key - type: Climbable @@ -26,11 +33,8 @@ description: Table for the production of various basic tools. components: - type: Sprite - snapCardinals: true - sprite: _CP14/Structures/Furniture/workbench.rsi state: workbench - type: Icon - sprite: _CP14/Structures/Furniture/workbench.rsi state: workbench - type: Damageable damageContainer: Inorganic @@ -71,70 +75,31 @@ graph: CP14TableWooden node: CP14Workbench - type: CP14Workbench - recipes: - - CP14Bucket - - CP14BaseBarrel - - CP14WoodenBeerMug - - CP14PlateWooden - -- type: entity - id: CP14WorkbenchMeltingMolds - parent: - - CP14BaseWorkbench - - CP14BaseFlammable - name: sawing melting molds table - description: Specialized table that allows you to cut out molds for metal smelting. - components: - - type: Sprite - snapCardinals: true - sprite: _CP14/Structures/Furniture/workbench.rsi - state: melting_crafter - - type: Icon - sprite: _CP14/Structures/Furniture/workbench.rsi - state: melting_crafter - - type: CP14Workbench - craftSound: - collection: CP14Sawing - recipes: - - CP14MeltingMoldBlank - - CP14MeltingMoldDaggers - - CP14MeltingMoldNails - - CP14MeltingMoldPickaxe - - CP14MeltingMoldShovel - - CP14MeltingMoldSickle - - CP14MeltingMoldSword - - CP14MeltingMoldThrowableSpear - - CP14MeltingMoldTwoHandedSword + recipeTags: + - CP14RecipeWorkbench - type: entity id: CP14WorkbenchCooking parent: - - CP14WorkbenchMeltingMolds + - CP14BaseWorkbench - CP14BaseFlammable name: cooking table description: A table to work with food. Time to cook! components: - type: Sprite - snapCardinals: true state: cooking_table - type: Icon state: cooking_table - type: CP14Workbench craftSound: collection: CP14Sawing #TODO - recipes: - - CP14FoodDoughLarge - - CP14FoodDoughMediumFlat - - CP14FoodDoughMedium - - CP14FoodMeatLamb - - CP14SeedPumpkin - - CP14SeedWheat - - CP14SeedCucumber + recipeTags: + - CP14RecipeCooking - type: entity id: CP14WorkbenchSewing parent: - - CP14WorkbenchMeltingMolds + - CP14BaseWorkbench - CP14BaseFlammable name: sewing table description: A table with embroidery tools to create different clothing and materials. @@ -142,28 +107,5 @@ - type: CP14Workbench craftSound: collection: CP14Sawing #TODO - recipes: - - CP14ClothingShirtCottonBlue - - CP14ClothingShirtCottonBlack - - CP14ClothingShirtCottonPurple - - CP14ClothingShirtCottonRed - - CP14ClothingShirtCottonWhite - - CP14ClothingShirtCottonYellow - - CP14ClothingShirtMercenary - - CP14ClothingShirtYellowWizard - - CP14ClothingCloakSimpleDarkBlue - - CP14ClothingCloakSimpleWhite - - CP14ClothingPantsTrouserWhite - - CP14ClothingPantsTrouserDarkBlue - - CP14ClothingDressBlack - - CP14ClothingPantsSouthernMagician - - CP14ClothingPantsMercenaryTrousers - - CP14ClothingHeadBeretRed - - CP14ClothingHeadBeretPurple - - CP14ClothingHeadBeretYellow - - CP14ClothingHeadBeretBlue - - CP14ClothingHeadBeretBlack - - CP14ClothingHeadBeretMercenary - - CP14ClothingHeadBandanaWhite - - CP14ClothingHeadBandanaYellow - - CP14ClothingHeadWreath \ No newline at end of file + recipeTags: + - CP14RecipeSewing diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml index 6df5c0ae5e..7d64bda121 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/cooking_table.yml @@ -1,5 +1,6 @@ - type: CP14Recipe id: CP14FoodMeatLamb + tag: CP14RecipeCooking craftTime: 2 entities: CP14FoodMeatLambSlice: 2 @@ -9,6 +10,7 @@ - type: CP14Recipe id: CP14FoodDoughLarge + tag: CP14RecipeCooking craftTime: 3 entities: CP14FoodDoughMedium: 5 @@ -17,6 +19,7 @@ - type: CP14Recipe id: CP14FoodDoughMedium + tag: CP14RecipeCooking craftTime: 3 entities: CP14FoodDoughMediumFlat: 1 @@ -25,6 +28,7 @@ - type: CP14Recipe id: CP14FoodDoughMediumFlat + tag: CP14RecipeCooking craftTime: 3 entities: CP14FoodDoughMedium: 1 @@ -33,6 +37,7 @@ - type: CP14Recipe id: CP14SeedPumpkin + tag: CP14RecipeCooking craftTime: 1 entities: CP14FoodPumpkinSlice: 1 @@ -40,6 +45,7 @@ - type: CP14Recipe id: CP14SeedCucumber + tag: CP14RecipeCooking craftTime: 1 entities: CP14FoodCucumber: 1 @@ -47,6 +53,7 @@ - type: CP14Recipe id: CP14SeedWheat + tag: CP14RecipeCooking craftTime: 1 entities: CP14Wheat: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/melds_crafter.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/melds_crafter.yml deleted file mode 100644 index 3a0712104e..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/melds_crafter.yml +++ /dev/null @@ -1,62 +0,0 @@ -- type: CP14Recipe - id: CP14MeltingMoldBlank - craftTime: 2 - stacks: - CP14WoodenPlanks: 2 - result: CP14MeltingMoldBlank - -- type: CP14Recipe - id: CP14MeltingMoldDaggers - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldDaggers - -- type: CP14Recipe - id: CP14MeltingMoldNails - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldNails - -- type: CP14Recipe - id: CP14MeltingMoldPickaxe - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldPickaxe - -- type: CP14Recipe - id: CP14MeltingMoldShovel - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldShovel - -- type: CP14Recipe - id: CP14MeltingMoldSickle - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldSickle - -- type: CP14Recipe - id: CP14MeltingMoldSword - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldSword - -- type: CP14Recipe - id: CP14MeltingMoldThrowableSpear - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldThrowableSpear - -- type: CP14Recipe - id: CP14MeltingMoldTwoHandedSword - craftTime: 2 - entities: - CP14MeltingMoldBlank: 1 - result: CP14MeltingMoldTwoHandedSword \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index 2a39e22f1d..35cb1ecd9f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -1,5 +1,6 @@ - type: CP14Recipe id: CP14ClothingShirtCottonBlue + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -10,6 +11,7 @@ - type: CP14Recipe id: CP14ClothingShirtCottonBlack + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -20,6 +22,7 @@ - type: CP14Recipe id: CP14ClothingShirtCottonPurple + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -30,6 +33,7 @@ - type: CP14Recipe id: CP14ClothingShirtCottonRed + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -40,6 +44,7 @@ - type: CP14Recipe id: CP14ClothingShirtCottonWhite + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -49,6 +54,7 @@ - type: CP14Recipe id: CP14ClothingShirtCottonYellow + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -59,6 +65,7 @@ - type: CP14Recipe id: CP14ClothingShirtMercenary + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -70,6 +77,7 @@ - type: CP14Recipe id: CP14ClothingShirtYellowWizard + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -82,6 +90,7 @@ - type: CP14Recipe id: CP14ClothingCloakSimpleDarkBlue + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -92,6 +101,7 @@ - type: CP14Recipe id: CP14ClothingCloakSimpleWhite + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -101,6 +111,7 @@ - type: CP14Recipe id: CP14ClothingPantsTrouserWhite + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -110,6 +121,7 @@ - type: CP14Recipe id: CP14ClothingPantsTrouserDarkBlue + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -120,6 +132,7 @@ - type: CP14Recipe id: CP14ClothingDressBlack + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -130,6 +143,7 @@ - type: CP14Recipe id: CP14ClothingPantsSouthernMagician + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -140,6 +154,7 @@ - type: CP14Recipe id: CP14ClothingPantsMercenaryTrousers + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -151,6 +166,7 @@ - type: CP14Recipe id: CP14ClothingHeadBeretRed + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -161,6 +177,7 @@ - type: CP14Recipe id: CP14ClothingHeadBeretPurple + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -171,6 +188,7 @@ - type: CP14Recipe id: CP14ClothingHeadBeretYellow + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -181,6 +199,7 @@ - type: CP14Recipe id: CP14ClothingHeadBeretBlue + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -191,6 +210,7 @@ - type: CP14Recipe id: CP14ClothingHeadBeretBlack + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -201,6 +221,7 @@ - type: CP14Recipe id: CP14ClothingHeadBandanaWhite + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -210,6 +231,7 @@ - type: CP14Recipe id: CP14ClothingHeadBandanaYellow + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -220,6 +242,7 @@ - type: CP14Recipe id: CP14ClothingHeadBeretMercenary + tag: CP14RecipeSewing craftTime: 2 entities: CP14String: 1 @@ -231,6 +254,7 @@ - type: CP14Recipe id: CP14ClothingHeadWreath + tag: CP14RecipeSewing craftTime: 2 entities: CP14FlowersRed: 2 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index e8656596a0..b16963087b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -1,5 +1,6 @@ - type: CP14Recipe id: CP14Bucket + tag: CP14RecipeWorkbench craftTime: 2 entities: CP14Rope: 1 @@ -9,6 +10,7 @@ - type: CP14Recipe id: CP14BaseBarrel + tag: CP14RecipeWorkbench craftTime: 3 stacks: CP14WoodenPlanks: 5 @@ -17,6 +19,7 @@ - type: CP14Recipe id: CP14WoodenBeerMug + tag: CP14RecipeWorkbench craftTime: 3 stacks: CP14WoodenPlanks: 2 @@ -25,6 +28,7 @@ - type: CP14Recipe id: CP14PlateWooden + tag: CP14RecipeWorkbench craftTime: 3 stacks: CP14WoodenPlanks: 2 diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 37717be90f..62d5f7f71e 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -28,6 +28,14 @@ - type: Tag id: CP14AmbientWater - - type: Tag id: CP14Plate + +- type: Tag + id: CP14RecipeSewing + +- type: Tag + id: CP14RecipeCooking + +- type: Tag + id: CP14RecipeWorkbench diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml index 034963a3d5..970a1bc592 100644 --- a/Resources/Prototypes/lobbyscreens.yml +++ b/Resources/Prototypes/lobbyscreens.yml @@ -10,3 +10,11 @@ - type: lobbyBackground id: Tiefling background: /Textures/_CP14/LobbyScreens/tiefling.webp + +- type: lobbyBackground + id: CuteCat + background: /Textures/_CP14/LobbyScreens/cutecat.webp + +- type: lobbyBackground + id: GobWay + background: /Textures/_CP14/LobbyScreens/gob_way.webp diff --git a/Resources/Textures/_CP14/LobbyScreens/attributions.yml b/Resources/Textures/_CP14/LobbyScreens/attributions.yml index 7885038b44..5762592d45 100644 --- a/Resources/Textures/_CP14/LobbyScreens/attributions.yml +++ b/Resources/Textures/_CP14/LobbyScreens/attributions.yml @@ -1,4 +1,4 @@ -- files: ["beginning.webp", "typicalAlchemistDay.webp", "tiefling.webp"] +- files: ["beginning.webp", "typicalAlchemistDay.webp", "tiefling.webp", "gob_way.webp", "cutecat.webp"] license: "CLA" copyright: "alisw_a on discord" source: "https://github.com/crystallpunk-14/crystall-punk-14" diff --git a/Resources/Textures/_CP14/LobbyScreens/cutecat.webp b/Resources/Textures/_CP14/LobbyScreens/cutecat.webp new file mode 100644 index 0000000000..e8ab05128c Binary files /dev/null and b/Resources/Textures/_CP14/LobbyScreens/cutecat.webp differ diff --git a/Resources/Textures/_CP14/LobbyScreens/cutecat.webp.yml b/Resources/Textures/_CP14/LobbyScreens/cutecat.webp.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/_CP14/LobbyScreens/cutecat.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/_CP14/LobbyScreens/gob_way.webp b/Resources/Textures/_CP14/LobbyScreens/gob_way.webp new file mode 100644 index 0000000000..ddfcbf3d74 Binary files /dev/null and b/Resources/Textures/_CP14/LobbyScreens/gob_way.webp differ diff --git a/Resources/Textures/_CP14/LobbyScreens/gob_way.webp.yml b/Resources/Textures/_CP14/LobbyScreens/gob_way.webp.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/_CP14/LobbyScreens/gob_way.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/melting_crafter.png b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/filler.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/melting_crafter.png rename to Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/filler.png diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json index 84533471ff..656a6d26a7 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json @@ -11,7 +11,7 @@ "name": "workbench" }, { - "name": "melting_crafter" + "name": "filler" }, { "name": "cooking_table" diff --git a/Resources/migration.yml b/Resources/migration.yml index 9883399682..ac597fa822 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -96,6 +96,10 @@ CP14IronGrilleGateLockedTavern: null CP14ClothingHeadMercenaryBeret: CP14ClothingHeadBeretMercenary +#2024-09-28 +CP14MeltingMoldBlank: null +CP14WorkbenchMeltingMolds: null + # <---> CrystallPunk migration zone end