Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml

Resources/Prototypes/Recipes/Construction/Graphs/food/meatball.yml

@@ -11,6 +11,13 @@
         sound: /Audio/Effects/sizzle.ogg
       steps:
       - minTemperature: 335
+    - to: meat patty
+      steps:
+      - tool: Rolling
+        doAfter: 1
 
   - node: meatball cooked
     entity: FoodMeatMeatballCooked
+
+  - node: meat patty
+    entity: FoodMeatPatty

Resources/Prototypes/Recipes/Construction/Graphs/food/patty.yml

@@ -0,0 +1,15 @@
+# cooked meat patty
+- type: constructionGraph
+  id: CookedPatty
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cooked meat patty
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Effects/sizzle.ogg
+      steps:
+      - minTemperature: 335
+  - node: cooked meat patty
+    entity: FoodMeatPattyCooked

Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml

@@ -123,6 +123,9 @@
       entity: !type:BoardNodeEntity { container: board }
       edges:
         - to: monitorUnsecured
+          completed:
+            - !type:RaiseEvent
+                event: !type:MachineDeconstructedEvent
           steps:
             - tool: Prying
               doAfter: 1

Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_metal.yml

@@ -7,33 +7,21 @@
     - !type:DeleteEntity { }
     edges:
     - to: straight
-      completed:
-      - !type:SnapToGrid
-        southRotation: true
       steps:
       - material: MetalRod
         amount: 5
         doAfter: 6
     - to: corner
-      completed:
-      - !type:SnapToGrid
-        southRotation: true
       steps:
       - material: MetalRod
         amount: 5
         doAfter: 6
     - to: end
-      completed:
-      - !type:SnapToGrid
-        southRotation: true
       steps:
       - material: MetalRod
         amount: 5
         doAfter: 6
     - to: gate
-      completed:
-      - !type:SnapToGrid
-        southRotation: true
       steps:
       - material: MetalRod
         amount: 5

Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml

@@ -134,22 +134,6 @@
               amount: 2
               doAfter: 2
 
-        - to: shuttleInteriorWall
-          completed:
-            - !type:SnapToGrid
-              southRotation: true
-          conditions:
-            - !type:EntityAnchored { }
-          steps:
-            - material: MetalRod
-              amount: 2
-              doAfter: 1
-            - tool: Screwing
-              doAfter: 1
-            - material: Steel
-              amount: 2
-              doAfter: 1
-
     - node: wall
       entity: WallSolid
       edges:
@@ -256,23 +240,6 @@
             - tool: Prying
               doAfter: 5
 
-    - node: shuttleInteriorWall
-      entity: WallShuttleInterior
-      edges:
-        - to: girder
-          completed:
-            - !type:SpawnPrototype
-              prototype: SheetSteel1
-              amount: 2
-            - !type:SpawnPrototype
-              prototype: PartRodMetal1
-              amount: 2
-          steps:
-            - tool: Welding
-              doAfter: 10
-            - tool: Screwing
-              doAfter: 1
-
     - node: reinforcedGirder
       entity: ReinforcedGirder
       edges:
@@ -304,9 +271,6 @@
               doAfter: 1
 
         - to: diagonalshuttleWall
-          completed:
-            - !type:SnapToGrid
-              southRotation: false
           conditions:
             - !type:EntityAnchored { }
           steps:

Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml

@@ -5,18 +5,12 @@
     - node: start
       edges:
         - to: grilleDiagonal
-          completed:
-            - !type:SnapToGrid
-              southRotation: true
           steps:
             - material: MetalRod
               amount: 2
               doAfter: 1
               
         - to: clockworkGrilleDiagonal
-          completed:
-            - !type:SnapToGrid
-              southRotation: true
           steps:
             - material: MetalRod
               amount: 2

Resources/Prototypes/Recipes/Construction/Graphs/structures/turnstile.yml

@@ -0,0 +1,33 @@
+- type: constructionGraph
+  id: Turnstile
+  start: start
+  graph:
+  - node: start
+    actions:
+    - !type:DeleteEntity { }
+    edges:
+    - to: turnstile
+      completed:
+      - !type:SnapToGrid
+      steps:
+      - material: MetalRod
+        amount: 4
+        doAfter: 6
+      - material: Steel
+        amount: 1
+        doAfter: 2
+
+  - node: turnstile
+    entity: Turnstile
+    edges:
+    - to: start
+      completed:
+      - !type:SpawnPrototype
+        prototype: PartRodMetal1
+        amount: 4
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 4.0
+      - tool: Cutting
+        doAfter: 2.0

Resources/Prototypes/Recipes/Construction/structures.yml

@@ -232,24 +232,6 @@
   conditions:
     - !type:TileNotBlocked
 
-- type: construction
-  name: interior shuttle wall
-  id: InteriorShuttleWall
-  graph: Girder
-  startNode: start
-  targetNode: shuttleInteriorWall
-  category: construction-category-structures
-  description: Keeps the air in and the greytide out.
-  icon:
-    sprite: Structures/Walls/shuttleinterior.rsi
-    state: full
-  objectType: Structure
-  placementMode: SnapgridCenter
-  canRotate: false
-  canBuildInImpassable: false
-  conditions:
-    - !type:TileNotBlocked
-
 - type: construction
   name: diagonal shuttle wall
   id: DiagonalShuttleWall
@@ -814,6 +796,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: turnstile
+  id: Turnstile
+  graph: Turnstile
+  startNode: start
+  targetNode: turnstile
+  category: construction-category-structures
+  description: A mechanical door that permits one-way access and prevents tailgating.
+  icon:
+    sprite: Structures/Doors/turnstile.rsi
+    state: turnstile
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   name: shutter
   id: Shutters

Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

@@ -1812,6 +1812,13 @@
   solids:
     FoodDonkpocketCarp: 1
 
+- type: microwaveMealRecipe
+  id: RecipeDonkpocketMoth
+  name: warm moth-pocket recipe
+  result: FoodDonkpocketMothWarm
+  time: 5
+  solids:
+    FoodDonkpocketMoth: 1
 
 - type: microwaveMealRecipe
   id: RecipeHotChili
@@ -2359,3 +2366,12 @@
     FoodCheeseSlice: 1
     FoodButterSlice: 1
 
+- type: microwaveMealRecipe
+  id: RecipeGrilledCheeseSandwichCotton
+  name: cotton grilled cheese sandwich recipe
+  result: FoodBakedGrilledCheeseSandwichCotton
+  time: 10
+  solids:
+    FoodBreadCottonSlice: 2
+    FoodCheeseSlice: 1
+    FoodButterSlice: 1

Resources/Prototypes/Recipes/Crafting/Graphs/artifact.yml

@@ -10,4 +10,4 @@
         amount: 4
         doAfter: 5
   - node: done
-    entity: VariedXenoArtifactItem
+    entity: ComplexXenoArtifactItem

Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml

@@ -35,6 +35,11 @@
   - ClothingHeadHatHopcap
   - ClothingUniformJumpsuitHoP
   - ClothingUniformJumpskirtHoP
+  # Generic
+  - ClothingHeadHatBeretCommand
+  - ClothingHeadHatCommandSoft
+  - ClothingUniformJumpskirtCommandGeneric
+  - ClothingUniformJumpsuitCommandGeneric
 
 - type: latheRecipePack
   id: ClothingEngineering

Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml

@@ -16,6 +16,7 @@
   - HandheldGPSBasic
   - TRayScanner
   - UtilityBelt
+  - ClothingOuterVestTank
   - HandheldStationMap
   - ClothingHeadHatWelding
   - ClothingHeadHatCone

Resources/Prototypes/Recipes/Lathes/Packs/science.yml

@@ -29,6 +29,7 @@
   - HoloprojectorField
   - SignallerAdvanced
   - DeviceQuantumSpinInverter
+  - DeviceDesynchronizer
 
 - type: latheRecipePack
   id: ScienceClothing
@@ -51,7 +52,6 @@
   recipes:
   - WeaponPistolCHIMP
   - WeaponForceGun
-  - WeaponLaserSvalinn
   - WeaponProtoKineticAccelerator
   - WeaponTetherGun
   - WeaponGauntletGorilla

Resources/Prototypes/Recipes/Lathes/Packs/security.yml

@@ -127,6 +127,7 @@
   - WeaponLaserCannon
   - WeaponLaserCarbine
   - WeaponXrayCannon
+  - WeaponTemperatureGun
 
 - type: latheRecipePack
   id: SecurityDisablers

Resources/Prototypes/Recipes/Lathes/Packs/service.yml

@@ -4,6 +4,7 @@
   id: ServiceStatic
   recipes:
   - Bucket
+  - Ashtray
   - DrinkMug
   - DrinkMugMetal
   - DrinkGlass

Resources/Prototypes/Recipes/Lathes/ammo.yml

