diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs index ce79e8e4e4..5c3e8ea036 100644 --- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs +++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs @@ -23,7 +23,7 @@ namespace Content.Client.Lathe.UI base.Open(); _menu = new LatheMenu(this); - _queueMenu = new LatheQueueMenu(this); + _queueMenu = new LatheQueueMenu(); _menu.OnClose += Close; diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index ec8a203689..fe66da2a96 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -140,7 +140,9 @@ public sealed partial class LatheMenu : DefaultWindow sb.Append(Loc.GetString(proto.Name)); } - var icon = _spriteSystem.Frame0(prototype.Icon); + var icon = prototype.Icon == null + ? _spriteSystem.GetPrototypeIcon(prototype.Result).Default + : _spriteSystem.Frame0(prototype.Icon); var canProduce = _lathe.CanProduce(lathe, prototype, quantity); var control = new RecipeControl(prototype, sb.ToString(), canProduce, icon); diff --git a/Content.Client/Lathe/UI/LatheQueueMenu.xaml.cs b/Content.Client/Lathe/UI/LatheQueueMenu.xaml.cs index 6b09f47d22..eaf03c2fff 100644 --- a/Content.Client/Lathe/UI/LatheQueueMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheQueueMenu.xaml.cs @@ -13,7 +13,7 @@ namespace Content.Client.Lathe.UI [Dependency] private readonly IEntityManager _entityManager = default!; private readonly SpriteSystem _spriteSystem; - public LatheQueueMenu(LatheBoundUserInterface owner) + public LatheQueueMenu() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); @@ -26,7 +26,9 @@ namespace Content.Client.Lathe.UI { if (recipe != null) { - Icon.Texture = _spriteSystem.Frame0(recipe.Icon); + Icon.Texture = recipe.Icon == null + ? _spriteSystem.GetPrototypeIcon(recipe.Result).Default + : _spriteSystem.Frame0(recipe.Icon); NameLabel.Text = recipe.Name; Description.Text = recipe.Description; } @@ -44,7 +46,10 @@ namespace Content.Client.Lathe.UI var idx = 1; foreach (var recipe in queue) { - QueueList.AddItem($"{idx}. {recipe.Name}", _spriteSystem.Frame0(recipe.Icon)); + var icon =recipe.Icon == null + ? _spriteSystem.GetPrototypeIcon(recipe.Result).Default + : _spriteSystem.Frame0(recipe.Icon); + QueueList.AddItem($"{idx}. {recipe.Name}", icon); idx++; } } diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs index af574b7305..fa3d13a9e2 100644 --- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs +++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs @@ -17,14 +17,20 @@ namespace Content.Shared.Research.Prototypes [DataField("name")] private string _name = string.Empty; - [DataField("icon")] - private SpriteSpecifier _icon = SpriteSpecifier.Invalid; - [DataField("description")] private string _description = string.Empty; - [DataField("result", customTypeSerializer:typeof(PrototypeIdSerializer))] - private string _result = string.Empty; + /// + /// The prototype name of the resulting entity when the recipe is printed. + /// + [DataField("result", required: true, customTypeSerializer:typeof(PrototypeIdSerializer))] + public string Result = string.Empty; + + /// + /// An entity whose sprite is displayed in the ui in place of the actual recipe result. + /// + [DataField("icon")] + public SpriteSpecifier? Icon; [DataField("completetime")] private TimeSpan _completeTime = TimeSpan.FromSeconds(5); @@ -42,7 +48,7 @@ namespace Content.Shared.Research.Prototypes { if (_name.Trim().Length != 0) return _name; var protoMan = IoCManager.Resolve(); - protoMan.TryIndex(_result, out EntityPrototype? prototype); + protoMan.TryIndex(Result, out EntityPrototype? prototype); if (prototype?.Name != null) _name = prototype.Name; return _name; @@ -59,25 +65,13 @@ namespace Content.Shared.Research.Prototypes { if (_description.Trim().Length != 0) return _description; var protoMan = IoCManager.Resolve(); - protoMan.TryIndex(_result, out EntityPrototype? prototype); + protoMan.TryIndex(Result, out EntityPrototype? prototype); if (prototype?.Description != null) _description = prototype.Description; return _description; } } - /// - /// Texture path used in the lathe GUI. - /// - [ViewVariables] - public SpriteSpecifier Icon => _icon; - - /// - /// The prototype name of the resulting entity when the recipe is printed. - /// - [ViewVariables] - public string Result => _result; - /// /// The materials required to produce this recipe. /// Takes a material ID as string. diff --git a/Resources/Prototypes/Recipes/Lathes/Parts.yml b/Resources/Prototypes/Recipes/Lathes/Parts.yml index 1c324573ba..7717ae7d07 100644 --- a/Resources/Prototypes/Recipes/Lathes/Parts.yml +++ b/Resources/Prototypes/Recipes/Lathes/Parts.yml @@ -1,7 +1,6 @@ #Rating 1 - type: latheRecipe id: CapacitorStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: capacitor } result: CapacitorStockPart completetime: 1 materials: @@ -10,7 +9,6 @@ - type: latheRecipe id: MatterBinStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: matter_bin } result: MatterBinStockPart completetime: 1 materials: @@ -19,7 +17,6 @@ - type: latheRecipe id: MicroLaserStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: micro_laser } result: MicroLaserStockPart completetime: 1 materials: @@ -29,7 +26,6 @@ - type: latheRecipe id: MicroManipulatorStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: micro_mani } result: MicroManipulatorStockPart completetime: 1 materials: @@ -38,7 +34,6 @@ - type: latheRecipe id: ScanningModuleStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: scan_module_static } result: ScanningModuleStockPart completetime: 1 materials: @@ -49,7 +44,6 @@ #Rating 2 - type: latheRecipe id: AdvancedCapacitorStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: adv_capacitor } result: AdvancedCapacitorStockPart completetime: 3 materials: @@ -59,7 +53,6 @@ - type: latheRecipe id: AdvancedMatterBinStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: advanced_matter_bin } result: AdvancedMatterBinStockPart completetime: 3 materials: @@ -69,7 +62,6 @@ - type: latheRecipe id: HighPowerMicroLaserStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: high_micro_laser } result: HighPowerMicroLaserStockPart completetime: 3 materials: @@ -80,7 +72,6 @@ - type: latheRecipe id: NanoManipulatorStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: nano_mani } result: NanoManipulatorStockPart completetime: 3 materials: @@ -90,7 +81,6 @@ - type: latheRecipe id: AdvancedScanningModuleStockPart - icon: { sprite: Objects/Misc/stock_parts.rsi, state: adv_scan_module_static } result: AdvancedScanningModuleStockPart completetime: 3 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/botany.yml b/Resources/Prototypes/Recipes/Lathes/botany.yml index 46a1288146..33c3da4fe8 100644 --- a/Resources/Prototypes/Recipes/Lathes/botany.yml +++ b/Resources/Prototypes/Recipes/Lathes/botany.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: MiniHoe - icon: - sprite: Objects/Tools/Hydroponics/hoe.rsi - state: icon result: HydroponicsToolMiniHoe completetime: 2 materials: @@ -11,9 +8,6 @@ - type: latheRecipe id: HydroponicsToolScythe - icon: - sprite: Objects/Tools/Hydroponics/scythe.rsi - state: icon result: HydroponicsToolScythe completetime: 2 materials: @@ -22,9 +16,6 @@ - type: latheRecipe id: HydroponicsToolHatchet - icon: - sprite: Objects/Tools/Hydroponics/hatchet.rsi - state: icon result: HydroponicsToolHatchet completetime: 2 materials: @@ -33,9 +24,6 @@ - type: latheRecipe id: Spade - icon: - sprite: Objects/Tools/Hydroponics/spade.rsi - state: icon result: HydroponicsToolSpade completetime: 2 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/cargo.yml b/Resources/Prototypes/Recipes/Lathes/cargo.yml index be2e708e2d..630dc1d062 100644 --- a/Resources/Prototypes/Recipes/Lathes/cargo.yml +++ b/Resources/Prototypes/Recipes/Lathes/cargo.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: ConveyorBeltAssembly - icon: - sprite: Structures/conveyor.rsi - state: conveyor_loose result: ConveyorBeltAssembly completetime: 4 materials: @@ -11,9 +8,6 @@ - type: latheRecipe id: AppraisalTool - icon: - sprite: Objects/Tools/appraisal-tool.rsi - state: icon result: AppraisalTool completetime: 4 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index a0ba79f3ae..fd0e71bb87 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: Beaker - icon: - sprite: Objects/Specific/Chemistry/beaker.rsi - state: beaker result: Beaker completetime: 2 materials: @@ -10,9 +7,6 @@ - type: latheRecipe id: LargeBeaker - icon: - sprite: Objects/Specific/Chemistry/beaker_large.rsi - state: beakerlarge result: LargeBeaker completetime: 2 materials: @@ -20,9 +14,6 @@ - type: latheRecipe id: CryostasisBeaker - icon: - sprite: Objects/Specific/Chemistry/beaker_cryostasis.rsi - state: beakernoreact result: CryostasisBeaker completetime: 2 materials: @@ -31,9 +22,6 @@ - type: latheRecipe id: Dropper - icon: - sprite: Objects/Specific/Chemistry/dropper.rsi - state: dropper result: Dropper completetime: 2 materials: @@ -42,9 +30,6 @@ - type: latheRecipe id: Syringe - icon: - sprite: Objects/Specific/Chemistry/syringe.rsi - state: syringe_base0 result: Syringe completetime: 2 materials: @@ -53,7 +38,6 @@ - type: latheRecipe id: PillCanister - icon: { sprite: Objects/Specific/Chemistry/pills_canister.rsi, state: pill_canister } result: PillCanister completetime: 2 materials: @@ -61,9 +45,6 @@ - type: latheRecipe id: ChemistryEmptyBottle01 - icon: - sprite: Objects/Specific/Chemistry/bottle.rsi - state: bottle-1 result: ChemistryEmptyBottle01 completetime: 2 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index de4cb8a9aa..9f37506210 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -2,9 +2,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitColorGrey # Tide - icon: - sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi - state: icon result: ClothingUniformJumpsuitColorGrey completetime: 4 materials: @@ -12,9 +9,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtColorGrey - icon: - sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi - state: icon result: ClothingUniformJumpskirtColorGrey completetime: 4 materials: @@ -22,9 +16,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitBartender - icon: - sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi - state: icon result: ClothingUniformJumpsuitBartender completetime: 4 materials: @@ -32,9 +23,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtBartender - icon: - sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi - state: icon result: ClothingUniformJumpskirtBartender completetime: 4 materials: @@ -42,9 +30,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitCaptain - icon: - sprite: Clothing/Uniforms/Jumpsuit/captain.rsi - state: icon result: ClothingUniformJumpsuitCaptain completetime: 4 materials: @@ -53,9 +38,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtCaptain - icon: - sprite: Clothing/Uniforms/Jumpskirt/captain.rsi - state: icon result: ClothingUniformJumpskirtCaptain completetime: 4 materials: @@ -64,9 +46,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitCargo - icon: - sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi - state: icon result: ClothingUniformJumpsuitCargo completetime: 4 materials: @@ -74,9 +53,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtCargo - icon: - sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi - state: icon result: ClothingUniformJumpskirtCargo completetime: 4 materials: @@ -84,9 +60,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitSalvageSpecialist - icon: - sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi - state: icon result: ClothingUniformJumpsuitSalvageSpecialist completetime: 4 materials: @@ -94,9 +67,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitChiefEngineer - icon: - sprite: Clothing/Uniforms/Jumpsuit/ce.rsi - state: icon result: ClothingUniformJumpsuitChiefEngineer completetime: 4 materials: @@ -105,9 +75,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtChiefEngineer - icon: - sprite: Clothing/Uniforms/Jumpskirt/ce.rsi - state: icon result: ClothingUniformJumpskirtChiefEngineer completetime: 4 materials: @@ -116,9 +83,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitChaplain - icon: - sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi - state: icon result: ClothingUniformJumpsuitChaplain completetime: 4 materials: @@ -126,9 +90,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtChaplain - icon: - sprite: Clothing/Uniforms/Jumpskirt/chaplain.rsi - state: icon result: ClothingUniformJumpskirtChaplain completetime: 4 materials: @@ -136,9 +97,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitChef - icon: - sprite: Clothing/Uniforms/Jumpsuit/chef.rsi - state: icon result: ClothingUniformJumpsuitChef completetime: 4 materials: @@ -146,9 +104,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtChef - icon: - sprite: Clothing/Uniforms/Jumpskirt/chef.rsi - state: icon result: ClothingUniformJumpskirtChef completetime: 4 materials: @@ -156,9 +111,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitChemistry - icon: - sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi - state: icon result: ClothingUniformJumpsuitChemistry completetime: 4 materials: @@ -166,9 +118,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtChemistry - icon: - sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi - state: icon result: ClothingUniformJumpskirtChemistry completetime: 4 materials: @@ -176,9 +125,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitClown - icon: - sprite: Clothing/Uniforms/Jumpsuit/clown.rsi - state: icon result: ClothingUniformJumpsuitClown completetime: 4 materials: @@ -186,9 +132,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitCMO - icon: - sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi - state: icon result: ClothingUniformJumpsuitCMO completetime: 4 materials: @@ -197,9 +140,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtCMO - icon: - sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi - state: icon result: ClothingUniformJumpskirtCMO completetime: 4 materials: @@ -208,9 +148,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitDetective - icon: - sprite: Clothing/Uniforms/Jumpsuit/detective.rsi - state: icon result: ClothingUniformJumpsuitDetective completetime: 4 materials: @@ -218,9 +155,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtDetective - icon: - sprite: Clothing/Uniforms/Jumpskirt/detective.rsi - state: icon result: ClothingUniformJumpskirtDetective completetime: 4 materials: @@ -228,9 +162,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitEngineering - icon: - sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi - state: icon result: ClothingUniformJumpsuitEngineering completetime: 4 materials: @@ -238,9 +169,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtEngineering - icon: - sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi - state: icon result: ClothingUniformJumpskirtEngineering completetime: 4 materials: @@ -248,9 +176,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitHoP - icon: - sprite: Clothing/Uniforms/Jumpsuit/hop.rsi - state: icon result: ClothingUniformJumpsuitHoP completetime: 4 materials: @@ -259,9 +184,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtHoP - icon: - sprite: Clothing/Uniforms/Jumpskirt/hop.rsi - state: icon result: ClothingUniformJumpskirtHoP completetime: 4 materials: @@ -270,9 +192,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitHoS - icon: - sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - state: icon result: ClothingUniformJumpsuitHoS completetime: 4 materials: @@ -281,9 +200,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtHoS - icon: - sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - state: icon result: ClothingUniformJumpskirtHoS completetime: 4 materials: @@ -292,9 +208,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitHydroponics - icon: - sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi - state: icon result: ClothingUniformJumpsuitHydroponics completetime: 4 materials: @@ -302,9 +215,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtHydroponics - icon: - sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi - state: icon result: ClothingUniformJumpskirtHydroponics completetime: 4 materials: @@ -312,9 +222,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitJanitor - icon: - sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi - state: icon result: ClothingUniformJumpsuitJanitor completetime: 4 materials: @@ -322,9 +229,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtJanitor - icon: - sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi - state: icon result: ClothingUniformJumpskirtJanitor completetime: 4 materials: @@ -332,9 +236,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitLawyerBlack - icon: - sprite: Clothing/Uniforms/Jumpsuit/lawyerblack.rsi - state: icon result: ClothingUniformJumpsuitLawyerBlack completetime: 4 materials: @@ -342,9 +243,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitLibrarian - icon: - sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi - state: icon result: ClothingUniformJumpsuitLibrarian completetime: 4 materials: @@ -352,9 +250,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtColorLightBrown #Librarian - icon: - sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi - state: icon result: ClothingUniformJumpskirtColorLightBrown completetime: 4 materials: @@ -362,9 +257,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitMedicalDoctor - icon: - sprite: Clothing/Uniforms/Jumpsuit/medical.rsi - state: icon result: ClothingUniformJumpsuitMedicalDoctor completetime: 4 materials: @@ -372,9 +264,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtMedicalDoctor - icon: - sprite: Clothing/Uniforms/Jumpskirt/medical.rsi - state: icon result: ClothingUniformJumpskirtMedicalDoctor completetime: 4 materials: @@ -382,9 +271,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitMime - icon: - sprite: Clothing/Uniforms/Jumpsuit/mime.rsi - state: icon result: ClothingUniformJumpsuitMime completetime: 4 materials: @@ -392,9 +278,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtMime - icon: - sprite: Clothing/Uniforms/Jumpskirt/mime.rsi - state: icon result: ClothingUniformJumpskirtMime completetime: 4 materials: @@ -402,9 +285,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitMusician - icon: - sprite: Clothing/Uniforms/Jumpsuit/musician.rsi - state: icon result: ClothingUniformJumpsuitMusician completetime: 4 materials: @@ -412,9 +292,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitParamedic - icon: - sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi - state: icon result: ClothingUniformJumpsuitParamedic completetime: 4 materials: @@ -422,9 +299,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtParamedic - icon: - sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi - state: icon result: ClothingUniformJumpskirtParamedic completetime: 4 materials: @@ -432,9 +306,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitPrisoner - icon: - sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi - state: icon result: ClothingUniformJumpsuitPrisoner completetime: 4 materials: @@ -442,9 +313,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtPrisoner - icon: - sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi - state: icon result: ClothingUniformJumpskirtPrisoner completetime: 4 materials: @@ -452,9 +320,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitQM - icon: - sprite: Clothing/Uniforms/Jumpsuit/qm.rsi - state: icon result: ClothingUniformJumpsuitQM completetime: 4 materials: @@ -462,9 +327,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtQM - icon: - sprite: Clothing/Uniforms/Jumpskirt/qm.rsi - state: icon result: ClothingUniformJumpskirtQM completetime: 4 materials: @@ -472,9 +334,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitResearchDirector - icon: - sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi - state: icon result: ClothingUniformJumpsuitResearchDirector completetime: 4 materials: @@ -483,9 +342,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtResearchDirector - icon: - sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi - state: icon result: ClothingUniformJumpskirtResearchDirector completetime: 4 materials: @@ -494,9 +350,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitScientist - icon: - sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi - state: icon result: ClothingUniformJumpsuitScientist completetime: 4 materials: @@ -504,9 +357,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtScientist - icon: - sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi - state: icon result: ClothingUniformJumpskirtScientist completetime: 4 materials: @@ -514,9 +364,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitSec - icon: - sprite: Clothing/Uniforms/Jumpsuit/security.rsi - state: icon result: ClothingUniformJumpsuitSec completetime: 4 materials: @@ -524,9 +371,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtSec - icon: - sprite: Clothing/Uniforms/Jumpskirt/security.rsi - state: icon result: ClothingUniformJumpskirtSec completetime: 4 materials: @@ -534,9 +378,6 @@ - type: latheRecipe id: ClothingUniformJumpsuitWarden - icon: - sprite: Clothing/Uniforms/Jumpsuit/warden.rsi - state: icon result: ClothingUniformJumpsuitWarden completetime: 4 materials: @@ -544,9 +385,6 @@ - type: latheRecipe id: ClothingUniformJumpskirtWarden - icon: - sprite: Clothing/Uniforms/Jumpskirt/warden.rsi - state: icon result: ClothingUniformJumpskirtWarden completetime: 4 materials: @@ -554,9 +392,6 @@ - type: latheRecipe id: ClothingOuterWinterCap - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi - state: icon result: ClothingOuterWinterCap completetime: 3.2 materials: @@ -565,9 +400,6 @@ - type: latheRecipe id: ClothingOuterWinterCE - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatce.rsi - state: icon result: ClothingOuterWinterCE completetime: 3.2 materials: @@ -576,9 +408,6 @@ - type: latheRecipe id: ClothingOuterWinterCMO - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi - state: icon result: ClothingOuterWinterCMO completetime: 3.2 materials: @@ -587,9 +416,6 @@ - type: latheRecipe id: ClothingOuterWinterHoP - icon: - sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi - state: icon result: ClothingOuterWinterHoP completetime: 3.2 materials: @@ -598,9 +424,6 @@ - type: latheRecipe id: ClothingOuterWinterHoS - icon: - sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi - state: icon result: ClothingOuterWinterHoS completetime: 3.2 materials: @@ -609,9 +432,6 @@ - type: latheRecipe id: ClothingOuterWinterQM - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi - state: icon result: ClothingOuterWinterQM completetime: 3.2 materials: @@ -620,9 +440,6 @@ - type: latheRecipe id: ClothingOuterWinterRD - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi - state: icon result: ClothingOuterWinterRD completetime: 3.2 materials: @@ -631,9 +448,6 @@ - type: latheRecipe id: ClothingNeckMantleCap - icon: - sprite: Clothing/Neck/mantles/capmantle.rsi - state: icon result: ClothingNeckMantleCap completetime: 2.8 materials: @@ -642,9 +456,6 @@ - type: latheRecipe id: ClothingNeckMantleCE - icon: - sprite: Clothing/Neck/mantles/cemantle.rsi - state: icon result: ClothingNeckMantleCE completetime: 2.8 materials: @@ -653,9 +464,6 @@ - type: latheRecipe id: ClothingNeckMantleCMO - icon: - sprite: Clothing/Neck/mantles/cmomantle.rsi - state: icon result: ClothingNeckMantleCMO completetime: 2.8 materials: @@ -664,9 +472,6 @@ - type: latheRecipe id: ClothingNeckMantleHOP - icon: - sprite: Clothing/Neck/mantles/hopmantle.rsi - state: icon result: ClothingNeckMantleHOP completetime: 2.8 materials: @@ -675,9 +480,6 @@ - type: latheRecipe id: ClothingNeckMantleHOS - icon: - sprite: Clothing/Neck/mantles/hosmantle.rsi - state: icon result: ClothingNeckMantleHOS completetime: 2.8 materials: @@ -686,9 +488,6 @@ - type: latheRecipe id: ClothingNeckMantleRD - icon: - sprite: Clothing/Neck/mantles/rdmantle.rsi - state: icon result: ClothingNeckMantleRD completetime: 2.8 materials: @@ -697,9 +496,6 @@ - type: latheRecipe id: ClothingOuterWinterMusician - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatnomi.rsi - state: icon result: ClothingOuterWinterMusician completetime: 3.2 materials: @@ -708,9 +504,6 @@ - type: latheRecipe id: ClothingOuterWinterClown - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatclown.rsi - state: icon result: ClothingOuterWinterClown completetime: 3.2 materials: @@ -719,9 +512,6 @@ - type: latheRecipe id: ClothingOuterWinterMime - icon: - sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi - state: icon result: ClothingOuterWinterMime completetime: 3.2 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/cooking.yml b/Resources/Prototypes/Recipes/Lathes/cooking.yml index d81e068082..276fefd562 100644 --- a/Resources/Prototypes/Recipes/Lathes/cooking.yml +++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: ButchCleaver - icon: - sprite: Objects/Weapons/Melee/cleaver.rsi - state: butch result: ButchCleaver completetime: 2 materials: @@ -11,9 +8,6 @@ - type: latheRecipe id: KitchenKnife - icon: - sprite: Objects/Weapons/Melee/kitchen_knife.rsi - state: icon result: KitchenKnife completetime: 2 materials: @@ -22,7 +16,6 @@ - type: latheRecipe id: DrinkMug - icon: Objects/Consumable/Drinks/mug.rsi result: DrinkMug completetime: 0.8 materials: @@ -30,7 +23,6 @@ - type: latheRecipe id: DrinkMugMetal - icon: Objects/Consumable/Drinks/mug_metal.rsi result: DrinkMugMetal completetime: 0.8 materials: @@ -38,7 +30,6 @@ - type: latheRecipe id: DrinkGlass - icon: Objects/Consumable/Drinks/glass_clear.rsi result: DrinkGlass completetime: 0.8 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index c0dfdfc209..bd4f1146f8 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: TimerTrigger - icon: - sprite: Objects/Devices/timer.rsi - state: timer result: TimerTrigger completetime: 2 materials: @@ -11,9 +8,6 @@ - type: latheRecipe id: SignalTrigger - icon: - sprite: Objects/Devices/signaltrigger.rsi - state: signaltrigger result: SignalTrigger completetime: 2 materials: @@ -22,9 +16,6 @@ - type: latheRecipe id: VoiceTrigger - icon: - sprite: Objects/Devices/voice.rsi - state: voice result: VoiceTrigger completetime: 2 materials: @@ -33,9 +24,6 @@ - type: latheRecipe id: ChemicalPayload - icon: - sprite: Objects/Devices/payload.rsi - state: payload-empty result: ChemicalPayload completetime: 2 materials: @@ -44,9 +32,6 @@ - type: latheRecipe id: FlashPayload - icon: - sprite: Objects/Devices/payload.rsi - state: payload-flash-armed result: FlashPayload completetime: 1 materials: @@ -57,9 +42,6 @@ - type: latheRecipe id: Signaller - icon: - sprite: Objects/Devices/signaller.rsi - state: signaller result: RemoteSignaller completetime: 2 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 2d59384acb..3be8038893 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -1,6 +1,5 @@ - type: latheRecipe id: FirelockElectronics - icon: { sprite: Objects/Misc/module.rsi, state: mainboard } result: FirelockElectronics completetime: 2 materials: @@ -9,7 +8,6 @@ - type: latheRecipe id: MailingUnitElectronics - icon: { sprite: Objects/Misc/module.rsi, state: net_wired } result: MailingUnitElectronics completetime: 4 materials: @@ -18,7 +16,6 @@ - type: latheRecipe id: DoorElectronics - icon: { sprite: Objects/Misc/module.rsi, state: door_electronics } result: DoorElectronics completetime: 2 materials: @@ -27,7 +24,6 @@ - type: latheRecipe id: AirAlarmElectronics - icon: { sprite: Objects/Misc/module.rsi, state: airalarm_electronics } result: AirAlarmElectronics completetime: 2 materials: @@ -45,7 +41,6 @@ - type: latheRecipe id: FireAlarmElectronics - icon: { sprite: Objects/Misc/module.rsi, state: door_electronics } result: FireAlarmElectronics completetime: 2 materials: @@ -54,7 +49,6 @@ - type: latheRecipe id: CloningPodMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: CloningPodMachineCircuitboard completetime: 4 materials: @@ -64,7 +58,6 @@ - type: latheRecipe id: ThermomachineFreezerMachineCircuitBoard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: ThermomachineFreezerMachineCircuitBoard completetime: 4 materials: @@ -74,7 +67,6 @@ - type: latheRecipe id: PortableScrubberMachineCircuitBoard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: PortableScrubberMachineCircuitBoard completetime: 4 materials: @@ -84,7 +76,6 @@ - type: latheRecipe id: MedicalScannerMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: MedicalScannerMachineCircuitboard completetime: 4 materials: @@ -103,7 +94,6 @@ - type: latheRecipe id: ChemMasterMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: ChemMasterMachineCircuitboard completetime: 4 materials: @@ -112,7 +102,6 @@ - type: latheRecipe id: ChemDispenserMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: ChemDispenserMachineCircuitboard completetime: 4 materials: @@ -122,7 +111,6 @@ - type: latheRecipe id: BiomassReclaimerMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: BiomassReclaimerMachineCircuitboard completetime: 4 materials: @@ -132,7 +120,6 @@ - type: latheRecipe id: HydroponicsTrayMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: HydroponicsTrayMachineCircuitboard completetime: 4 materials: @@ -141,7 +128,6 @@ - type: latheRecipe id: AutolatheMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: AutolatheMachineCircuitboard completetime: 4 materials: @@ -150,7 +136,6 @@ - type: latheRecipe id: ProtolatheMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: ProtolatheMachineCircuitboard completetime: 4 materials: @@ -159,7 +144,6 @@ - type: latheRecipe id: CircuitImprinterMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: CircuitImprinterMachineCircuitboard completetime: 4 materials: @@ -168,7 +152,6 @@ - type: latheRecipe id: ExosuitFabricatorMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: science } result: ExosuitFabricatorMachineCircuitboard completetime: 5 materials: @@ -177,7 +160,6 @@ - type: latheRecipe id: UniformPrinterMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: UniformPrinterMachineCircuitboard completetime: 4 materials: @@ -186,7 +168,6 @@ - type: latheRecipe id: VaccinatorMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: VaccinatorMachineCircuitboard completetime: 4 materials: @@ -196,7 +177,6 @@ - type: latheRecipe id: DiagnoserMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: DiagnoserMachineCircuitboard completetime: 4 materials: @@ -206,7 +186,6 @@ - type: latheRecipe id: ArtifactAnalyzerMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: science } result: ArtifactAnalyzerMachineCircuitboard completetime: 4 materials: @@ -216,7 +195,6 @@ - type: latheRecipe id: TraversalDistorterMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: science } result: TraversalDistorterMachineCircuitboard completetime: 4 materials: @@ -226,7 +204,6 @@ - type: latheRecipe id: ReagentGrinderMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: ReagentGrinderMachineCircuitboard completetime: 4 materials: @@ -244,7 +221,6 @@ - type: latheRecipe id: AnalysisComputerCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: cpu_science } result: AnalysisComputerCircuitboard completetime: 4 materials: @@ -264,7 +240,6 @@ - type: latheRecipe id: CrewMonitoringComputerCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: CrewMonitoringComputerCircuitboard completetime: 4 materials: @@ -273,7 +248,6 @@ - type: latheRecipe id: ShuttleConsoleCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: ShuttleConsoleCircuitboard completetime: 4 materials: @@ -283,7 +257,6 @@ - type: latheRecipe id: RadarConsoleCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: RadarConsoleCircuitboard completetime: 4 materials: @@ -292,7 +265,6 @@ - type: latheRecipe id: DawInstrumentMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: DawInstrumentMachineCircuitboard completetime: 4 materials: @@ -301,7 +273,6 @@ - type: latheRecipe id: StasisBedMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: StasisBedMachineCircuitboard completetime: 4 materials: @@ -311,7 +282,6 @@ - type: latheRecipe id: OreProcessorMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: OreProcessorMachineCircuitboard completetime: 4 materials: @@ -342,7 +312,6 @@ # Power - type: latheRecipe id: APCElectronics - icon: { sprite: Objects/Misc/module.rsi, state: charger_APC } result: APCElectronics completetime: 2 materials: @@ -351,7 +320,6 @@ - type: latheRecipe id: SubstationMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SubstationMachineCircuitboard completetime: 4 materials: @@ -360,7 +328,6 @@ - type: latheRecipe id: WallmountSubstationElectronics - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: WallmountSubstationElectronics completetime: 4 materials: @@ -369,7 +336,6 @@ - type: latheRecipe id: SMESMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: power_mod } result: SMESMachineCircuitboard completetime: 4 materials: @@ -378,7 +344,6 @@ - type: latheRecipe id: GeneratorPlasmaMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: GeneratorPlasmaMachineCircuitboard completetime: 4 materials: @@ -387,7 +352,6 @@ - type: latheRecipe id: GeneratorUraniumMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: GeneratorUraniumMachineCircuitboard completetime: 4 materials: @@ -396,7 +360,6 @@ - type: latheRecipe id: WallmountGeneratorElectronics - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: WallmountGeneratorElectronics completetime: 4 materials: @@ -405,7 +368,6 @@ - type: latheRecipe id: WallmountGeneratorAPUElectronics - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: WallmountGeneratorAPUElectronics completetime: 4 materials: @@ -414,7 +376,6 @@ - type: latheRecipe id: SolarControlComputerCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SolarControlComputerCircuitboard completetime: 4 materials: @@ -423,7 +384,6 @@ - type: latheRecipe id: PowerComputerCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: PowerComputerCircuitboard completetime: 4 materials: @@ -432,7 +392,6 @@ - type: latheRecipe id: CloningConsoleComputerCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: CloningConsoleComputerCircuitboard completetime: 4 materials: @@ -441,7 +400,6 @@ - type: latheRecipe id: MicrowaveMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: MicrowaveMachineCircuitboard completetime: 4 materials: @@ -450,7 +408,6 @@ - type: latheRecipe id: SurveillanceCameraRouterCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SurveillanceCameraRouterCircuitboard completetime: 4 materials: @@ -459,7 +416,6 @@ - type: latheRecipe id: SurveillanceCameraWirelessRouterCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SurveillanceCameraWirelessRouterCircuitboard completetime: 4 materials: @@ -468,7 +424,6 @@ - type: latheRecipe id: SurveillanceWirelessCameraAnchoredCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SurveillanceWirelessCameraAnchoredCircuitboard completetime: 4 materials: @@ -477,7 +432,6 @@ - type: latheRecipe id: SurveillanceWirelessCameraMovableCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SurveillanceWirelessCameraMovableCircuitboard completetime: 4 materials: @@ -486,7 +440,6 @@ - type: latheRecipe id: SurveillanceCameraMonitorCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SurveillanceCameraMonitorCircuitboard completetime: 4 materials: @@ -495,7 +448,6 @@ - type: latheRecipe id: SurveillanceWirelessCameraMonitorCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SurveillanceWirelessCameraMonitorCircuitboard completetime: 4 materials: @@ -504,7 +456,6 @@ - type: latheRecipe id: ComputerTelevisionCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: ComputerTelevisionCircuitboard completetime: 4 materials: @@ -513,7 +464,6 @@ - type: latheRecipe id: EmitterCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: EmitterCircuitboard completetime: 4 materials: @@ -540,7 +490,6 @@ - type: latheRecipe id: GasRecyclerMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: GasRecyclerMachineCircuitboard completetime: 4 materials: @@ -549,7 +498,6 @@ - type: latheRecipe id: SeedExtractorMachineCircuitboard - icon: { sprite: Objects/Misc/module.rsi, state: id_mod } result: SeedExtractorMachineCircuitboard completetime: 4 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/Recipes/Lathes/janitorial.yml index 3632811f06..26d0d67e4f 100644 --- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml +++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: MopItem - icon: - sprite: Objects/Specific/Janitorial/mop.rsi - state: mop result: MopItem completetime: 2 materials: @@ -10,7 +7,6 @@ - type: latheRecipe id: MopBucket - icon: Objects/Specific/Janitorial/janitorial.rsi result: MopBucket completetime: 2 materials: @@ -19,9 +15,6 @@ - type: latheRecipe id: Bucket - icon: - sprite: Objects/Tools/bucket.rsi - state: icon result: Bucket completetime: 2 materials: @@ -29,7 +22,6 @@ - type: latheRecipe id: WetFloorSign - icon: Objects/Specific/Janitorial/wet_floor_sign.rsi result: WetFloorSign completetime: 2 materials: @@ -37,9 +29,6 @@ - type: latheRecipe id: SprayBottle - icon: - sprite: Objects/Specific/Janitorial/janitorial.rsi - state: cleaner result: SprayBottle completetime: 2 materials: @@ -47,7 +36,6 @@ - type: latheRecipe id: TrashBag - icon: Objects/Specific/Janitorial/trashbag.rsi result: TrashBag completetime: 1.2 materials: @@ -55,7 +43,6 @@ - type: latheRecipe id: LightReplacer - icon: Objects/Specific/Janitorial/light_replacer.rsi result: LightReplacer completetime: 2.4 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index e631c783c5..cd7d80dbb7 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -1,6 +1,5 @@ - type: latheRecipe id: Scalpel - icon: { sprite: Objects/Specific/Medical/Surgery/scalpel.rsi, state: scalpel } result: Scalpel completetime: 2 materials: @@ -8,7 +7,6 @@ - type: latheRecipe id: Retractor - icon: { sprite: Objects/Specific/Medical/Surgery/scissors.rsi, state: retractor } result: Retractor completetime: 2 materials: @@ -16,7 +14,6 @@ - type: latheRecipe id: Cautery - icon: { sprite: Objects/Specific/Medical/Surgery/cautery.rsi, state: cautery } result: Cautery completetime: 2 materials: @@ -24,7 +21,6 @@ - type: latheRecipe id: Drill - icon: { sprite: Objects/Specific/Medical/Surgery/drill.rsi, state: drill } result: Drill completetime: 2 materials: @@ -33,7 +29,6 @@ - type: latheRecipe id: Saw - icon: { sprite: Objects/Specific/Medical/Surgery/saw.rsi, state: saw } result: Saw completetime: 2 materials: @@ -41,7 +36,6 @@ - type: latheRecipe id: Hemostat - icon: { sprite: Objects/Specific/Medical/Surgery/scissors.rsi, state: hemostat } result: Hemostat completetime: 2 materials: @@ -49,7 +43,6 @@ - type: latheRecipe id: BodyBag - icon: { sprite: Objects/Specific/Medical/Morgue/bodybags.rsi, state: bag_folded } result: BodyBag_Folded completetime: 2 materials: @@ -57,7 +50,6 @@ - type: latheRecipe id: HandheldCrewMonitor - icon: { sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi, state: icon } result: HandheldCrewMonitor completetime: 2 materials: @@ -67,7 +59,6 @@ - type: latheRecipe id: HandheldHealthAnalyzer - icon: { sprite: Objects/Specific/Medical/healthanalyzer.rsi, state: icon } result: HandheldHealthAnalyzer completetime: 4 materials: @@ -76,7 +67,6 @@ - type: latheRecipe id: ClothingHandsGlovesLatex - icon: { sprite: Clothing/Hands/Gloves/latex.rsi, state: icon } result: ClothingHandsGlovesLatex completetime: 2 materials: @@ -84,7 +74,6 @@ - type: latheRecipe id: ClothingHandsGlovesNitrile - icon: { sprite: Clothing/Hands/Gloves/Color/blue.rsi, state: icon } result: ClothingHandsGlovesNitrile completetime: 2 materials: @@ -93,7 +82,6 @@ - type: latheRecipe id: ClothingMaskSterile - icon: { sprite: Clothing/Mask/sterile.rsi, state: icon } result: ClothingMaskSterile completetime: 2 materials: @@ -101,7 +89,6 @@ - type: latheRecipe id: DiseaseSwab - icon: { sprite: Objects/Specific/Medical/mouth_swab.rsi, state: icon } result: DiseaseSwab completetime: 1 materials: @@ -110,7 +97,6 @@ - type: latheRecipe id: Implanter - icon: { sprite: Objects/Specific/Chemistry/syringe.rsi, state: syringe_base0 } result: Implanter completetime: 1 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index fb7f853ed9..932fa8057a 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -1,6 +1,5 @@ - type: latheRecipe id: LightTube - icon: { sprite: Objects/Power/light_tube.rsi, state: normal } result: LightTube completetime: 2 materials: @@ -9,7 +8,6 @@ - type: latheRecipe id: LightBulb - icon: { sprite: Objects/Power/light_bulb.rsi, state: normal } result: LightBulb completetime: 2 materials: @@ -18,7 +16,6 @@ - type: latheRecipe id: GlowstickRed - icon: Objects/Misc/glowstick.rsi result: GlowstickRed completetime: 2 materials: @@ -26,7 +23,6 @@ - type: latheRecipe id: Flare - icon: Objects/Misc/flare.rsi result: Flare completetime: 2 materials: @@ -34,9 +30,6 @@ - type: latheRecipe id: FlashlightLantern - icon: - sprite: Objects/Tools/flashlight.rsi - state: flashlight result: EmptyFlashlightLantern completetime: 2 materials: @@ -46,9 +39,6 @@ - type: latheRecipe id: FireExtinguisher - icon: - sprite: Objects/Misc/fire_extinguisher.rsi - state: fire_extinguisher_closed result: FireExtinguisher completetime: 2 materials: @@ -56,7 +46,6 @@ - type: latheRecipe id: Matchbox - icon: Objects/Tools/matches.rsi result: Matchbox completetime: 1 materials: @@ -64,9 +53,6 @@ - type: latheRecipe id: Drone - icon: - sprite: Mobs/Silicon/drone.rsi - state: shell result: Drone completetime: 6 materials: @@ -76,9 +62,6 @@ - type: latheRecipe id: SynthesizerInstrument - icon: - sprite: Objects/Fun/Instruments/h_synthesizer.rsi - state: icon result: SynthesizerInstrument completetime: 4 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml index ab5c0b1e63..b7d9281093 100644 --- a/Resources/Prototypes/Recipes/Lathes/powercells.yml +++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: PowerCellSmall - icon: - sprite: Objects/Power/power_cells.rsi - state: small result: PowerCellSmallPrinted completetime: 1 materials: @@ -11,9 +8,6 @@ - type: latheRecipe id: PowerCellMedium - icon: - sprite: Objects/Power/power_cells.rsi - state: medium result: PowerCellMediumPrinted completetime: 6 materials: @@ -24,9 +18,6 @@ - type: latheRecipe id: PowerCellHigh - icon: - sprite: Objects/Power/power_cells.rsi - state: high result: PowerCellHighPrinted completetime: 10 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 0f25f33ea7..05fe6e0e11 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: ProximitySensor - icon: - sprite: Objects/Misc/proximity_sensor.rsi - state: icon result: ProximitySensor completetime: 2 materials: @@ -11,9 +8,6 @@ - type: latheRecipe id: LeftArmBorg - icon: - sprite: Mobs/Silicon/drone.rsi - state: "l_hand" result: LeftArmBorg completetime: 2 materials: @@ -22,9 +16,6 @@ - type: latheRecipe id: RightArmBorg - icon: - sprite: Mobs/Silicon/drone.rsi - state: "r_hand" result: RightArmBorg completetime: 2 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 0ae8d15167..f2e24967e4 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: Handcuffs - icon: - sprite: Objects/Misc/handcuffs.rsi - state: handcuff result: Handcuffs completetime: 2 materials: @@ -10,9 +7,6 @@ - type: latheRecipe id: Zipties - icon: - sprite: Objects/Misc/zipties.rsi - state: cuff result: Zipties completetime: 2 materials: @@ -20,9 +14,6 @@ - type: latheRecipe id: Stunbaton - icon: - sprite: Objects/Weapons/Melee/stunbaton.rsi - state: stunbaton_off result: Stunbaton completetime: 2 materials: @@ -31,9 +22,6 @@ - type: latheRecipe id: ForensicPad - icon: - sprite: Objects/Misc/bureaucracy.rsi - state: paper result: ForensicPad completetime: 4 materials: @@ -41,9 +29,6 @@ - type: latheRecipe id: ClothingEyesGlassesSecurity - icon: - sprite: Clothing/Eyes/Glasses/secglasses.rsi - state: icon result: ClothingEyesGlassesSecurity completetime: 2 materials: @@ -52,9 +37,6 @@ - type: latheRecipe id: RiotShield - icon: - sprite: Objects/Weapons/Melee/shields.rsi - state: riot-icon result: RiotShield completetime: 4 materials: @@ -63,9 +45,6 @@ - type: latheRecipe id: Flash - icon: - sprite: Objects/Weapons/Melee/flash.rsi - state: flash result: Flash completetime: 2 materials: @@ -75,9 +54,6 @@ - type: latheRecipe id: ShellShotgunBeanbag - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: beanbag result: ShellShotgunBeanbag completetime: 2 materials: @@ -86,9 +62,6 @@ - type: latheRecipe id: CartridgePistolRubber - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgePistolRubber completetime: 2 materials: @@ -97,9 +70,6 @@ - type: latheRecipe id: CartridgeMagnumRubber - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgeMagnumRubber completetime: 2 materials: @@ -108,9 +78,6 @@ - type: latheRecipe id: CartridgeCaselessRifleRubber - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgeCaselessRifleRubber completetime: 2 materials: @@ -119,9 +86,6 @@ - type: latheRecipe id: CartridgeLightRifleRubber - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgeLightRifleRubber completetime: 2 materials: @@ -130,9 +94,6 @@ - type: latheRecipe id: CartridgeRifleRubber - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgeRifleRubber completetime: 2 materials: @@ -141,9 +102,6 @@ - type: latheRecipe id: CartridgePistol - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgePistol completetime: 2 materials: @@ -151,9 +109,6 @@ - type: latheRecipe id: ShellShotgun - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: base result: ShellShotgun completetime: 2 materials: @@ -161,9 +116,6 @@ - type: latheRecipe id: CartridgeMagnum - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgeMagnum completetime: 2 materials: @@ -171,9 +123,6 @@ - type: latheRecipe id: CartridgeLightRifle - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi - state: base result: CartridgeLightRifle completetime: 2 materials: @@ -181,9 +130,6 @@ - type: latheRecipe id: ShellShotgunFlare - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: flare result: ShellShotgunFlare completetime: 2 materials: @@ -192,9 +138,6 @@ - type: latheRecipe id: ShellTranquilizer - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: practice result: ShellTranquilizer completetime: 4 materials: @@ -204,9 +147,6 @@ - type: latheRecipe id: TargetHuman - icon: - sprite: Objects/Specific/Security/target.rsi - state: target_h result: TargetHuman completetime: 5 materials: @@ -214,9 +154,6 @@ - type: latheRecipe id: TargetClown - icon: - sprite: Objects/Specific/Security/target.rsi - state: target_c result: TargetClown completetime: 5 materials: @@ -224,9 +161,6 @@ - type: latheRecipe id: TargetSyndicate - icon: - sprite: Objects/Specific/Security/target.rsi - state: target_s result: TargetSyndicate completetime: 5 materials: diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml index 6e8f477c3b..7b86500676 100644 --- a/Resources/Prototypes/Recipes/Lathes/sheet.yml +++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml @@ -1,8 +1,5 @@ - type: latheRecipe id: SheetSteel - icon: - sprite: Objects/Materials/Sheets/metal.rsi - state: steel result: SheetSteel1 applyMaterialDiscount: false completetime: 2 @@ -11,9 +8,6 @@ - type: latheRecipe id: SheetSteel30 - icon: - sprite: Objects/Materials/Sheets/metal.rsi - state: steel_3 result: SheetSteel completetime: 2 materials: @@ -21,9 +15,6 @@ - type: latheRecipe id: SheetGlass1 - icon: - sprite: Objects/Materials/Sheets/glass.rsi - state: glass result: SheetGlass1 applyMaterialDiscount: false completetime: 2 @@ -32,9 +23,6 @@ - type: latheRecipe id: SheetGlass30 - icon: - sprite: Objects/Materials/Sheets/glass.rsi - state: glass_3 result: SheetGlass completetime: 2 materials: @@ -42,9 +30,6 @@ - type: latheRecipe id: SheetRGlass - icon: - sprite: Objects/Materials/Sheets/glass.rsi - state: rglass result: SheetRGlass1 applyMaterialDiscount: false completetime: 2 @@ -54,9 +39,6 @@ - type: latheRecipe id: SheetRGlass30 - icon: - sprite: Objects/Materials/Sheets/glass.rsi - state: rglass_3 result: SheetRGlass completetime: 2 materials: @@ -65,9 +47,6 @@ - type: latheRecipe id: SheetPGlass30 - icon: - sprite: Objects/Materials/Sheets/glass.rsi - state: pglass_3 result: SheetPGlass completetime: 2 materials: @@ -76,9 +55,6 @@ - type: latheRecipe id: SheetRPGlass30 - icon: - sprite: Objects/Materials/Sheets/glass.rsi - state: rpglass_3 result: SheetRPGlass completetime: 2 materials: @@ -88,9 +64,6 @@ - type: latheRecipe id: SheetPlasma30 - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: plasma_3 result: SheetPlasma completetime: 2 materials: @@ -98,9 +71,6 @@ - type: latheRecipe id: SheetUranium1 - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium result: SheetUranium1 completetime: 2 materials: @@ -108,9 +78,6 @@ - type: latheRecipe id: IngotGold1 - icon: - sprite: Objects/Materials/ingots.rsi - state: gold result: IngotGold1 completetime: 2 materials: @@ -118,9 +85,6 @@ - type: latheRecipe id: IngotSilver1 - icon: - sprite: Objects/Materials/ingots.rsi - state: silver result: IngotSilver1 completetime: 2 materials: @@ -128,9 +92,6 @@ - type: latheRecipe id: SheetPlastic - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: plastic result: SheetPlastic1 applyMaterialDiscount: false completetime: 2 diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index e701ade164..a0a6101507 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -1,6 +1,5 @@ - type: latheRecipe id: Wirecutter - icon: { sprite: Objects/Tools/wirecutters.rsi, state: cutters-map } result: Wirecutter completetime: 2 materials: @@ -9,9 +8,6 @@ - type: latheRecipe id: Screwdriver - icon: - sprite: Objects/Tools/screwdriver.rsi - state: screwdriver-map result: Screwdriver completetime: 2 materials: @@ -20,9 +16,6 @@ - type: latheRecipe id: Welder - icon: - sprite: /Textures/Objects/Tools/welder.rsi - state: icon result: Welder completetime: 2 materials: @@ -30,7 +23,6 @@ - type: latheRecipe id: Wrench - icon: { sprite: Objects/Tools/wrench.rsi, state: icon } result: Wrench completetime: 2 materials: @@ -38,7 +30,6 @@ - type: latheRecipe id: CableStack - icon: { sprite: /Textures/Objects/Tools/cable-coils.rsi, state: coillv-30 } result: CableApcStack1 completetime: 2 materials: @@ -46,7 +37,6 @@ - type: latheRecipe id: CableMVStack - icon: { sprite: /Textures/Objects/Tools/cable-coils.rsi, state: coilmv-30 } result: CableMVStack1 completetime: 2 materials: @@ -54,7 +44,6 @@ - type: latheRecipe id: CableHVStack - icon: { sprite: /Textures/Objects/Tools/cable-coils.rsi, state: coilhv-30 } result: CableHVStack1 completetime: 2 materials: @@ -62,7 +51,6 @@ - type: latheRecipe id: Crowbar - icon: { sprite: Objects/Tools/crowbar.rsi, state: icon } result: Crowbar completetime: 2 materials: @@ -70,7 +58,6 @@ - type: latheRecipe id: Pickaxe - icon: Objects/Weapons/Melee/pickaxe.rsi result: Pickaxe completetime: 2 materials: @@ -79,9 +66,6 @@ - type: latheRecipe id: Shovel - icon: - sprite: Objects/Tools/shovel.rsi - state: icon result: Shovel completetime: 2 materials: @@ -90,9 +74,6 @@ - type: latheRecipe id: Multitool - icon: - sprite: Objects/Tools/multitool.rsi - state: icon result: Multitool completetime: 2 materials: @@ -101,9 +82,6 @@ - type: latheRecipe id: PowerDrill - icon: - sprite: Objects/Tools/drill.rsi - state: drill_screw result: PowerDrill completetime: 2 materials: @@ -112,9 +90,6 @@ - type: latheRecipe id: RCD - icon: - sprite: Objects/Tools/rcd.rsi - state: icon result: RCDEmpty completetime: 4 materials: @@ -123,9 +98,6 @@ - type: latheRecipe id: RCDAmmo - icon: - sprite: Objects/Tools/rcd.rsi - state: ammo result: RCDAmmo completetime: 2.4 materials: @@ -134,7 +106,6 @@ - type: latheRecipe id: HandheldGPSBasic - icon: { sprite: Objects/Devices/gps.rsi, state: icon } result: HandheldGPSBasic completetime: 2 materials: @@ -143,7 +114,6 @@ - type: latheRecipe id: TRayScanner - icon: { sprite: Objects/Tools/t-ray.rsi, state: tray-off } result: trayScanner completetime: 2 materials: @@ -152,7 +122,6 @@ - type: latheRecipe id: GasAnalyzer - icon: { sprite: Objects/Specific/Atmos/gasanalyzer.rsi, state: icon } result: GasAnalyzer completetime: 2 materials: @@ -161,7 +130,6 @@ - type: latheRecipe id: AirlockPainter - icon: { sprite: /Textures/Objects/Tools/airlock_painter.rsi, state: airlock_painter } result: AirlockPainter completetime: 2 materials: @@ -170,7 +138,6 @@ - type: latheRecipe id: UtilityBelt - icon: { sprite: Clothing/Belt/utility.rsi, state: icon } result: ClothingBeltUtility completetime: 2 materials: @@ -179,9 +146,6 @@ - type: latheRecipe id: HolofanProjector - icon: - sprite: Objects/Devices/Holoprojectors/atmos.rsi - state: icon result: HolofanProjector completetime: 8 materials: # Inherited materials and time from PowerCellMedium recipe @@ -192,9 +156,6 @@ - type: latheRecipe id: RPED - icon: - sprite: Objects/Specific/Research/rped.rsi - state: icon result: RPED completetime: 10 materials: