HardLightSector · TrylobyteWasTaken · Feb 27, 2026 · Feb 27, 2026 · Feb 27, 2026 · Feb 27, 2026
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
+using Content.Shared._Goobstation.Factory;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Robust.Shared.Audio.Systems;
@@ -27,6 +28,7 @@ public override void Initialize()
     {
         SubscribeLocalEvent<SolutionContainerMixerComponent, ActivateInWorldEvent>(OnActivateInWorld);
         SubscribeLocalEvent<SolutionContainerMixerComponent, ContainerIsRemovingAttemptEvent>(OnRemoveAttempt);
+        SubscribeLocalEvent<SolutionContainerMixerComponent, MachineStartedEvent>(OnMachineStarted);
     }
 
     private void OnActivateInWorld(Entity<SolutionContainerMixerComponent> entity, ref ActivateInWorldEvent args)
@@ -38,6 +40,11 @@ private void OnActivateInWorld(Entity<SolutionContainerMixerComponent> entity, r
         args.Handled = true;
     }
 
+    private void OnMachineStarted(Entity<SolutionContainerMixerComponent> ent, ref MachineStartedEvent args)
+    {
+        // Start mixing when a machine receives a start signal.
+        TryStartMix(ent, null);
+    }
     private void OnRemoveAttempt(Entity<SolutionContainerMixerComponent> ent, ref ContainerIsRemovingAttemptEvent args)
     {
         if (args.Container.ID == ent.Comp.ContainerId && ent.Comp.Mixing)

diff --git a/Resources/Locale/en-US/_HL/recipes/misc.ftl b/Resources/Locale/en-US/_HL/recipes/misc.ftl
@@ -1,3 +1,4 @@
 # Random Hardlight additions that done need localizin'
 improvised-railgun-mag-desc = Making a railgun takes a research team five years and multiple doctorates. Making the ammunition for one, on the other hand, takes a minute or two.
 construction-graph-component-gaslock-circuit-board = a portable gaslock circuit board
+storage-port-construction-desc = A gas storage port, holds gas canisters without leaking gas!
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
@@ -43,6 +43,7 @@
   name: electrolysis unit
   description: The latest in medicinal electrocution technology.
   components:
+  - type: StartableMachine
   - type: SolutionContainerMixer
     mixDuration: 5
     mixingSound:
@@ -73,6 +74,16 @@
         enum.PowerDeviceVisualLayers.Powered:
           True: { visible: True }
           False: { visible: False }
+  - type: AutomationSlots # Goobstation
+    slots:
+    - !type:AutomatedBeakerSlot
+      input: PlumbingDispenser
+      output: PlumbingDispenser
+      slotName: mixer
+    - !type:AutomatedPorts
+      sinks:
+      - Start
+      - AutoStart
   - type: Machine
     board: ElectrolysisUnitMachineCircuitboard
 
@@ -82,6 +93,7 @@
   name: tabletop centrifuge
   description: Around and around it goes...
   components:
+  - type: StartableMachine
   - type: SolutionContainerMixer
     mixDuration: 10
     mixingSound:
@@ -113,6 +125,16 @@
         enum.PowerDeviceVisualLayers.Powered:
           True: { visible: True }
           False: { visible: False }
+  - type: AutomationSlots # Goobstation
+    slots:
+    - !type:AutomatedBeakerSlot
+      input: PlumbingDispenser
+      output: PlumbingDispenser
+      slotName: mixer
+    - !type:AutomatedPorts
+      sinks:
+      - Start
+      - AutoStart
   - type: ItemSlots
     slots:
       mixer:

diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
@@ -170,9 +170,7 @@
     startingCharge: 1200
   - type: BatterySelfRecharger
     autoRecharge: true
-    autoRechargeRate: 24
-    autoRechargePause: true
-    autoRechargePauseTime: 30
+    autoRechargeRate: 100 #HL - 100 < 24, why was it so low
 
 - type: entity
   name: energy shotgun

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -84,6 +84,7 @@
       path: /Audio/_DV/Weapons/Guns/Gunshots/laser.ogg
     soundEmpty:
       path: /Audio/_DV/Weapons/Guns/Empty/dry_fire.ogg
+    fireRate: 4
   - type: Battery
     maxCharge: 2000
     startingCharge: 2000
@@ -93,11 +94,11 @@
   - type: EnergyGun
     fireModes:
     - proto: BulletDisabler
-      fireCost: 100
+      fireCost: 25
       name: disable
       state: disabler
     - proto: MultiPhaseLethalBolt
-      fireCost: 200
+      fireCost: 50
       name: lethal
       state: lethal
     - proto: BulletTaser

diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/barrel.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Crates/barrel.yml
@@ -124,6 +124,12 @@
         - MachineLayer
   - type: Transform
     noRot: false
+  - type: AutomationSlots # Goobstation
+    slots:
+    - !type:AutomatedSolution
+      solutionName: tank
+      input: PlumbingInput
+      output: PlumbingOutput
 
 - type: entity
   parent: WoodenKeg

diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/Plumbing/liquid_pump.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/Plumbing/liquid_pump.yml
@@ -30,7 +30,7 @@
     port: PlumbingOutput
   - type: SolutionTransfer # verb so you can throttle its speed
     transferAmount: 50 # max speed is 50u/s
-    maxTransferAmount: 50
+    maxTransferAmount: 500 # Hardlight - Faster transfer, fewer pumps needed for large setups
     canReceive: false
     canSend: false
     canChangeTransferAmount: true

diff --git a/Resources/Prototypes/_HL/Entities/Objects/Tools/bluespacebarrel.yml b/Resources/Prototypes/_HL/Entities/Objects/Tools/bluespacebarrel.yml
@@ -104,3 +104,9 @@
   - type: Sealable
   - type: StaticPrice
     price: 1000
+  - type: AutomationSlots # Goobstation
+    slots:
+    - !type:AutomatedSolution
+      solutionName: tank
+      input: PlumbingInput
+      output: PlumbingOutput
diff --git a/Resources/Prototypes/_HL/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/_HL/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -0,0 +1,21 @@
+- type: entity
+  parent: [RecyclableItemSteelSmall, GasPipeBase]
+  id: GasPortStorage
+  name: storage port
+  description: A gas storage port, holds gas canisters without leaking gas!
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: SubFloorHide
+      visibleLayers:
+      - enum.SubfloorLayers.FirstLayer
+    - type: Sprite
+      sprite: Structures/Piping/Atmospherics/gascanisterport.rsi
+      layers:
+        - state: gasCanisterPort
+          map: [ "enum.SubfloorLayers.FirstLayer" ]
+    - type: Appearance
+    - type: GasPort
+    - type: Construction
+      graph: GasUnary
+      node: portstorage
diff --git a/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/unary.yml b/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/unary.yml
@@ -0,0 +1,27 @@
+- type: constructionGraph
+  id: GasUnaryHL
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: portstorage
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+  - node: portstorage
+    entity: GasPortStorage
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
diff --git a/Resources/Prototypes/_HL/Recipes/Crafting/unary.yml b/Resources/Prototypes/_HL/Recipes/Crafting/unary.yml
@@ -0,0 +1,9 @@
+- type: construction
+  id: GasPortStorage
+  graph: GasUnaryHL
+  startNode: start
+  targetNode: portstorage
+  category: construction-category-structures
+  description: storage-port-construction-desc
+  placementMode: SnapgridCenter
+  objectType: Structure
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -23,7 +23,7 @@
   - type: ItemToggleMeleeWeapon
     activatedDamage:
         types: # Slightly less total damage than wielded crusher glaive has
-          Heat: 8
+          Heat: 6
           Piercing: 2
           Structural: 40 # +10 damage compared to crusher glaive
     deactivatedSecret: true
@@ -46,6 +46,13 @@
     - Belt
     - back
     - suitStorage
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 4
+    damage:
+      types:
+        Blunt: 2
+    autoAttack: true
   - type: ToggleableLightVisuals
     spriteLayer: blade
     inhandVisuals:

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/barrel.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/barrel.yml
@@ -87,6 +87,12 @@
   - type: Sealable
   - type: StaticPrice
     price: 1000
+  - type: AutomationSlots # Goobstation
+    slots:
+    - !type:AutomatedSolution
+      solutionName: tank
+      input: PlumbingInput
+      output: PlumbingOutput
 
 - type: entity
   id: MetalBarrelGrey