diff --git a/Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg b/Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg
index 7986d7707df..2dc65121d49 100644
Binary files a/Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg and b/Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg differ
diff --git a/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/Processor.yml b/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/Processor.yml
new file mode 100644
index 00000000000..d8c193127c3
--- /dev/null
+++ b/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/Processor.yml
@@ -0,0 +1,21 @@
+
+- type: entity
+  id: CSWeaponEnergySubMachineGunProcessor
+  parent: [ CSBaseWeaponSMGPowerCell, BaseGunWieldable ]
+  name: Processor
+  description: The Typewriter's battery operated variant. Fry 'em, fella's.
+  components:
+  - type: Sprite
+    sprite: _CS/Objects/Weapons/Guns/Battery/processor.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    sprite: _CS/Objects/Weapons/Guns/Battery/processor.rsi
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
diff --git a/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/base_battery_pistol.yml b/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/base_battery_pistol.yml
new file mode 100644
index 00000000000..4a8772819d1
--- /dev/null
+++ b/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/base_battery_pistol.yml
@@ -0,0 +1,155 @@
+#region frame
+- type: entity
+  id: CSBaseWeaponFrameEnergyPistol
+  parent: [ NFBaseWeaponEncumbrancePistol, BaseWeaponBatterySmall, BaseC1ContrabandUnredeemable ]
+  suffix: Frontier
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: Gun
+    projectileSpeed: 50
+    minAngle: 2.1
+    maxAngle: 10.5
+    angleIncrease: 0.6
+    angleDecay: 3
+    fireRate: 3
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+  - type: Battery # Default: 16 shots with 60 fireCost
+    maxCharge: 960
+    startingCharge: 960
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 3 # Default recharge rate: 1 shot per 20 seconds with 60 fireCost
+  - type: StaticPrice
+    price: 250
+  - type: NFWeaponDetails
+    class: weapon-details-class-pistol
+
+#region manufacturer
+- type: entity
+  id: CSBaseWeaponFrameEnergyPistolNanotrasen
+  parent: CSBaseWeaponFrameEnergyPistol
+  abstract: true
+  components:
+  - type: Gun
+    minAngle: 2.4
+    maxAngle: 12
+    angleIncrease: 0.8
+    angleDecay: 2.7
+    fireRate: 2.6
+  - type: NFWeaponDetails
+    class: weapon-details-manufacturer-nanotrasen-munitions
+
+- type: entity
+  id: CSBaseWeaponFrameEnergyPistolFrontierGunsmith
+  parent: CSBaseWeaponFrameEnergyPistol
+  abstract: true
+  components:
+  - type: Gun
+    minAngle: 3
+    maxAngle: 15
+    angleIncrease: 1.2
+    angleDecay: 3.8
+    fireRate: 2
+  - type: NFWeaponDetails
+    class: weapon-details-manufacturer-frontier-gunsmith-consortium
+
+#region chamber
+- type: entity
+  id: CSBaseWeaponEnergyPistolFireModes
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mode-lethal
+      map: ["Firemode"]
+      shader: unshaded
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Gun
+    examineCaliber: gun-examine-energybolt-low-disabler-pistol
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: NFBulletLaserLow
+    fireCost: 60
+  - type: EnergyGun
+    fireModes:
+    - proto: NFBulletDisabler
+      fireCost: 60
+      name: disable
+      state: disabler
+    - proto: NFBulletLaserLow
+      fireCost: 60
+      name: kill
+      state: lethal
+  - type: GenericVisualizer
+    visuals:
+      enum.EnergyGunFireModeVisuals.State:
+        Firemode:
+          Disabler: { state: mode-disabler }
+          Lethal: { state: mode-lethal }
+
+- type: entity
+  id: CSBaseWeaponEnergyPistolDisabler
+  abstract: true
+  components:
+  - type: Gun
+    examineCaliber: gun-examine-energybolt-disabler-pistol
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: NFBulletDisabler
+    fireCost: 60
+
+- type: entity
+  id: CSBaseWeaponEnergyGunPractice
+  abstract: true
+  components:
+  - type: Gun
+    examineCaliber: gun-examine-energybolt-disabler-practice
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: NFBulletLaserPractice
+    fireCost: 30
+
+- type: entity
+  id: CSBaseWeaponEnergyPistolHitScan
+  abstract: true
+  components:
+  - type: Gun
+    examineCaliber: gun-examine-hitscan-low
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: NFRedLightLaser
+    fireCost: 60
+
+- type: entity
+  id: CSBaseWeaponEnergyPistolHitScanPulse
+  abstract: true
+  components:
+  - type: Gun
+    examineCaliber: gun-examine-pulse-low
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: NFPulse
+    fireCost: 60
diff --git a/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/base_battery_smg.yml b/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/base_battery_smg.yml
new file mode 100644
index 00000000000..11073dc51f0
--- /dev/null
+++ b/Resources/Prototypes/_CS/Entities/Objects/Weapons/Guns/Battery/base_battery_smg.yml
@@ -0,0 +1,168 @@
+#region base
+- type: entity
+  id: CSBaseWeaponFrameEnergySubMachineGun
+  parent: [ NFBaseWeaponEncumbranceSubMachineGun, BaseWeaponBattery ]
+  suffix: Frontier
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance
+  - type: Wieldable
+    unwieldOnUse: false
+  - type: GunWieldBonus
+    minAngle: -0.6
+    maxAngle: -2.2
+  - type: Gun
+    projectileSpeed: 50
+    minAngle: 2.5
+    maxAngle: 12.5
+    angleIncrease: 0.7
+    angleDecay: 3.5
+    fireRate: 4.5
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+  - type: Battery # Default: 40 shots with 60 fireCost
+    maxCharge: 2400
+    startingCharge: 2400
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 3 # Default recharge rate: 1 shot per 20 seconds with 60 fireCost
+  - type: StaticPrice
+    price: 350
+  - type: NFWeaponDetails
+    class: weapon-details-class-submachine-gun
+
+#Power Cell fed weapons
+- type: entity
+  id: CSBaseWeaponSMGPowerCell
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+  - type: Item
+    size: Huge
+  - type: AmmoCounter
+  - type: Gun
+    minAngle: 1.5
+    maxAngle: 18.5
+    angleIncrease: 1.0
+    angleDecay: 5.0
+    fireRate: 3.0
+    selectedMode: FullAuto
+    availableModes:
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: NFRedLightLaser # Frontier: RedLightLaser<NFRedLightLaser
+    fireCost: 60 # Frontier: 50<60
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: Magazine
+        startingItem: PowerCellSmall
+        insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg
+        whitelist:
+          tags:
+          - PowerCell
+          - PowerCellSmall
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: BatterySelfRecharger
+    autoRecharge: false
+  - type: Appearance
+  - type: StaticPrice
+    price: 500
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
+
+#region manufacturer
+- type: entity
+  id: CSBaseWeaponFrameEnergySubMachineGunNanotrasen
+  parent: CSBaseWeaponFrameEnergySubMachineGun
+  abstract: true
+  components:
+  - type: Gun
+    minAngle: 2.9
+    maxAngle: 14.5
+    angleIncrease: 1
+    angleDecay: 3.4
+    fireRate: 3.8
+  - type: NFWeaponDetails
+    manufacturer: weapon-details-manufacturer-nanotrasen-munitions
+
+#region chamber
+- type: entity
+  id: CSBaseWeaponEnergySubMachineGunFireModes
+  abstract: true
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mode-lethal
+      map: ["Firemode"]
+      shader: unshaded
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Gun
+    examineCaliber: gun-examine-energybolt-low-disabler-pistol
+    soundGunshot:
+      path: /Audio/_DV/Weapons/Guns/Gunshots/laser.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: NFBulletLaserLow
+    fireCost: 60
+  - type: EnergyGun
+    fireModes:
+    - proto: NFBulletDisabler
+      fireCost: 60
+      name: disable
+      state: disabler
+    - proto: NFBulletLaserLow
+      fireCost: 60
+      name: harm
+      state: lethal
+  - type: GenericVisualizer
+    visuals:
+      enum.EnergyGunFireModeVisuals.State:
+        Firemode:
+          Disabler: { state: mode-disabler }
+          Lethal: { state: mode-lethal }
+
+- type: entity
+  id: CSBaseWeaponEnergySubMachineGunDisabler
+  abstract: true
+  components:
+  - type: Gun
+    examineCaliber: gun-examine-energybolt-disabler-pistol
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: NFBulletDisabler
+    fireCost: 60
+
+- type: entity
+  id: CSBaseWeaponEnergySubMachineGunHitScan
+  abstract: true
+  components:
+  - type: Gun
+    examineCaliber: gun-examine-hitscan-low
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: NFRedLightLaser
+    fireCost: 60
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index a203c18412c..15cec01bcd7 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -92,7 +92,7 @@
   parent: [ BaseC2Contraband, CSBaseWeaponHeavySubMachineGunChamber40, CSBaseWeaponFrameHeavySubMachineGunFrontierGunsmith ]
   name: Typewriter
   description: |-
