tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes materials in lathe recipes

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-05-22 11:30:11 +02:00
parent 9779986bd8
commit bbfc0c320a
13 changed files with 94 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Research/LatheRecipePrototype.cs
View File

@@ -1,10 +1,12 @@
#nullable enable #nullable enable
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.Materials;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
@@ -32,7 +34,7 @@ namespace Content.Shared.Research
[DataField("completetime")] [DataField("completetime")]
private int _completeTime = 2500; private int _completeTime = 2500;
[DataField("materials")] [DataField("materials", customTypeSerializer:typeof(PrototypeIdDictionarySerializer<int, MaterialPrototype>))]
private Dictionary<string, int> _requiredMaterials = new(); private Dictionary<string, int> _requiredMaterials = new();
/// <summary> /// <summary>

4
Resources/Changelog/Parts/lathe.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Zumorica
changes:
- type: Fix # One of the following: Add, Remove, Tweak, Fix
message: Fixes lathes not printing any recipe.

16
Resources/Prototypes/Recipes/Lathes/botany.yml
View File

@@ -6,8 +6,8 @@
result: HydroponicsToolMiniHoe result: HydroponicsToolMiniHoe
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: Scythe id: Scythe
@@ -17,8 +17,8 @@
result: HydroponicsToolScythe result: HydroponicsToolScythe
completetime: 500 completetime: 500
materials: materials:
steel: 300 Steel: 300
plastic: 200 Plastic: 200
- type: latheRecipe - type: latheRecipe
id: Hatchet id: Hatchet
@@ -28,8 +28,8 @@
result: HydroponicsToolHatchet result: HydroponicsToolHatchet
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: Spade id: Spade
@@ -39,5 +39,5 @@
result: HydroponicsToolSpade result: HydroponicsToolSpade
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
plastic: 100 Plastic: 100

4
Resources/Prototypes/Recipes/Lathes/cargo.yml
View File

@@ -6,5 +6,5 @@
result: ConveyorBeltAssembly result: ConveyorBeltAssembly
completetime: 1000 completetime: 1000
materials: materials:
steel: 1000 Steel: 1000
glass: 50 Glass: 50

10
Resources/Prototypes/Recipes/Lathes/chemistry.yml
View File

@@ -6,7 +6,7 @@
result: Beaker result: Beaker
completetime: 500 completetime: 500
materials: materials:
glass: 100 Glass: 100
- type: latheRecipe - type: latheRecipe
id: LargeBeaker id: LargeBeaker
@@ -16,7 +16,7 @@
result: LargeBeaker result: LargeBeaker
completetime: 500 completetime: 500
materials: materials:
glass: 200 Glass: 200
- type: latheRecipe - type: latheRecipe
id: Dropper id: Dropper
@@ -26,8 +26,8 @@
result: Dropper result: Dropper
completetime: 500 completetime: 500
materials: materials:
glass: 200 Glass: 200
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: Syringe id: Syringe
@@ -37,4 +37,4 @@
result: Syringe result: Syringe
completetime: 500 completetime: 500
materials: materials:
glass: 200 Glass: 200

10
Resources/Prototypes/Recipes/Lathes/cooking.yml
View File

@@ -4,7 +4,7 @@
result: ButchCleaver result: ButchCleaver
completetime: 500 completetime: 500
materials: materials:
steel: 300 Steel: 300
- type: latheRecipe - type: latheRecipe
id: KitchenKnife id: KitchenKnife
@@ -12,7 +12,7 @@
result: KitchenKnife result: KitchenKnife
completetime: 400 completetime: 400
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: DrinkMug id: DrinkMug
@@ -20,7 +20,7 @@
result: DrinkMug result: DrinkMug
completetime: 200 completetime: 200
materials: materials:
glass: 50 Glass: 50
- type: latheRecipe - type: latheRecipe
id: DrinkMugMetal id: DrinkMugMetal
@@ -28,7 +28,7 @@
result: DrinkMugMetal result: DrinkMugMetal
completetime: 200 completetime: 200
materials: materials:
steel: 50 Steel: 50
- type: latheRecipe - type: latheRecipe
id: DrinkGlass id: DrinkGlass
@@ -36,4 +36,4 @@
result: DrinkGlass result: DrinkGlass
completetime: 200 completetime: 200
materials: materials:
glass: 50 Glass: 50

12
Resources/Prototypes/Recipes/Lathes/electronics.yml
View File