@@ -0,0 +1,490 @@
+# Base prototypes
+
+- type: latheRecipe
+  abstract: true
+  id: BaseAmmoRecipe
+  categories:
+  - Ammo
+  completetime: 5
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseAmmoRecipe
+  id: BaseAmmoBoxRecipe
+  categories:
+  - Ammo
+  - Boxes
+
+- type: latheRecipe
+  abstract: true
+  id: BaseEmptyAmmoRecipe
+  categories:
+  - Magazines
+  completetime: 1
+
+## Recipes
+
+# .20 Rifle
+- type: latheRecipe
+  parent: BaseEmptyAmmoRecipe
+  id: MagazineRifleEmpty
+  result: MagazineRifleEmpty
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineRifle
+  result: MagazineRifle
+  materials:
+    Steel: 475
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineRifleIncendiary
+  result: MagazineRifleIncendiary
+  materials:
+    Steel: 25
+    Plastic: 450
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineRiflePractice
+  result: MagazineRiflePractice
+  materials:
+    Steel: 175
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineRifleUranium
+  result: MagazineRifleUranium
+  materials:
+    Steel: 25
+    Plastic: 300
+    Uranium: 300
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxRifle
+  result: MagazineBoxRifle
+  materials:
+    Steel: 750
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxRifleIncendiary
+  result: MagazineBoxRifleIncendiary
+  materials:
+    Plastic: 750
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxRiflePractice
+  result: MagazineBoxRiflePractice
+  materials:
+    Steel: 250
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxRifleUranium
+  result: MagazineBoxRifleUranium
+  materials:
+    Plastic: 500
+    Uranium: 500
+
+# .30 Rifle
+- type: latheRecipe
+  parent: BaseEmptyAmmoRecipe
+  id: MagazineLightRifleEmpty
+  result: MagazineLightRifleEmpty
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineLightRifle
+  result: MagazineLightRifle
+  materials:
+    Steel: 565
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineLightRifleIncendiary
+  result: MagazineLightRifleIncendiary
+  materials:
+    Steel: 25
+    Plastic: 540
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineLightRiflePractice
+  result: MagazineLightRiflePractice
+  materials:
+    Steel: 205
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineLightRifleUranium
+  result: MagazineLightRifleUranium
+  materials:
+    Steel: 25
+    Plastic: 360
+    Uranium: 360
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxLightRifle
+  result: MagazineBoxLightRifle
+  materials:
+    Steel: 900
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxLightRifleIncendiary
+  result: MagazineBoxLightRifleIncendiary
+  materials:
+    Plastic: 900
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxLightRiflePractice
+  result: MagazineBoxLightRiflePractice
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxLightRifleUranium
+  result: MagazineBoxLightRifleUranium
+  materials:
+    Plastic: 600
+    Uranium: 600
+
+# .35 Auto
+- type: latheRecipe
+  parent: BaseEmptyAmmoRecipe
+  id: MagazinePistolEmpty
+  result: MagazinePistolEmpty
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistol
+  result: MagazinePistol
+  materials:
+    Steel: 145
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolIncendiary
+  result: MagazinePistolIncendiary
+  materials:
+    Steel: 25
+    Plastic: 120
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolPractice
+  result: MagazinePistolPractice
+  materials:
+    Steel: 85
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolUranium
+  result: MagazinePistolUranium
+  materials:
+    Steel: 25
+    Plastic: 65
+    Uranium: 120
+
+- type: latheRecipe
+  parent: BaseEmptyAmmoRecipe
+  id: MagazinePistolSubMachineGunEmpty
+  result: MagazinePistolSubMachineGunEmpty
+  materials:
+    Steel: 30
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGun
+  result: MagazinePistolSubMachineGun
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGunIncendiary
+  result: MagazinePistolSubMachineGunIncendiary
+  materials:
+    Steel: 25
+    Plastic: 275
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGunUranium
+  result: MagazinePistolSubMachineGunUranium
+  materials:
+    Steel: 25
+    Plastic: 250
+    Uranium: 250
+
+- type: latheRecipe
+  parent: BaseEmptyAmmoRecipe
+  id: MagazinePistolSubMachineGunTopMountedEmpty
+  result: MagazinePistolSubMachineGunTopMountedEmpty
+  materials:
+    Steel: 30
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGunTopMounted
+  result: MagazinePistolSubMachineGunTopMounted
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxPistol
+  result: MagazineBoxPistol
+  materials:
+    Steel: 600
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxPistolIncendiary
+  result: MagazineBoxPistolIncendiary
+  materials:
+    Plastic: 600
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxPistolPractice
+  result: MagazineBoxPistolPractice
+  materials:
+    Steel: 300
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxPistolUranium
+  result: MagazineBoxPistolUranium
+  materials:
+    Plastic: 300
+    Uranium: 600
+
+# .45 Magnum
+- type: latheRecipe
+  parent: BaseEmptyAmmoRecipe
+  id: SpeedLoaderMagnumEmpty
+  result: SpeedLoaderMagnumEmpty
+  materials:
+    Steel: 50
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: SpeedLoaderMagnum
+  result: SpeedLoaderMagnum
+  materials:
+    Steel: 190
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: SpeedLoaderMagnumIncendiary
+  result: SpeedLoaderMagnumIncendiary
+  materials:
+    Steel: 50
+    Plastic: 150
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: SpeedLoaderMagnumPractice
+  result: SpeedLoaderMagnumPractice
+  materials:
+    Steel: 90
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: SpeedLoaderMagnumUranium
+  result: SpeedLoaderMagnumUranium
+  materials:
+    Steel: 50
+    Plastic: 150
+    Uranium: 110
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxMagnum
+  result: MagazineBoxMagnum
+  materials:
+    Steel: 240
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxMagnumIncendiary
+  result: MagazineBoxMagnumIncendiary
+  materials:
+    Plastic: 240
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxMagnumPractice
+  result: MagazineBoxMagnumPractice
+  materials:
+    Steel: 60
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: MagazineBoxMagnumUranium
+  result: MagazineBoxMagnumUranium
+  materials:
+    Plastic: 240
+    Uranium: 180
+
+# .50 Shell
+- type: latheRecipe
+  parent: BaseEmptyAmmoRecipe
+  id: MagazineShotgunEmpty
+  result: MagazineShotgunEmpty
+  materials:
+    Steel: 50
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineShotgun
+  result: MagazineShotgun
+  materials:
+    Steel: 240
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineShotgunIncendiary
+  result: MagazineShotgunIncendiary
+  materials:
+    Steel: 100
+    Plastic: 190
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineShotgunBeanbag
+  result: MagazineShotgunBeanbag
+  materials:
+    Steel: 150
+    Plastic: 140
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineShotgunSlug
+  result: MagazineShotgunSlug
+  materials:
+    Steel: 190
+    Plastic: 100
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxLethalshot
+  result: BoxLethalshot
+  materials:
+    Steel: 320
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxShotgunIncendiary
+  result: BoxShotgunIncendiary
+  materials:
+    Steel: 80
+    Plastic: 320
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxShotgunPractice
+  result: BoxShotgunPractice
+  materials:
+    Steel: 80
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxShotgunUranium
+  result: BoxShotgunUranium
+  materials:
+    Plastic: 320
+    Uranium: 240
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxBeanbag
+  result: BoxBeanbag
+  materials:
+    Steel: 160
+    Plastic: 240
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxShotgunSlug
+  result: BoxShotgunSlug
+  materials:
+    Steel: 240
+    Plastic: 160
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxShellTranquilizer
+  result: BoxShellTranquilizer
+  materials:
+    Plastic: 240
+    Steel: 160
+    Glass: 80
+    Plasma: 160
+    Silver: 80
+
+- type: latheRecipe
+  parent: BaseAmmoBoxRecipe
+  id: BoxShotgunFlare
+  result: BoxShotgunFlare
+  materials:
+    Steel: 80
+    Plastic: 80
+
+# Encampment ammo
+- type: latheRecipe
+  id: MagazineGrenadeEmpty
+  result: MagazineGrenadeEmpty
+  categories:
+  - Magazines
+  completetime: 3
+  materials:
+    Steel: 150
+    Plastic: 50
+
+- type: latheRecipe
+  id: GrenadeEMP
+  result: GrenadeEMP
+  categories:
+  - Ammo
+  completetime: 3
+  materials:
+    Steel: 150
+    Plastic: 100
+    Glass: 20
+
+- type: latheRecipe
+  id: GrenadeBlast
+  result: GrenadeBlast
+  categories:
+  - Ammo
+  completetime: 3
+  materials:
+    Steel: 450
+    Plastic: 300
+    Gold: 150
+
+- type: latheRecipe
+  id: GrenadeFlash
+  result: GrenadeFlash
+  categories:
+  - Ammo
+  completetime: 3
+  materials:
+    Steel: 150
+    Plastic: 100
+    Glass: 20

Resources/Prototypes/Recipes/Lathes/base_electronics.yml

