diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
index 26f71911eb7..9b4aef4996c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -2,7 +2,7 @@
   id: AmmoVendInventory
   startingInventory:
     SurvivalKnife: 10
-    WeaponLaserGun: 10
+    WeaponLaserPistolNF: 10 # Frontier
     WeaponSniperMosin: 10
     WeaponSniperRepeater: 10
     MagazineBoxLightRifle: 10
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index e62f9048e8a..b37b561ce2a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -102,3 +102,29 @@
     magState: charge-level
     steps: 6
     zeroVisible: true
+
+- type: entity
+  parent: WeaponLaserGun
+  id: WeaponLaserPistolNF
+  name: laser pistol
+  suffix: Frontier
+  description: Slightly outdated design of civilian grade laser pistol.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-unshaded-4
+      map: ["enum.GunVisualLayers.MagUnshaded"]
+      shader: unshaded
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: inhand-left-unshaded
+        shader: unshaded
+      right:
+      - state: inhand-right
+      - state: inhand-right-unshaded
+        shader: unshaded
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 43f335b70a1..eca523e8ddc 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
@@ -63,7 +63,7 @@
 
 # Energy
 - type: entity
-  parent: [ WeaponLaserGun, UnregisteredFirearmBase ]
+  parent: [ WeaponLaserPistolNF, UnregisteredFirearmBase ]
   noSpawn: true
   id: WeaponLaserGunExpedition
 
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/base.png
new file mode 100644
index 00000000000..372d42fb115
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/base.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/icon.png
new file mode 100644
index 00000000000..aa9183f9d10
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-0.png
new file mode 100644
index 00000000000..b043711c507
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-0.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-1.png
new file mode 100644
index 00000000000..563eca4cac3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-2.png
new file mode 100644
index 00000000000..628c7a075b3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-3.png
new file mode 100644
index 00000000000..1a352748fe6
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-unshaded.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-unshaded.png
new file mode 100644
index 00000000000..015fd090ad9
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left-unshaded.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left.png
new file mode 100644
index 00000000000..d0f2fe49715
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-0.png
new file mode 100644
index 00000000000..0b410e27d32
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-0.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-1.png
new file mode 100644
index 00000000000..af4bc516cb2
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-2.png
new file mode 100644
index 00000000000..d23ac5ad065
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-3.png
new file mode 100644
index 00000000000..646397ce1f3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-unshaded.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-unshaded.png
new file mode 100644
index 00000000000..72461084378
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right-unshaded.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right.png
new file mode 100644
index 00000000000..b7ecae06686
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-0.png
new file mode 100644
index 00000000000..3bd73e496c5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-1.png
new file mode 100644
index 00000000000..bfa5cf17a78
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-2.png
new file mode 100644
index 00000000000..bc6ea71522f
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-3.png
new file mode 100644
index 00000000000..f125f5013f4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-4.png
new file mode 100644
index 00000000000..9ad4ea192e3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json
new file mode 100644
index 00000000000..04c2a5d6973
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Battery/laser_pistol.rsi/meta.json
@@ -0,0 +1,80 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Icon taken from baystation at https://github.com/Baystation12/Baystation12/blob/dev/icons/obj/guns/ion_pistol.dmi | inhands sprites by erhardsteinhauer (discord/github)",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+			"name": "icon"
+		},
+		{
+			"name": "base"
+		},
+		{
+			"name": "mag-unshaded-0"
+		},
+		{
+			"name": "mag-unshaded-1"
+		},
+		{
+			"name": "mag-unshaded-2"
+		},
+		{
+			"name": "mag-unshaded-3"
+		},
+		{
+			"name": "mag-unshaded-4"
+		},
+		{
+			"name": "inhand-left-0",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-0",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-1",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-1",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-2",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-2",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-3",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-3",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right",
+			"directions": 4
+		},
+		{
+			"name": "inhand-left-unshaded",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right-unshaded",
+			"directions": 4
+		}
+	]
+}