@@ -4,8 +4,8 @@
result: FirelockElectronics result: FirelockElectronics
completetime: 500 completetime: 500
materials: materials:
steel: 50 Steel: 50
glass: 50 Glass: 50
- type: latheRecipe - type: latheRecipe
id: DoorElectronics id: DoorElectronics
@@ -13,8 +13,8 @@
result: DoorElectronics result: DoorElectronics
completetime: 500 completetime: 500
materials: materials:
steel: 50 Steel: 50
glass: 50 Glass: 50
- type: latheRecipe - type: latheRecipe
id: APCElectronics id: APCElectronics
@@ -22,5 +22,5 @@
result: APCElectronics result: APCElectronics
completetime: 500 completetime: 500
materials: materials:
steel: 50 Steel: 50
glass: 50 Glass: 50

18
Resources/Prototypes/Recipes/Lathes/janitorial.yml
View File

@@ -4,7 +4,7 @@
result: MopItem result: MopItem
completetime: 500 completetime: 500
materials: materials:
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: MopBucket id: MopBucket
@@ -12,8 +12,8 @@
result: MopBucket result: MopBucket
completetime: 500 completetime: 500
materials: materials:
steel: 100 Steel: 100
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: Bucket id: Bucket
@@ -21,7 +21,7 @@
result: Bucket result: Bucket
completetime: 500 completetime: 500
materials: materials:
steel: 100 Steel: 100
- type: latheRecipe - type: latheRecipe
id: WetFloorSign id: WetFloorSign
@@ -29,7 +29,7 @@
result: WetFloorSign result: WetFloorSign
completetime: 500 completetime: 500
materials: materials:
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: SprayBottle id: SprayBottle
@@ -37,7 +37,7 @@
result: SprayBottle result: SprayBottle
completetime: 500 completetime: 500
materials: materials:
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: TrashBag id: TrashBag
@@ -45,7 +45,7 @@
result: TrashBag result: TrashBag
completetime: 300 completetime: 300
materials: materials:
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: LightReplacer id: LightReplacer
@@ -53,5 +53,5 @@
result: LightReplacer result: LightReplacer
completetime: 600 completetime: 600
materials: materials:
steel: 100 Steel: 100
glass: 1000 Glass: 1000

24
Resources/Prototypes/Recipes/Lathes/medical.yml
View File

@@ -4,8 +4,8 @@
result: Brutepack result: Brutepack
completetime: 500 completetime: 500
materials: materials:
steel: 400 Steel: 400
glass: 100 Glass: 100
- type: latheRecipe - type: latheRecipe
id: Ointment id: Ointment
@@ -13,8 +13,8 @@
result: Ointment result: Ointment
completetime: 500 completetime: 500
materials: materials:
steel: 400 Steel: 400
glass: 100 Glass: 100
- type: latheRecipe - type: latheRecipe
id: Gauze id: Gauze
@@ -22,7 +22,7 @@
result: Gauze result: Gauze
completetime: 500 completetime: 500
materials: materials:
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: Scalpel id: Scalpel
@@ -30,7 +30,7 @@
result: Scalpel result: Scalpel
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Retractor id: Retractor
@@ -38,7 +38,7 @@
result: Scalpel result: Scalpel
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Cautery id: Cautery
@@ -46,7 +46,7 @@
result: Cautery result: Cautery
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Drill id: Drill
@@ -54,7 +54,7 @@
result: Drill result: Drill
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: BoneSaw id: BoneSaw
@@ -62,7 +62,7 @@
result: Saw result: Saw
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Hemostat id: Hemostat
@@ -70,7 +70,7 @@
result: Hemostat result: Hemostat
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: BodyBag_Item id: BodyBag_Item
@@ -78,4 +78,4 @@
result: BodyBag_Item result: BodyBag_Item
completetime: 300 completetime: 300
materials: materials:
plastic: 200 Plastic: 200

26
Resources/Prototypes/Recipes/Lathes/misc.yml
View File

@@ -4,8 +4,8 @@
result: LightTube result: LightTube
completetime: 500 completetime: 500
materials: materials:
steel: 50 Steel: 50
glass: 50 Glass: 50
- type: latheRecipe - type: latheRecipe
id: LightBulb id: LightBulb
@@ -13,8 +13,8 @@
result: LightBulb result: LightBulb
completetime: 500 completetime: 500
materials: materials:
steel: 50 Steel: 50
glass: 50 Glass: 50
- type: latheRecipe - type: latheRecipe
id: PowerCellSmallHigh id: PowerCellSmallHigh
@@ -22,8 +22,8 @@
result: PowerCellSmallHigh result: PowerCellSmallHigh
completetime: 500 completetime: 500
materials: materials:
steel: 100 Steel: 100
glass: 100 Glass: 100
- type: latheRecipe - type: latheRecipe
id: GlowStickRed id: GlowStickRed
@@ -31,7 +31,7 @@
result: GlowStickRed result: GlowStickRed
completetime: 500 completetime: 500
materials: materials:
plastic: 50 Plastic: 50
- type: latheRecipe - type: latheRecipe
id: FlareBase id: FlareBase
@@ -39,7 +39,7 @@
result: FlareBase result: FlareBase
completetime: 500 completetime: 500
materials: materials:
plastic: 50 Plastic: 50
- type: latheRecipe - type: latheRecipe
id: FlashLightLantern id: FlashLightLantern
@@ -47,9 +47,9 @@
result: FlashLightLantern result: FlashLightLantern
completetime: 500 completetime: 500
materials: materials:
steel: 100 Steel: 100
glass: 100 Glass: 100
plastic: 100 Plastic: 100
- type: latheRecipe - type: latheRecipe
id: FireExtinguisher id: FireExtinguisher
@@ -57,7 +57,7 @@
result: FireExtinguisher result: FireExtinguisher
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Matchbox id: Matchbox
@@ -65,4 +65,4 @@
result: Matchbox result: Matchbox
completetime: 10 completetime: 10
materials: materials:
wood: 100 Wood: 100

