diff --git a/Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg b/Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg
new file mode 100644
index 00000000000..7986d7707df
Binary files /dev/null and b/Resources/Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg differ
diff --git a/Resources/Audio/_DV/Weapons/Guns/Gunshots/universal.ogg b/Resources/Audio/_DV/Weapons/Guns/Gunshots/universal.ogg
new file mode 100644
index 00000000000..e86073d1136
Binary files /dev/null and b/Resources/Audio/_DV/Weapons/Guns/Gunshots/universal.ogg differ
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 6b67947cefd..1e89cab4203 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -17,6 +17,8 @@
     fireRate: 4 # Frontier: 3<4
     availableModes:
     - SemiAuto
+    soundGunshot:
+      path: /Audio/_DV/Weapons/Guns/Gunshots/universal.ogg
   - type: ItemSlots
     slots:
       gun_magazine:
@@ -77,5 +79,5 @@
     containers:
       gun_magazine: !type:ContainerSlot
       gun_chamber: !type:ContainerSlot
-  - type: StaticPrice
-    price: 500
+  # - type: StaticPrice # Frontier: use default value
+  #   price: 500
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
new file mode 100644
index 00000000000..fd1300ef00e
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -0,0 +1,50 @@
+- type: entity
+  name: Typewriter
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable, BaseC2Contraband] # Frontier: added BaseC2Contraband
+  id: WeaponSubMachineGunTypewriter
+  description: A modern take on the classic design used by mobsters throughout space and time. Types .35 auto ammo.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/SMGs/typewriter.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _DV/Objects/Weapons/Guns/SMGs/typewriter.rsi
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -30
+  - type: Gun
+    minAngle: 21
+    maxAngle: 45
+    angleIncrease: 5
+    angleDecay: 20
+    fireRate: 8
+    soundGunshot:
+      path: /Audio/_DV/Weapons/Guns/Gunshots/typewriter.ogg
+  - type: ChamberMagazineAmmoProvider
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolSubMachineGun
+        insertSound: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistolSubMachineGun
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index e5b598909ac..30ef35e98a1 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -327,6 +327,21 @@
     - id: MagazineBoxPistol
       amount: 2
 
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongTypewriterExpedition
+  suffix: Dungeon, Typewriter
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunTypewriterExpedition
+      amount: 1
+    - id: MagazinePistolSubMachineGun
+      amount: 2
+    - id: MagazineBoxPistol
+      amount: 2
+
 # Rifles
 - type: entity
   parent: WeaponCaseLong
@@ -375,7 +390,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponRifleAk
+    - id: WeaponRifleAkExpedition
       amount: 1
     - id: MagazineLightRifle
       amount: 2
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
index 1a9106bddc4..041860c1c04 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -412,6 +412,7 @@
     - WeaponCaseHeavyAsmgtExpeditions
     - WeaponCaseLongXrayCannonExpedition
     - WeaponCaseLongJackdaw
+    - WeaponCaseLongTypewriterExpedition
     chance: 1.0
     offset: 0.0
 
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
index acba5afef23..036693006e7 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
@@ -153,6 +153,13 @@
   categories: [ HideSpawnMenu ]
   id: WeaponSubMachineGunDrozdExpedition
 
+- type: entity
+  parent:
+  - BaseC3ExpeditionContraband
+  - WeaponSubMachineGunTypewriter
+  categories: [ HideSpawnMenu ]
+  id: WeaponSubMachineGunTypewriterExpedition
+
 # Energy
 - type: entity
   parent:
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
new file mode 100644
index 00000000000..1f724c6498a
Binary files /dev/null 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
new file mode 100644
index 00000000000..7e27b73bf36
Binary files /dev/null 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/equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/equipped-BACKPACK.png
new file mode 100644
index 00000000000..f0cdcbafcc5
Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..6e9989a922a
Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/equipped-SUITSTORAGE.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
new file mode 100644
index 00000000000..fbde43fe2a8
Binary files /dev/null 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/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/inhand-left.png
new file mode 100644
index 00000000000..e6393ae3c69
Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/inhand-right.png
new file mode 100644
index 00000000000..ec8d91f3586
Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/inhand-right.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
new file mode 100644
index 00000000000..7c610ee31bd
Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/mag-0.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json
new file mode 100644
index 00000000000..9673e9967b1
--- /dev/null
+++ b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	{
+		"name": "icon"
+	},
+	{
+		"name": "base"
+	},
+	{
+		"name": "mag-0"
+	},
+	{
+		"name": "bolt-open"
+	},
+	{
+		"name": "inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "inhand-right",
+		"directions": 4
+	},
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
+	{
+		"name": "wielded-inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "wielded-inhand-right",
+		"directions": 4
+	}
+    ]
+}
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/wielded-inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..36c82182958
Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/wielded-inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..1f51aab79f8
Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/typewriter.rsi/wielded-inhand-right.png differ