-    A modern take on the classic design used by mobsters throughout space and time.
+    A modern take on the classic design used by mobsters throughout space and time. Swiss em, fella's.
   components:
   - type: Gun
     soundGunshot:
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/base.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/base.png
new file mode 100644
index 00000000000..ed0522638b8
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/base.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/equipped-BACKPACK.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..f0cdcbafcc5
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..6e9989a922a
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/icon.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/icon.png
new file mode 100644
index 00000000000..fc3187c2219
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/icon.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/inhand-left.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/inhand-left.png
new file mode 100644
index 00000000000..e6393ae3c69
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/inhand-right.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/inhand-right.png
new file mode 100644
index 00000000000..ec8d91f3586
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-0.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-0.png
new file mode 100644
index 00000000000..071e49d700f
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-1.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-1.png
new file mode 100644
index 00000000000..e96f675a2ca
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-2.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-2.png
new file mode 100644
index 00000000000..5930dd71329
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-3.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-3.png
new file mode 100644
index 00000000000..0e7b776dd8b
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-4.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-4.png
new file mode 100644
index 00000000000..1622d30770b
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/meta.json b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/meta.json
new file mode 100644
index 00000000000..c58ca1c14e6
--- /dev/null
+++ b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	{
+        "name": "mag-unshaded-0"
+    },
+    {
+		"name": "mag-unshaded-1"
+	},
+	{
+		"name": "mag-unshaded-2"
+	},
+	{
+		"name": "mag-unshaded-3"
+	},
+	{
+		"name": "mag-unshaded-4"
+	},
+    {
+        "name": "equipped-BACKPACK",
+        "directions": 4
+    },
+    {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
+    },
+    {
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "base"
+    },
+    {
+        "name": "wielded-inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "wielded-inhand-right",
+		"directions": 4
+	}
+    ]
+}
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/wielded-inhand-left.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..36c82182958
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/wielded-inhand-right.png b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..1f51aab79f8
Binary files /dev/null and b/Resources/Textures/_CS/Objects/Weapons/Guns/Battery/processor.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/base.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/base.png
index 1f724c6498a..e56afb86500 100644
Binary files a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/base.png and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/base.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png
index 7e27b73bf36..1248b7082c4 100644
Binary files a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/icon.png
index fbde43fe2a8..6869335634b 100644
Binary files a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/icon.png and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/icon.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/mag-0.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/mag-0.png
index 7c610ee31bd..fb69a82ea5a 100644
Binary files a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/mag-0.png and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/mag-0.png differ