12
Resources/Prototypes/Recipes/Lathes/security.yml
View File

@@ -6,7 +6,7 @@
result: Handcuffs result: Handcuffs
completetime: 500 completetime: 500
materials: materials:
steel: 300 Steel: 300
- type: latheRecipe - type: latheRecipe
id: Stunbaton id: Stunbaton
@@ -16,8 +16,8 @@
result: Stunbaton result: Stunbaton
completetime: 500 completetime: 500
materials: materials:
steel: 300 Steel: 300
plastic: 300 Plastic: 300
- type: latheRecipe - type: latheRecipe
id: Flash id: Flash
@@ -27,6 +27,6 @@
result: Flash result: Flash
completetime: 500 completetime: 500
materials: materials:
glass: 100 Glass: 100
plastic: 200 Plastic: 200
steel: 100 Steel: 100

4
Resources/Prototypes/Recipes/Lathes/sheet.yml
View File

@@ -6,7 +6,7 @@
result: SheetSteel1 result: SheetSteel1
completetime: 500 completetime: 500
materials: materials:
steel: 100 Steel: 100
- type: latheRecipe - type: latheRecipe
id: GlassStack id: GlassStack
@@ -16,4 +16,4 @@
result: SheetGlass1 result: SheetGlass1
completetime: 500 completetime: 500
materials: materials:
glass: 100 Glass: 100

36
Resources/Prototypes/Recipes/Lathes/tools.yml
View File

@@ -4,7 +4,7 @@
result: Wirecutter result: Wirecutter
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Screwdriver id: Screwdriver
@@ -14,7 +14,7 @@
result: Screwdriver result: Screwdriver
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Welder id: Welder
@@ -24,7 +24,7 @@
result: Welder result: Welder
completetime: 500 completetime: 500
materials: materials:
steel: 400 Steel: 400
- type: latheRecipe - type: latheRecipe
id: Wrench id: Wrench
@@ -32,7 +32,7 @@
result: Wrench result: Wrench
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: CableStack id: CableStack
@@ -41,7 +41,7 @@
result: ApcExtensionCableStack1 result: ApcExtensionCableStack1
completetime: 500 completetime: 500
materials: materials:
steel: 100 Steel: 100
- type: latheRecipe - type: latheRecipe
id: Crowbar id: Crowbar
@@ -49,7 +49,7 @@
result: Crowbar result: Crowbar
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
- type: latheRecipe - type: latheRecipe
id: Pickaxe id: Pickaxe
@@ -57,8 +57,8 @@
result: Pickaxe result: Pickaxe
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
wood: 100 Wood: 100
- type: latheRecipe - type: latheRecipe
id: Shovel id: Shovel
@@ -68,8 +68,8 @@
result: Shovel result: Shovel
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
wood: 100 Wood: 100
- type: latheRecipe - type: latheRecipe
id: Multitool id: Multitool
@@ -79,8 +79,8 @@
result: Multitool result: Multitool
completetime: 500 completetime: 500
materials: materials:
steel: 200 Steel: 200
plastic: 200 Plastic: 200
- type: latheRecipe - type: latheRecipe
id: PowerDrill id: PowerDrill
@@ -90,8 +90,8 @@
result: PowerDrill result: PowerDrill
completetime: 500 completetime: 500
materials: materials:
steel: 600 Steel: 600
plastic: 200 Plastic: 200
- type: latheRecipe - type: latheRecipe
id: RCD id: RCD
@@ -101,8 +101,8 @@
result: RCD result: RCD
completetime: 1000 completetime: 1000
materials: materials:
steel: 1000 Steel: 1000
plastic: 300 Plastic: 300
- type: latheRecipe - type: latheRecipe
id: RCDAmmo id: RCDAmmo
@@ -112,5 +112,5 @@
result: RCDAmmo result: RCDAmmo
completetime: 600 completetime: 600
materials: materials:
steel: 500 Steel: 500
plastic: 250 Plastic: 250