@@ -0,0 +1,61 @@
+# Costs for computer boards, machine boards, and circuitry
+
+- type: latheRecipe
+  abstract: true
+  id: BaseElectronicsRecipe
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 300
+
+- type: latheRecipe
+  parent: BaseElectronicsRecipe
+  abstract: true
+  id: BaseCheapElectronicsRecipe
+  materials:
+    Steel: 50
+    Plastic: 50
+
+- type: latheRecipe
+  parent: BaseElectronicsRecipe
+  abstract: true
+  id: BaseCheapCircuitboardRecipe
+  materials:
+     Steel: 50
+     Glass: 250
+
+- type: latheRecipe
+  parent: BaseElectronicsRecipe
+  abstract: true
+  id: BaseCircuitboardRecipe
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 500
+
+- type: latheRecipe
+  parent: BaseCircuitboardRecipe
+  abstract: true
+  id: BaseGoldCircuitboardRecipe
+  materials:
+    Steel: 100
+    Glass: 500
+    Gold: 100
+
+- type: latheRecipe
+  parent: BaseCircuitboardRecipe
+  abstract: true
+  id: BaseSilverCircuitboardRecipe
+  materials:
+    Steel: 100
+    Glass: 500
+    Silver: 100
+
+- type: latheRecipe
+  parent: BaseCircuitboardRecipe
+  abstract: true
+  id: BaseBananiumCircuitboardRecipe
+  materials:
+    Steel: 100
+    Glass: 500
+    Bananium: 100

Resources/Prototypes/Recipes/Lathes/categories.yml

@@ -1,19 +1,19 @@
 # Generic
-- type: latheCategory
-  id: Ammo
-  name: lathe-category-ammo
-
 - type: latheCategory
   id: Circuitry
   name: lathe-category-circuitry
 
+- type: latheCategory
+  id: Clothing
+  name: lathe-category-clothing
+
 - type: latheCategory
   id: Lights
   name: lathe-category-lights
 
 - type: latheCategory
-  id: Mech
-  name: lathe-category-mechs
+  id: Machines
+  name: lathe-category-machines
 
 - type: latheCategory
   id: Parts
@@ -44,6 +44,57 @@
   id: Materials
   name: lathe-category-materials
 
+# Circuit imprinter
+- type: latheCategory
+  id: Computers
+  name: lathe-category-computers
+
+- type: latheCategory
+  id: Engineering
+  name: lathe-category-engineering
+
+- type: latheCategory
+  id: General
+  name: lathe-category-general
+
+- type: latheCategory
+  id: Medical
+  name: lathe-category-medical
+
+- type: latheCategory
+  id: Research
+  name: lathe-category-research
+
+- type: latheCategory
+  id: Security
+  name: lathe-category-security
+
+- type: latheCategory
+  id: Service
+  name: lathe-category-service
+
+- type: latheCategory
+  id: Supply
+  name: lathe-category-supply
+
+# Science
+- type: latheCategory
+  id: Mech
+  name: lathe-category-mechs
+
+# Sec
+- type: latheCategory
+  id: Ammo
+  name: lathe-category-ammo
+
+- type: latheCategory
+  id: Boxes
+  name: lathe-category-boxes
+
+- type: latheCategory
+  id: Magazines
+  name: lathe-category-magazines
+
 # Uniform printer
 - type: latheCategory
   id: Bedsheets

Resources/Prototypes/Recipes/Lathes/chemistry.yml

@@ -3,14 +3,14 @@
   result: Beaker
   completetime: 2
   materials:
-    Glass: 100
+    Glass: 200
 
 - type: latheRecipe
   id: LargeBeaker
   result: LargeBeaker
   completetime: 2
   materials:
-    Glass: 200
+    Glass: 400
 
 - type: latheRecipe
   id: CryostasisBeaker

Resources/Prototypes/Recipes/Lathes/circuitry.yml

@@ -0,0 +1,117 @@
+# Non-machine boards, non-computer boards
+# Base categories
+
+- type: latheRecipe
+  abstract: true
+  id: BaseCircuitryRecipeCategory
+  categories:
+  - Circuitry
+
+- type: latheRecipe
+  abstract: true
+  id: BaseMechRecipeCategory
+  categories:
+  - Mech
+
+## Recipes
+
+# Misc
+- type: latheRecipe
+  parent: [ BaseCheapElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: FreezerElectronics
+  result: FreezerElectronics
+
+- type: latheRecipe
+  parent: [ BaseElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: MailingUnitElectronics
+  result: MailingUnitElectronics
+
+# Airtight
+- type: latheRecipe
+  parent: [ BaseCheapElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: FirelockElectronics
+  result: FirelockElectronics
+
+- type: latheRecipe
+  parent: [ BaseCheapElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: DoorElectronics
+  result: DoorElectronics
+
+# Power
+- type: latheRecipe
+  parent: [ BaseCheapCircuitboardRecipe, BaseCircuitryRecipeCategory ]
+  id: APCElectronics
+  result: APCElectronics
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseCircuitryRecipeCategory ]
+  id: SolarTrackerElectronics
+  result: SolarTrackerElectronics
+
+# Wallmount power
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseCircuitryRecipeCategory ]
+  id: WallmountSubstationElectronics
+  result: WallmountSubstationElectronics
+
+# Wallmount
+- type: latheRecipe
+  parent: [ BaseCheapElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: StationMapElectronics
+  result: StationMapCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCheapElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: SignalTimerElectronics
+  result: SignalTimerElectronics
+
+- type: latheRecipe
+  parent: [ BaseElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: AirAlarmElectronics
+  result: AirAlarmElectronics
+
+- type: latheRecipe
+  parent: [ BaseElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: IntercomElectronics
+  result: IntercomElectronics
+
+- type: latheRecipe
+  parent: [ BaseElectronicsRecipe, BaseCircuitryRecipeCategory ]
+  id: FireAlarmElectronics
+  result: FireAlarmElectronics
+
+# Mechs
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseMechRecipeCategory ]
+  id: RipleyCentralElectronics
+  result: RipleyCentralElectronics
+
+- type: latheRecipe
+  parent: RipleyCentralElectronics
+  id: RipleyPeripheralsElectronics
+  result: RipleyPeripheralsElectronics
+
+- type: latheRecipe
+  parent: [ BaseBananiumCircuitboardRecipe, BaseMechRecipeCategory ]
+  id: HonkerCentralElectronics
+  result: HonkerCentralElectronics
+
+- type: latheRecipe
+  parent: HonkerCentralElectronics
+  id: HonkerPeripheralsElectronics
+  result: HonkerPeripheralsElectronics
+
+- type: latheRecipe
+  parent: HonkerCentralElectronics
+  id: HonkerTargetingElectronics
+  result: HonkerTargetingElectronics
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseMechRecipeCategory]
+  id: HamtrCentralElectronics
+  result: HamtrCentralElectronics
+
+- type: latheRecipe
+  parent: HamtrCentralElectronics
+  id: HamtrPeripheralsElectronics
+  result: HamtrPeripheralsElectronics

Resources/Prototypes/Recipes/Lathes/clothing.yml

@@ -82,7 +82,7 @@
   parent: BaseJumpsuitRecipe
   id: ClothingUniformJumpskirtColorGrey
   result: ClothingUniformJumpskirtColorGrey
-  
+
 - type: latheRecipe
   parent: BaseJumpsuitRecipe
   id: ClothingUniformJumpsuitLoungewear
@@ -245,6 +245,18 @@
   id: ClothingUniformJumpskirtCMOTurtle
   result: ClothingUniformJumpskirtCMOTurtle
 
+## Command (Generic)
+
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformJumpsuitCommandGeneric
+  result: ClothingUniformJumpsuitCommandGeneric
+
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformJumpskirtCommandGeneric
+  result: ClothingUniformJumpskirtCommandGeneric
+
 ## Detective
 
 - type: latheRecipe
@@ -823,6 +835,16 @@
   id: ClothingHeadHatBeretCmo
   result: ClothingHeadHatBeretCmo
 
+- type: latheRecipe
+  parent: BaseCommandHatRecipe
+  id: ClothingHeadHatBeretCommand
+  result: ClothingHeadHatBeretCommand
+
+- type: latheRecipe
+  parent: BaseCommandHatRecipe
+  id: ClothingHeadHatCommandSoft
+  result: ClothingHeadHatCommandSoft
+
 # Non-command hats
 
 - type: latheRecipe

Resources/Prototypes/Recipes/Lathes/computer_boards.yml

@@ -0,0 +1,105 @@
+# Base categories
+
+- type: latheRecipe
+  abstract: true
+  id: BaseEngineeringComputerRecipeCategory
+  categories:
+  - Computers
+  - Engineering
+
+- type: latheRecipe
+  abstract: true
+  id: BaseMedicalComputerRecipeCategory
+  categories:
+  - Computers
+  - Medical
+
+- type: latheRecipe
+  abstract: true
+  id: BaseResearchComputerRecipeCategory
+  categories:
+  - Computers
+  - Research
+
+- type: latheRecipe
+  abstract: true
+  id: BaseSecurityComputerRecipeCategory
+  categories:
+  - Computers
+  - Security
+
+- type: latheRecipe
+  abstract: true
+  id: BaseServiceComputerRecipeCategory
+  categories:
+  - Computers
+  - Service
+
+- type: latheRecipe
+  abstract: true
+  id: BaseSupplyComputerRecipeCategory
+  categories:
+  - Computers
+  - Supply
+
+- type: latheRecipe
+  abstract: true
+  id: BaseGeneralComputerRecipeCategory
+  categories:
+  - Computers
+  - General
+
+## Recipes
+
+# Engineering
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseEngineeringComputerRecipeCategory ]
+  id: SolarControlComputerCircuitboard
+  result: SolarControlComputerCircuitboard
+
+# Medical
+
+# Science
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseResearchComputerRecipeCategory ]
+  id: AnalysisComputerCircuitboard
+  result: AnalysisComputerCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseResearchComputerRecipeCategory ]
+  id: TechDiskComputerCircuitboard
+  result: TechDiskComputerCircuitboard
+
+# Cameras
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSecurityComputerRecipeCategory ]
+  id: SurveillanceCameraMonitorCircuitboard
+  result: SurveillanceCameraMonitorCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceComputerRecipeCategory ]
+  id: SurveillanceWirelessCameraMonitorCircuitboard
+  result: SurveillanceWirelessCameraMonitorCircuitboard
+
+# Service
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceComputerRecipeCategory ]
+  id: MassMediaCircuitboard
+  result: ComputerMassMediaCircuitboard
+
+# Shuttle
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseSupplyComputerRecipeCategory ]
+  id: ShuttleConsoleCircuitboard
+  result: ShuttleConsoleCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSupplyComputerRecipeCategory ]
+  id: RadarConsoleCircuitboard
+  result: RadarConsoleCircuitboard
+
+# Civilian
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseGeneralComputerRecipeCategory ]
+  id: ComputerTelevisionCircuitboard
+  result: ComputerTelevisionCircuitboard

