diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 30eea5dda7..cfebd13247 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -150,6 +150,33 @@
   - type: BatteryBarrel
     fireCost: 12
 
+- type: entity
+  name: nightfall laser rifle
+  parent: BatteryGunBase
+  id: LaserRifleSniper
+  description: A scoped high capacity laser rifle.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/nightfall.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/nightfall.rsi
+  - type: BatteryBarrel
+    fireCost: 6
+  - type: Appearance
+    visuals:
+    - type: MagVisualizer
+      magState: mag
+      steps: 5
+      zeroVisible: true
+
 - type: entity
   name: DEAC-12 pulse carbine
   parent: BatteryGunBase
@@ -180,6 +207,36 @@
         volume: -2
       startingItem: PowerCellSmallHigh
 
+- type: entity
+  name: destroyer pulse rifle
+  parent: BatteryGunBase
+  id: PulseRifleDeathSquad
+  description: A weapon that fully lives up to its name. 
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi
+    layers:
+      - state: base
+        map: ["enum.RangedBarrelVisualLayers.Base"]
+      - state: mag-unshaded-4
+        map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
+        shader: unshaded
+  - type: Item
+    size: 24
+    sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi
+  - type: BatteryBarrel
+    fireCost: 6
+    ammoPrototype: Pulse
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PowerCellSlot
+    cellSlot:
+      ejectOnUse: true
+      soundOptions:
+        volume: -2
+      startingItem: PowerCellSmallHigh
+
 - type: entity
   name: laser cannon
   parent: BatteryGunBase
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png
index 65688e7c74..355b755141 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png
index 187c15586c..a02929baaf 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Battery/cog.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png
new file mode 100644
index 0000000000..6f678c060c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png
new file mode 100644
index 0000000000..e6555fd815
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png
new file mode 100644
index 0000000000..53bc7fd843
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png
new file mode 100644
index 0000000000..8d54786b26
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000..cfc71602bc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000..70ac25da4a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000..d68e5f5b7e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000..d4ef41a981
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000..040e713714
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json
new file mode 100644
index 0000000000..9b419cde20
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/nightfall.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/sniper.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png
new file mode 100644
index 0000000000..23a401a84e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png
new file mode 100644
index 0000000000..d3d33c0a86
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png
new file mode 100644
index 0000000000..b8e71b850e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png
new file mode 100644
index 0000000000..1274540143
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png
new file mode 100644
index 0000000000..fa3d508daf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-0.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png
new file mode 100644
index 0000000000..5285ba672f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-1.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png
new file mode 100644
index 0000000000..713f79e295
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-2.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png
new file mode 100644
index 0000000000..efa584d5b2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-3.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png
new file mode 100644
index 0000000000..78a7e8614e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/mag-unshaded-4.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
new file mode 100644
index 0000000000..f882a63bfc
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/energy/pulse.dmi",
+    "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",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png
index 0bf0af4613..4c79d3db74 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png
index e7bb7e033b..2a8f2aca63 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png
index 3b359fd89f..8f20a81352 100644
Binary files a/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/gladstone.rsi/icon.png differ