Resources/Prototypes/Recipes/Lathes/devices.yml

@@ -175,6 +175,15 @@
     Glass: 100
     Uranium: 100
 
+- type: latheRecipe
+  id: DeviceDesynchronizer
+  result: DeviceDesynchronizer
+  completetime: 5
+  materials:
+    Steel: 700
+    Glass: 100
+    Uranium: 200
+
 - type: latheRecipe
   id: WeaponProtoKineticAccelerator
   result: WeaponProtoKineticAccelerator

Resources/Prototypes/Recipes/Lathes/machine_boards.yml

@@ -1,412 +1,158 @@
-# Base protoypes
+# Base categories
 
 - type: latheRecipe
   abstract: true
-  id: BaseElectronicsRecipe
+  id: BaseMachineRecipeCategory
   categories:
-  - Circuitry
-  completetime: 2
-  materials:
-    Steel: 100
-    Plastic: 300
+  - Machines
 
 - type: latheRecipe
   abstract: true
-  parent: BaseElectronicsRecipe
-  id: BaseCheapElectronicsRecipe
-  materials:
-    Steel: 50
-    Plastic: 50
+  id: BaseEngineeringMachineRecipeCategory
+  categories:
+  - Machines
+  - Engineering
 
 - type: latheRecipe
   abstract: true
-  parent: BaseElectronicsRecipe
-  id: BaseCheapCircuitboardRecipe
-  materials:
-     Steel: 50
-     Glass: 250
+  id: BaseMedicalMachineRecipeCategory
+  categories:
+  - Machines
+  - Medical
 
 - type: latheRecipe
   abstract: true
-  parent: BaseElectronicsRecipe
-  id: BaseCircuitboardRecipe
-  completetime: 4
-  materials:
-    Steel: 100
-    Glass: 500
+  id: BaseResearchMachineRecipeCategory
+  categories:
+  - Machines
+  - Research
 
 - type: latheRecipe
   abstract: true
-  parent: BaseCircuitboardRecipe
-  id: BaseGoldCircuitboardRecipe
-  materials:
-    Steel: 100
-    Glass: 500
-    Gold: 100
+  id: BaseSecurityMachineRecipeCategory
+  categories:
+  - Machines
+  - Security
 
 - type: latheRecipe
   abstract: true
-  parent: BaseCircuitboardRecipe
-  id: BaseSilverCircuitboardRecipe
-  materials:
-    Steel: 100
-    Glass: 500
-    Silver: 100
+  id: BaseServiceMachineRecipeCategory
+  categories:
+  - Machines
+  - Service
 
 - type: latheRecipe
   abstract: true
-  parent: BaseCircuitboardRecipe
-  id: BaseBananiumCircuitboardRecipe
-  materials:
-    Steel: 100
-    Glass: 500
-    Bananium: 100
-
-# Recipes
+  id: BaseSupplyMachineRecipeCategory
+  categories:
+  - Machines
+  - Supply
 
 - type: latheRecipe
-  parent: BaseCheapElectronicsRecipe
-  id: FirelockElectronics
-  result: FirelockElectronics
+  abstract: true
+  id: BaseGeneralMachineRecipeCategory
+  categories:
+  - Machines
+  - General
 
-- type: latheRecipe
-  parent: BaseElectronicsRecipe
-  id: MailingUnitElectronics
-  result: MailingUnitElectronics
+## Recipes
 
+## Non-circuit imprinter (no second category)
+
+# Autolathe
 - type: latheRecipe
-  parent: BaseCheapElectronicsRecipe
+  parent: [ BaseCheapElectronicsRecipe, BaseMachineRecipeCategory ]
   id: CellRechargerCircuitboard
   result: CellRechargerCircuitboard
 
 - type: latheRecipe
-  parent: CellRechargerCircuitboard
-  id: BorgChargerCircuitboard
-  result: BorgChargerCircuitboard
-
-- type: latheRecipe
-  parent: CellRechargerCircuitboard
+  parent: [ BaseCheapElectronicsRecipe, BaseMachineRecipeCategory ]
   id: WeaponCapacitorRechargerCircuitboard
   result: WeaponCapacitorRechargerCircuitboard
 
 - type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: TurboItemRechargerCircuitboard
-  result: TurboItemRechargerCircuitboard
-
-- type: latheRecipe
-  parent: BaseCheapElectronicsRecipe
-  id: DoorElectronics
-  result: DoorElectronics
-
-- type: latheRecipe
-  parent: BaseCheapElectronicsRecipe
-  id: FreezerElectronics
-  result: FreezerElectronics
-
-- type: latheRecipe
-  parent: BaseElectronicsRecipe
-  id: AirAlarmElectronics
-  result: AirAlarmElectronics
-
-- type: latheRecipe
-  parent: BaseCheapElectronicsRecipe
-  id: StationMapElectronics
-  result: StationMapCircuitboard
-
-- type: latheRecipe
-  parent: BaseElectronicsRecipe
-  id: IntercomElectronics
-  result: IntercomElectronics
-
-- type: latheRecipe
-  parent: BaseElectronicsRecipe
-  id: FireAlarmElectronics
-  result: FireAlarmElectronics
-
-- type: latheRecipe
-  parent: BaseCheapElectronicsRecipe
-  id: SignalTimerElectronics
-  result: SignalTimerElectronics
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: CloningPodMachineCircuitboard
-  result: CloningPodMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ThermomachineFreezerMachineCircuitBoard
-  result: ThermomachineFreezerMachineCircuitBoard
-
-- type: latheRecipe
-  parent: BaseSilverCircuitboardRecipe
-  id: HellfireFreezerMachineCircuitBoard
-  result: HellfireFreezerMachineCircuitBoard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: CondenserMachineCircuitBoard
-  result: CondenserMachineCircuitBoard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: PortableScrubberMachineCircuitBoard
-  result: PortableScrubberMachineCircuitBoard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: SpaceHeaterMachineCircuitBoard
-  result: SpaceHeaterMachineCircuitBoard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: MedicalScannerMachineCircuitboard
-  result: MedicalScannerMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: CryoPodMachineCircuitboard
-  result: CryoPodMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ChemMasterMachineCircuitboard
-  result: ChemMasterMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ChemDispenserMachineCircuitboard
-  result: ChemDispenserMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: BiomassReclaimerMachineCircuitboard
-  result: BiomassReclaimerMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: BiofabricatorMachineCircuitboard
-  result: BiofabricatorMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: HydroponicsTrayMachineCircuitboard
-  result: HydroponicsTrayMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: AutolatheMachineCircuitboard
-  result: AutolatheMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ProtolatheMachineCircuitboard
-  result: ProtolatheMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: AutolatheHyperConvectionMachineCircuitboard
-  result: AutolatheHyperConvectionMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ProtolatheHyperConvectionMachineCircuitboard
-  result: ProtolatheHyperConvectionMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: CircuitImprinterMachineCircuitboard
-  result: CircuitImprinterMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: CircuitImprinterHyperConvectionMachineCircuitboard
-  result: CircuitImprinterHyperConvectionMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ExosuitFabricatorMachineCircuitboard
-  result: ExosuitFabricatorMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: UniformPrinterMachineCircuitboard
-  result: UniformPrinterMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: BiogeneratorMachineCircuitboard
-  result: BiogeneratorMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: VaccinatorMachineCircuitboard
-  result: VaccinatorMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: DiagnoserMachineCircuitboard
-  result: DiagnoserMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ArtifactAnalyzerMachineCircuitboard
-  result: ArtifactAnalyzerMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ArtifactCrusherMachineCircuitboard
-  result: ArtifactCrusherMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: AnomalyVesselCircuitboard
-  result: AnomalyVesselCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: AnomalyVesselExperimentalCircuitboard
-  result: AnomalyVesselExperimentalCircuitboard
-
-- type: latheRecipe
-  parent: BaseSilverCircuitboardRecipe
-  id: AnomalySynchronizerCircuitboard
-  result: AnomalySynchronizerCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: APECircuitboard
-  result: APECircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ReagentGrinderMachineCircuitboard
-  result: ReagentGrinderMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: HotplateMachineCircuitboard
-  result: HotplateMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: AnalysisComputerCircuitboard
-  result: AnalysisComputerCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: TechDiskComputerCircuitboard
-  result: TechDiskComputerCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ShuttleConsoleCircuitboard
-  result: ShuttleConsoleCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: RadarConsoleCircuitboard
-  result: RadarConsoleCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: DawInstrumentMachineCircuitboard
-  result: DawInstrumentMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: StasisBedMachineCircuitboard
-  result: StasisBedMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ElectrolysisUnitMachineCircuitboard
-  result: ElectrolysisUnitMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: CentrifugeMachineCircuitboard
-  result: CentrifugeMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: OreProcessorMachineCircuitboard
-  result: OreProcessorMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: OreProcessorIndustrialMachineCircuitboard
-  result: OreProcessorIndustrialMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: SalvageMagnetMachineCircuitboard
-  result: SalvageMagnetMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: RipleyCentralElectronics
-  result: RipleyCentralElectronics
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: RipleyPeripheralsElectronics
-  result: RipleyPeripheralsElectronics
-
-- type: latheRecipe
-  parent: BaseBananiumCircuitboardRecipe
-  id: HonkerCentralElectronics
-  result: HonkerCentralElectronics
-
-- type: latheRecipe
-  parent: BaseBananiumCircuitboardRecipe
-  id: HonkerPeripheralsElectronics
-  result: HonkerPeripheralsElectronics
-
-- type: latheRecipe
-  parent: BaseBananiumCircuitboardRecipe
-  id: HonkerTargetingElectronics
-  result: HonkerTargetingElectronics
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: HamtrCentralElectronics
-  result: HamtrCentralElectronics
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: HamtrPeripheralsElectronics
-  result: HamtrPeripheralsElectronics
-
-# Power
-- type: latheRecipe
-  parent: BaseCheapCircuitboardRecipe
-  id: APCElectronics
-  result: APCElectronics
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
+  parent: [ BaseCircuitboardRecipe, BaseMachineRecipeCategory ]
   id: SubstationMachineCircuitboard
   result: SubstationMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: WallmountSubstationElectronics
-  result: WallmountSubstationElectronics
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
+  parent: [ BaseCircuitboardRecipe, BaseMachineRecipeCategory ]
   id: SMESMachineCircuitboard
   result: SMESMachineCircuitboard
 
+# Security techfab
 - type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
+  parent: [ BaseCircuitboardRecipe, BaseMachineRecipeCategory ]
+  id: ShuttleGunSvalinnMachineGunCircuitboard
+  result: ShuttleGunSvalinnMachineGunCircuitboard
+  completetime: 6
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseMachineRecipeCategory ]
+  id: ShuttleGunPerforatorCircuitboard
+  result: ShuttleGunPerforatorCircuitboard
+  completetime: 10
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseMachineRecipeCategory ]
+  id: ShuttleGunFriendshipCircuitboard
+  result: ShuttleGunFriendshipCircuitboard
+  completetime: 8
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseMachineRecipeCategory ]
+  id: ShuttleGunDusterCircuitboard
+  result: ShuttleGunDusterCircuitboard
+  completetime: 12
+
+## Circuit imprinter
+
+## Engineering
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: EmitterCircuitboard
+  result: EmitterCircuitboard
+
+# Atmos
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: ThermomachineFreezerMachineCircuitBoard
+  result: ThermomachineFreezerMachineCircuitBoard
+
+- type: latheRecipe
+  parent: [ BaseSilverCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: HellfireFreezerMachineCircuitBoard
+  result: HellfireFreezerMachineCircuitBoard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: SpaceHeaterMachineCircuitBoard
+  result: SpaceHeaterMachineCircuitBoard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: PortableScrubberMachineCircuitBoard
+  result: PortableScrubberMachineCircuitBoard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: CondenserMachineCircuitBoard
+  result: CondenserMachineCircuitBoard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: GasRecyclerMachineCircuitboard
+  result: GasRecyclerMachineCircuitboard
+
+# Power
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
   id: SMESAdvancedMachineCircuitboard
   result: SMESAdvancedMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
+  parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
   id: PortableGeneratorPacmanMachineCircuitboard
   result: PortableGeneratorPacmanMachineCircuitboard
 
@@ -420,187 +166,299 @@
   id: PortableGeneratorJrPacmanMachineCircuitboard
   result: PortableGeneratorJrPacmanMachineCircuitboard
 
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SolarControlComputerCircuitboard
-  result: SolarControlComputerCircuitboard
+## Medical
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SolarTrackerElectronics
-  result: SolarTrackerElectronics
+  parent: [ BaseGoldCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: BiomassReclaimerMachineCircuitboard
+  result: BiomassReclaimerMachineCircuitboard
+
+# Chemistry
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: HotplateMachineCircuitboard
+  result: HotplateMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: CloningConsoleComputerCircuitboard
-  result: CloningConsoleComputerCircuitboard
+  parent: [ BaseCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: ElectrolysisUnitMachineCircuitboard
+  result: ElectrolysisUnitMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: MicrowaveMachineCircuitboard
-  result: MicrowaveMachineCircuitboard
+  parent: [ BaseCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: CentrifugeMachineCircuitboard
+  result: CentrifugeMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ElectricGrillMachineCircuitboard
-  result: ElectricGrillMachineCircuitboard
+  parent: [ BaseGoldCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: ChemMasterMachineCircuitboard
+  result: ChemMasterMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: FatExtractorMachineCircuitboard
-  result: FatExtractorMachineCircuitboard
+  parent: [ BaseGoldCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: ChemDispenserMachineCircuitboard
+  result: ChemDispenserMachineCircuitboard
+
+# Treatment
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: CryoPodMachineCircuitboard
+  result: CryoPodMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: FlatpackerMachineCircuitboard
-  result: FlatpackerMachineCircuitboard
+  parent: [ BaseGoldCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: StasisBedMachineCircuitboard
+  result: StasisBedMachineCircuitboard
+
+## Science
+
+# Artifact
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: ArtifactAnalyzerMachineCircuitboard
+  result: ArtifactAnalyzerMachineCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SheetifierMachineCircuitboard
-  result: SheetifierMachineCircuitboard
+  parent: [ BaseGoldCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: ArtifactCrusherMachineCircuitboard
+  result: ArtifactCrusherMachineCircuitboard
+
+# Anomaly
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: AnomalyVesselCircuitboard
+  result: AnomalyVesselCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SurveillanceCameraRouterCircuitboard
-  result: SurveillanceCameraRouterCircuitboard
+  parent: [ BaseGoldCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: AnomalyVesselExperimentalCircuitboard
+  result: AnomalyVesselExperimentalCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SurveillanceCameraWirelessRouterCircuitboard
-  result: SurveillanceCameraWirelessRouterCircuitboard
+  parent: [ BaseSilverCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: AnomalySynchronizerCircuitboard
+  result: AnomalySynchronizerCircuitboard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SurveillanceWirelessCameraAnchoredCircuitboard
-  result: SurveillanceWirelessCameraAnchoredCircuitboard
+  parent: [ BaseCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: APECircuitboard
+  result: APECircuitboard
+
+## Service
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SurveillanceWirelessCameraMovableCircuitboard
-  result: SurveillanceWirelessCameraMovableCircuitboard
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: DawInstrumentMachineCircuitboard
+  result: DawInstrumentMachineCircuitboard
 
+# Bar
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SurveillanceCameraMonitorCircuitboard
-  result: SurveillanceCameraMonitorCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SurveillanceWirelessCameraMonitorCircuitboard
-  result: SurveillanceWirelessCameraMonitorCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ComputerTelevisionCircuitboard
-  result: ComputerTelevisionCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: EmitterCircuitboard
-  result: EmitterCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ThrusterMachineCircuitboard
-  result: ThrusterMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: GyroscopeMachineCircuitboard
-  result: GyroscopeMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: GasRecyclerMachineCircuitboard
-  result: GasRecyclerMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SeedExtractorMachineCircuitboard
-  result: SeedExtractorMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: BoozeDispenserMachineCircuitboard
-  result: BoozeDispenserMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: CargoTelepadMachineCircuitboard
-  result: CargoTelepadMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: SodaDispenserMachineCircuitboard
-  result: SodaDispenserMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: TelecomServerCircuitboard
-  result: TelecomServerCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: MassMediaCircuitboard
-  result: ComputerMassMediaCircuitboard
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: MiniGravityGeneratorCircuitboard
-  result: MiniGravityGeneratorCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: PowerCageRechargerCircuitboard
-  result: PowerCageRechargerCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ShuttleGunSvalinnMachineGunCircuitboard
-  result: ShuttleGunSvalinnMachineGunCircuitboard
-  completetime: 6
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ShuttleGunPerforatorCircuitboard
-  result: ShuttleGunPerforatorCircuitboard
-  completetime: 10
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
-  id: ShuttleGunKineticCircuitboard
-  result: ShuttleGunKineticCircuitboard
-  completetime: 6
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ShuttleGunFriendshipCircuitboard
-  result: ShuttleGunFriendshipCircuitboard
-  completetime: 8
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ShuttleGunDusterCircuitboard
-  result: ShuttleGunDusterCircuitboard
-  completetime: 12
-
-- type: latheRecipe
-  parent: BaseGoldCircuitboardRecipe
-  id: ReagentGrinderIndustrialMachineCircuitboard
-  result: ReagentGrinderIndustrialMachineCircuitboard
-
-- type: latheRecipe
-  parent: BaseCircuitboardRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
   id: JukeboxCircuitBoard
   result: JukeboxCircuitBoard
 
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: BoozeDispenserMachineCircuitboard
+  result: BoozeDispenserMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: SodaDispenserMachineCircuitboard
+  result: SodaDispenserMachineCircuitboard
+
+# Hydroponics
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: HydroponicsTrayMachineCircuitboard
+  result: HydroponicsTrayMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: SeedExtractorMachineCircuitboard
+  result: SeedExtractorMachineCircuitboard
+
+# Kitchen
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: ElectricGrillMachineCircuitboard
+  result: ElectricGrillMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: MicrowaveMachineCircuitboard
+  result: MicrowaveMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: FatExtractorMachineCircuitboard
+  result: FatExtractorMachineCircuitboard
+
+## Supply
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
+  id: CargoTelepadMachineCircuitboard
+  result: CargoTelepadMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
+  id: SalvageMagnetMachineCircuitboard
+  result: SalvageMagnetMachineCircuitboard
+
+# Shuttle
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
+  id: ThrusterMachineCircuitboard
+  result: ThrusterMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
+  id: GyroscopeMachineCircuitboard
+  result: GyroscopeMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
+  id: MiniGravityGeneratorCircuitboard
+  result: MiniGravityGeneratorCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSecurityMachineRecipeCategory ]
+  id: PowerCageRechargerCircuitboard
+  result: PowerCageRechargerCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSecurityMachineRecipeCategory ]
+  id: ShuttleGunKineticCircuitboard
+  result: ShuttleGunKineticCircuitboard
+  completetime: 6
+
+## Miscellaneous
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: ReagentGrinderMachineCircuitboard
+  result: ReagentGrinderMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: ReagentGrinderIndustrialMachineCircuitboard
+  result: ReagentGrinderIndustrialMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: FlatpackerMachineCircuitboard
+  result: FlatpackerMachineCircuitboard
+
+# Lathes
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: ProtolatheMachineCircuitboard
+  result: ProtolatheMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: ProtolatheHyperConvectionMachineCircuitboard
+  result: ProtolatheHyperConvectionMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: CircuitImprinterMachineCircuitboard
+  result: CircuitImprinterMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: CircuitImprinterHyperConvectionMachineCircuitboard
+  result: CircuitImprinterHyperConvectionMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseResearchMachineRecipeCategory ]
+  id: ExosuitFabricatorMachineCircuitboard
+  result: ExosuitFabricatorMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: BiogeneratorMachineCircuitboard
+  result: BiogeneratorMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: BiofabricatorMachineCircuitboard
+  result: BiofabricatorMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
+  id: OreProcessorMachineCircuitboard
+  result: OreProcessorMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseSupplyMachineRecipeCategory ]
+  id: OreProcessorIndustrialMachineCircuitboard
+  result: OreProcessorIndustrialMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: AutolatheMachineCircuitboard
+  result: AutolatheMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: AutolatheHyperConvectionMachineCircuitboard
+  result: AutolatheHyperConvectionMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: UniformPrinterMachineCircuitboard
+  result: UniformPrinterMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: SheetifierMachineCircuitboard
+  result: SheetifierMachineCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
   id: CutterMachineCircuitboard
   result: CutterMachineCircuitboard
 
+# Cell chargers
 - type: latheRecipe
-  parent: BaseCircuitboardRecipe
+  parent: [ BaseCheapElectronicsRecipe, BaseGeneralMachineRecipeCategory ]
+  id: BorgChargerCircuitboard
+  result: BorgChargerCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseGoldCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
+  id: TurboItemRechargerCircuitboard
+  result: TurboItemRechargerCircuitboard
+
+# Comms and Cameras
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
+  id: TelecomServerCircuitboard
+  result: TelecomServerCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseSecurityMachineRecipeCategory ]
+  id: SurveillanceCameraRouterCircuitboard
+  result: SurveillanceCameraRouterCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: SurveillanceCameraWirelessRouterCircuitboard
+  result: SurveillanceCameraWirelessRouterCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: SurveillanceWirelessCameraAnchoredCircuitboard
+  result: SurveillanceWirelessCameraAnchoredCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseServiceMachineRecipeCategory ]
+  id: SurveillanceWirelessCameraMovableCircuitboard
+  result: SurveillanceWirelessCameraMovableCircuitboard
+
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseGeneralMachineRecipeCategory ]
   id: HolopadMachineCircuitboard
   result: HolopadMachineCircuitboard

Resources/Prototypes/Recipes/Lathes/misc.yml

@@ -237,3 +237,18 @@
   completetime: 3
   materials:
     Plastic: 200
+
+- type: latheRecipe
+  id: ClothingOuterVestTank
+  result: ClothingOuterVestTank
+  completetime: 2
+  materials:
+    Cloth: 100
+    Steel: 50
+
+- type: latheRecipe
+  id: Ashtray
+  result: Ashtray
+  completetime: 1
+  materials:
+    Steel: 30

Resources/Prototypes/Recipes/Lathes/security.yml

@@ -1,14 +1,39 @@
 # Base prototypes
 
+- type: latheRecipe
+  abstract: true
+  id: BaseShieldRecipe
+  categories:
+  - Tools
+  completetime: 4
+
+- type: latheRecipe
+  abstract: true
+  id: BaseTargetRecipe
+  categories:
+  - Tools
+  completetime: 5
+  applyMaterialDiscount: false # ingredients dropped when destroyed
+  materials:
+    Steel: 500
+
 - type: latheRecipe
   abstract: true
   id: BaseWeaponRecipe
   categories:
   - Weapons
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseWeaponRecipe
+  id: BaseWeaponRecipeMelee
   completetime: 2
-  materials:
-    Steel: 300
-    Plastic: 300
+
+- type: latheRecipe
+  abstract: true
+  parent: BaseWeaponRecipe
+  id: BaseWeaponRecipePractice
+  completetime: 4
 
 - type: latheRecipe
   abstract: true
@@ -18,51 +43,168 @@
 
 - type: latheRecipe
   abstract: true
-  id: BaseAmmoRecipe
+  parent: BaseWeaponRecipe
+  id: BaseWeaponRecipeSidearm
+  completetime: 6
+
+## Recipes
+
+# Clothing
+- type: latheRecipe
+  id: ClothingBackpackElectropack
+  result: ClothingBackpackElectropack
   categories:
-  - Ammo
-  completetime: 5
+  - Clothing
+  completetime: 4
+  materials:
+    Steel: 500
+    Plastic: 250
+    Cloth: 500
 
 - type: latheRecipe
-  abstract: true
-  parent: BaseAmmoRecipe
-  id: BaseEmptyAmmoRecipe
-  completetime: 1
-
-# Recipes
+  id: ClothingEyesHudSecurity
+  result: ClothingEyesHudSecurity
+  categories:
+  - Clothing
+  completetime: 2
+  materials:
+    Steel: 300
+    Glass: 200
 
 - type: latheRecipe
+  id: PortableRecharger
+  result: PortableRecharger
+  categories:
+  - Clothing
+  completetime: 15
+  materials:
+    Steel: 2000
+    Uranium: 2000
+    Plastic: 1000
+    Plasma: 500
+    Glass: 500
+
+# Shields
+- type: latheRecipe
+  parent: BaseShieldRecipe
+  id: RiotShield
+  result: RiotShield
+  materials:
+    Steel: 400
+    Glass: 400
+
+- type: latheRecipe
+  parent: BaseShieldRecipe
+  id: TelescopicShield
+  result: TelescopicShield
+  materials:
+    Steel: 300
+    Glass: 800
+
+# Targets
+- type: latheRecipe
+  parent: BaseTargetRecipe
+  id: TargetHuman
+  result: TargetHuman
+
+- type: latheRecipe
+  parent: BaseTargetRecipe
+  id: TargetClown
+  result: TargetClown
+
+- type: latheRecipe
+  parent: BaseTargetRecipe
+  id: TargetSyndicate
+  result: TargetSyndicate
+
+# Tools
+- type: latheRecipe
+  parent: BaseToolRecipe
   id: Handcuffs
   result: Handcuffs
-  completetime: 2
   materials:
     Steel: 300
 
 - type: latheRecipe
+  parent: BaseToolRecipe
   id: Zipties
   result: Zipties
-  completetime: 2
   materials:
     Plastic: 200
 
 - type: latheRecipe
-  parent: BaseWeaponRecipe
+  parent: BaseToolRecipe
+  id: ForensicPad
+  result: ForensicPad
+  completetime: 4
+  materials:
+    Plastic: 100
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: HoloprojectorSecurity
+  result: HoloprojectorSecurityEmpty
+  materials:
+    Steel: 300
+    Glass: 50
+    Plastic: 50
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: Flash
+  result: Flash
+  materials:
+    Glass: 100
+    Plastic: 200
+    Steel: 100
+
+## Weapons
+
+# Melee
+- type: latheRecipe
+  parent: BaseWeaponRecipeMelee
   id: Stunbaton
   result: Stunbaton
+  materials:
+    Steel: 300
+    Plastic: 300
 
 - type: latheRecipe
-  parent: BaseWeaponRecipe
+  parent: BaseWeaponRecipeMelee
   id: Truncheon
   result: Truncheon
+  materials:
+    Steel: 300
+    Plastic: 300
 
 - type: latheRecipe
-  parent: BaseWeaponRecipe
+  parent: BaseWeaponRecipeMelee
   id: CombatKnife
   result: CombatKnife
   materials:
     Steel: 250
     Plastic: 100
 
+# Practice weapons
+- type: latheRecipe
+  parent: BaseWeaponRecipePractice
+  id: WeaponDisablerPractice
+  result: WeaponDisablerPractice
+  materials:
+    Steel: 500
+    Glass: 100
+    Plastic: 200
+
+- type: latheRecipe
+  parent: BaseWeaponRecipePractice
+  id: WeaponLaserCarbinePractice
+  result: WeaponLaserCarbinePractice
+  materials:
+    Steel: 1800
+    Glass: 400
+    Plastic: 250
+
+# Long Guns
 - type: latheRecipe
   parent: BaseWeaponRecipeLong
   id: WeaponLaserCarbine
@@ -90,14 +232,6 @@
     Plastic: 750
     Gold: 500
 
-- type: latheRecipe
-  parent: BaseWeaponRecipeLong
-  id: WeaponLaserSvalinn
-  result: WeaponLaserSvalinn
-  materials:
-    Steel: 2000
-    Gold: 500
-
 - type: latheRecipe
   parent: BaseWeaponRecipeLong
   id: WeaponXrayCannon
@@ -109,540 +243,27 @@
     Gold: 100
 
 - type: latheRecipe
-  id: ClothingBackpackElectropack
-  result: ClothingBackpackElectropack
-  completetime: 4
-  materials:
-    Steel: 500
-    Plastic: 250
-    Cloth: 500
-
-- type: latheRecipe
-  id: ForensicPad
-  result: ForensicPad
-  completetime: 4
-  materials:
-    Plastic: 100
-
-- type: latheRecipe
-  id: ClothingEyesHudSecurity
-  result: ClothingEyesHudSecurity
-  completetime: 2
-  materials:
-    Steel: 300
-    Glass: 200
-
-- type: latheRecipe
-  id: HoloprojectorSecurity
-  result: HoloprojectorSecurityEmpty
-  completetime: 2
-  materials:
-    Steel: 300
-    Glass: 50
-    Plastic: 50
-
-- type: latheRecipe
-  id: RiotShield
-  result: RiotShield
-  completetime: 4
-  materials:
-    Steel: 400
-    Glass: 400
-
-- type: latheRecipe
-  id: TelescopicShield
-  result: TelescopicShield
-  completetime: 4
-  materials:
-    Steel: 300
-    Glass: 800
-
-- type: latheRecipe
-  id: Flash
-  result: Flash
-  completetime: 2
-  materials:
-    Glass: 100
-    Plastic: 200
-    Steel: 100
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxShellTranquilizer
-  result: BoxShellTranquilizer
-  materials:
-    Plastic: 240
-    Steel: 160
-    Glass: 80
-    Plasma: 160
-    Silver: 80
-
-- type: latheRecipe
-  id: TargetHuman
-  result: TargetHuman
-  completetime: 5
-  applyMaterialDiscount: false # ingredients dropped when destroyed
-  materials:
-    Steel: 500
-
-- type: latheRecipe
-  parent: TargetHuman
-  id: TargetClown
-  result: TargetClown
-
-- type: latheRecipe
-  parent: TargetHuman
-  id: TargetSyndicate
-  result: TargetSyndicate
-
-- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazinePistolEmpty
-  result: MagazinePistolEmpty
-  materials:
-    Steel: 25
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistol
-  result: MagazinePistol
-  materials:
-    Steel: 145
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolPractice
-  result: MagazinePistolPractice
-  materials:
-    Steel: 85
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolUranium
-  result: MagazinePistolUranium
-  materials:
-    Steel: 25
-    Plastic: 65
-    Uranium: 120
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolIncendiary
-  result: MagazinePistolIncendiary
-  materials:
-    Steel: 25
-    Plastic: 120
-
-- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazinePistolSubMachineGunEmpty
-  result: MagazinePistolSubMachineGunEmpty
-  materials:
-    Steel: 30
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGun
-  result: MagazinePistolSubMachineGun
-  materials:
-    Steel: 300
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunUranium
-  result: MagazinePistolSubMachineGunUranium
-  materials:
-    Steel: 25
-    Plastic: 250
-    Uranium: 250
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunIncendiary
-  result: MagazinePistolSubMachineGunIncendiary
-  materials:
-    Steel: 25
-    Plastic: 275
-
-- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMountedEmpty
-  result: MagazinePistolSubMachineGunTopMountedEmpty
-  materials:
-    Steel: 30
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazinePistolSubMachineGunTopMounted
-  result: MagazinePistolSubMachineGunTopMounted
-  materials:
-    Steel: 300
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistol
-  result: MagazineBoxPistol
-  materials:
-    Steel: 600
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnum
-  result: MagazineBoxMagnum
-  materials:
-    Steel: 240
-
-- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazineRifleEmpty
-  result: MagazineRifleEmpty
-  materials:
-    Steel: 25
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifle
-  result: MagazineRifle
-  materials:
-    Steel: 475
-
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRiflePractice
-  result: MagazineRiflePractice
-  materials:
-    Steel: 175
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleUranium
-  result: MagazineRifleUranium
-  materials:
-    Steel: 25
-    Plastic: 300
-    Uranium: 300
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineRifleIncendiary
-  result: MagazineRifleIncendiary
-  materials:
-    Steel: 25
-    Plastic: 450
-
-- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazineLightRifleEmpty
-  result: MagazineLightRifleEmpty
-  materials:
-    Steel: 25
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifle
-  result: MagazineLightRifle
-  materials:
-    Steel: 565
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRiflePractice
-  result: MagazineLightRiflePractice
-  materials:
-    Steel: 205
-
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifleUranium
-  result: MagazineLightRifleUranium
-  materials:
-    Steel: 25
-    Plastic: 360
-    Uranium: 360
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineLightRifleIncendiary
-  result: MagazineLightRifleIncendiary
-  materials:
-    Steel: 25
-    Plastic: 540
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRifle
-  result: MagazineBoxRifle
-  materials:
-    Steel: 750
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRifle
-  result: MagazineBoxLightRifle
-  materials:
-    Steel: 900
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxLethalshot
-  result: BoxLethalshot
-  materials:
-    Steel: 320
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxBeanbag
-  result: BoxBeanbag
-  materials:
-    Steel: 160
-    Plastic: 240
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxShotgunSlug
-  result: BoxShotgunSlug
-  materials:
-    Steel: 240
-    Plastic: 160
-
-- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: SpeedLoaderMagnumEmpty
-  result: SpeedLoaderMagnumEmpty
-  materials:
-    Steel: 50
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnum
-  result: SpeedLoaderMagnum
-  materials:
-    Steel: 190
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumPractice
-  result: SpeedLoaderMagnumPractice
-  materials:
-    Steel: 90
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumUranium
-  result: SpeedLoaderMagnumUranium
-  materials:
-    Steel: 50
-    Plastic: 150
-    Uranium: 110
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: SpeedLoaderMagnumIncendiary
-  result: SpeedLoaderMagnumIncendiary
-  materials:
-    Steel: 50
-    Plastic: 150
-
-- type: latheRecipe
-  parent: BaseEmptyAmmoRecipe
-  id: MagazineShotgunEmpty
-  result: MagazineShotgunEmpty
-  materials:
-    Steel: 50
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineShotgun
-  result: MagazineShotgun
-  materials:
-    Steel: 240
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineShotgunBeanbag
-  result: MagazineShotgunBeanbag
-  materials:
-    Steel: 150
-    Plastic: 140
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineShotgunSlug
-  result: MagazineShotgunSlug
-  materials:
-    Steel: 190
-    Plastic: 100
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineShotgunIncendiary
-  result: MagazineShotgunIncendiary
-  materials:
-    Steel: 100
-    Plastic: 190
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistolIncendiary
-  result: MagazineBoxPistolIncendiary
-  materials:
-    Plastic: 600
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnumIncendiary
-  result: MagazineBoxMagnumIncendiary
-  materials:
-    Plastic: 240
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRifleIncendiary
-  result: MagazineBoxLightRifleIncendiary
-  materials:
-    Plastic: 900
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRifleIncendiary
-  result: MagazineBoxRifleIncendiary
-  materials:
-    Plastic: 750
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxShotgunFlare
-  result: BoxShotgunFlare
-  materials:
-    Steel: 80
-    Plastic: 80
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxShotgunIncendiary
-  result: BoxShotgunIncendiary
-  materials:
-    Steel: 80
-    Plastic: 320
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistolPractice
-  result: MagazineBoxPistolPractice
-  materials:
-    Steel: 300
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnumPractice
-  result: MagazineBoxMagnumPractice
-  materials:
-    Steel: 60
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRiflePractice
-  result: MagazineBoxLightRiflePractice
-  materials:
-    Steel: 300
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRiflePractice
-  result: MagazineBoxRiflePractice
-  materials:
-    Steel: 250
-
-- type: latheRecipe
-  parent: BaseWeaponRecipe
-  id: WeaponLaserCarbinePractice
-  result: WeaponLaserCarbinePractice
-  completetime: 6
-  materials:
-    Steel: 1800
-    Glass: 400
-    Plastic: 250
-
-- type: latheRecipe
-  parent: BaseWeaponRecipe
-  id: WeaponDisablerPractice
-  result: WeaponDisablerPractice
-  completetime: 4
-  materials:
-    Steel: 500
-    Glass: 100
-    Plastic: 200
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxShotgunPractice
-  result: BoxShotgunPractice
-  materials:
-    Steel: 80
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxPistolUranium
-  result: MagazineBoxPistolUranium
-  materials:
-    Plastic: 300
-    Uranium: 600
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxMagnumUranium
-  result: MagazineBoxMagnumUranium
-  materials:
-    Plastic: 240
-    Uranium: 180
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxLightRifleUranium
-  result: MagazineBoxLightRifleUranium
-  materials:
-    Plastic: 600
-    Uranium: 600
-
-- type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: MagazineBoxRifleUranium
-  result: MagazineBoxRifleUranium
+  parent: BaseWeaponRecipeLong
+  id: WeaponTemperatureGun
+  result: WeaponTemperatureGun
   materials:
+    Steel: 2000
+    Glass: 500
     Plastic: 500
-    Uranium: 500
+    Gold: 500
 
+# Sidearms
 - type: latheRecipe
-  parent: BaseAmmoRecipe
-  id: BoxShotgunUranium
-  result: BoxShotgunUranium
-  materials:
-    Plastic: 320
-    Uranium: 240
-
-- type: latheRecipe
-  parent: BaseWeaponRecipe
-  id: WeaponFlareGunSecurity
-  result: WeaponFlareGunSecurity
-  completetime: 6
-  materials:
-    Plastic: 100
-    Steel: 400
-
-- type: latheRecipe
-  parent: BaseWeaponRecipe
+  parent: BaseWeaponRecipeSidearm
   id: WeaponDisabler
   result: WeaponDisabler
-  completetime: 6
   materials:
     Steel: 300
     Glass: 200
     Plastic: 200
 
 - type: latheRecipe
-  parent: WeaponDisabler
+  parent: BaseWeaponRecipeSidearm
   id: WeaponDisablerSMG
   result: WeaponDisablerSMG
   materials:
@@ -651,47 +272,17 @@
     Plastic: 500
 
 - type: latheRecipe
-  id: MagazineGrenadeEmpty
-  result: MagazineGrenadeEmpty
-  completetime: 3
-  materials:
-    Steel: 150
-    Plastic: 50
-
-- type: latheRecipe
-  id: GrenadeEMP
-  result: GrenadeEMP
-  completetime: 3
-  materials:
-    Steel: 150
-    Plastic: 100
-    Glass: 20
-
-- type: latheRecipe
-  id: GrenadeBlast
-  result: GrenadeBlast
-  completetime: 3
-  materials:
-    Steel: 450
-    Plastic: 300
-    Gold: 150
-
-- type: latheRecipe
-  id: GrenadeFlash
-  result: GrenadeFlash
-  completetime: 3
-  materials:
-    Steel: 150
-    Plastic: 100
-    Glass: 20
-
-- type: latheRecipe
-  id: PortableRecharger
-  result: PortableRecharger
-  completetime: 15
+  parent: BaseWeaponRecipeSidearm
+  id: WeaponLaserSvalinn
+  result: WeaponLaserSvalinn
   materials:
     Steel: 2000
-    Uranium: 2000
-    Plastic: 1000
-    Plasma: 500
-    Glass: 500
+    Gold: 500
+
+- type: latheRecipe
+  parent: BaseWeaponRecipeSidearm
+  id: WeaponFlareGunSecurity
+  result: WeaponFlareGunSecurity
+  materials:
+    Plastic: 100
+    Steel: 400

Resources/Prototypes/Recipes/Reactions/drinks.yml

@@ -8,6 +8,18 @@
   products:
     AcidSpit: 3
 
+- type: reaction
+  id: AlienBrainHemorrhage
+  reactants:
+    IrishCream:
+      amount: 1
+    BlueCuracao:
+      amount: 1
+    Grenadine:
+      amount: 1
+  products:
+    AlienBrainHemorrhage: 3
+
 - type: reaction
   id: AlliesCocktail
   requiredMixerCategories:
@@ -238,6 +250,20 @@
   products:
     BraveBull: 3
 
+- type: reaction
+  id: Bronx
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Gin:
+      amount: 1
+    Vermouth:
+      amount: 1
+    JuiceOrange:
+      amount: 1
+  products:
+    Bronx: 3
+
 - type: reaction
   id: CafeLatte
   reactants:
@@ -282,6 +308,16 @@
   products:
     CreamOfCoconut: 3
 
+- type: reaction
+  id: CrushDepth
+  reactants:
+    RootBeerFloat:
+      amount: 1
+    Rum:
+      amount: 1
+  products:
+    CrushDepth: 2
+
 - type: reaction
   id: CubaLibre
   reactants:
@@ -292,6 +328,16 @@
   products:
     CubaLibre: 3
 
+- type: reaction
+  id: DarkandStormy
+  reactants:
+    SolDry:
+      amount: 1
+    Rum:
+      amount: 1
+  products:
+    DarkandStormy: 2
+
 - type: reaction
   id: DemonsBlood
   requiredMixerCategories:
@@ -352,6 +398,34 @@
   products:
     DriestMartini: 2
 
+- type: reaction
+  id: Eggnog
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Egg:
+      amount: 1
+    Milk:
+      amount: 4
+    Rum:
+      amount: 5
+  products:
+    Eggnog: 10
+
+- type: reaction
+  id: ElectricShark
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    DarkandStormy:
+      amount: 4
+    BlueCuracao:
+      amount: 1
+    JuicePineapple:
+      amount: 1
+  products:
+    ElectricShark: 6
+
 - type: reaction
   id: ErikaSurprise
   requiredMixerCategories:
@@ -573,6 +647,8 @@
       amount: 1
   products:
     IrishSlammer: 2
+  sound:
+    path: /Audio/Animals/penguin_squawk.ogg # Cocktail is called grenade penguin in localisation
 
 - type: reaction
   id: IrishCoffee
@@ -596,6 +672,48 @@
   products:
     IrishCream: 3
 
+- type: reaction
+  id: JackRose
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    JuiceApple:
+      amount: 1
+    Cognac:
+      amount: 1
+    Grenadine:
+      amount: 1
+    JuiceLemon:
+      amount: 1
+  products:
+    JackRose: 4
+
+- type: reaction
+  id: JungleBird
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Rum:
+      amount: 3
+    JuicePineapple:
+      amount: 1
+    Grenadine:
+      amount: 1
+    JuiceLime:
+      amount: 1
+  products:
+    JungleBird: 6
+
+- type: reaction
+  id: Kalimotxo
+  reactants:
+    Cola:
+      amount: 1
+    Wine:
+      amount: 1
+  products:
+    Kalimotxo: 2
+
 - type: reaction
   id: KiraSpecial
   requiredMixerCategories:
@@ -735,6 +853,22 @@
   products:
     Mojito: 4
 
+- type: reaction
+  id: MonkeyBusiness
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Gin:
+      amount: 1
+    JuiceOrange:
+      amount: 1
+    Grenadine:
+      amount: 1
+    Absinthe:
+      amount: 1
+  products:
+    MonkeyBusiness: 4
+
 - type: reaction
   id: Moonshine
   reactants:
@@ -836,6 +970,16 @@
   products:
     Posca: 3
 
+- type: reaction
+  id: Radler
+  reactants:
+    Lemonade:
+      amount: 1
+    Beer:
+      amount: 1
+  products:
+    Radler: 2
+
 - type: reaction
   id: RedMead
   reactants:
@@ -1039,6 +1183,18 @@
   products:
     ThreeMileIsland: 10
 
+- type: reaction
+  id: Tortuga
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    IcedTea:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    Tortuga: 2
+
 - type: reaction
   id: ToxinsSpecial
   requiredMixerCategories:
@@ -1053,6 +1209,22 @@
   products:
     ToxinsSpecial: 5
 
+- type: reaction
+  id: Vampiro
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    TequilaSunrise:
+      amount: 3
+    BloodyMary:
+      amount: 1
+    Hotsauce:
+      amount: 1
+    LemonLime:
+      amount: 1
+  products:
+    Vampiro: 6
+
 - type: reaction
   id: VodkaMartini
   requiredMixerCategories:
@@ -1219,7 +1391,7 @@
       amount: 1
   products:
     Cola: 4
-    
+
 - type: reaction
   id: Caipirinha
   requiredMixerCategories: